diff --git a/capten/agent/internal/crossplane/package_providers.go b/capten/agent/internal/crossplane/package_providers.go index 7a305882..2a2b42e9 100644 --- a/capten/agent/internal/crossplane/package_providers.go +++ b/capten/agent/internal/crossplane/package_providers.go @@ -165,9 +165,6 @@ func (h *ProvidersSyncHandler) updateCrossplaneProvider(k8sProviders []model.Pro ProviderName: dbProvider.ProviderName, } - v, _ := json.Marshal(provider) - fmt.Println("Provider ===>" + string(v)) - if err := h.dbStore.UpdateCrossplaneProvider(&provider); err != nil { h.log.Errorf("failed to update provider %s details in db, %v", k8sProvider.Name, err) continue diff --git a/capten/config-worker/internal/crossplane/config_cluster_updates.go b/capten/config-worker/internal/crossplane/config_cluster_updates.go index fb3eb00d..7b311616 100644 --- a/capten/config-worker/internal/crossplane/config_cluster_updates.go +++ b/capten/config-worker/internal/crossplane/config_cluster_updates.go @@ -6,8 +6,10 @@ import ( "fmt" "os" "path/filepath" + "strings" "github.com/intelops/go-common/logging" + "github.com/kube-tarian/kad/capten/common-pkg/credential" "github.com/kube-tarian/kad/capten/common-pkg/k8s" fileutil "github.com/kube-tarian/kad/capten/config-worker/internal/file_util" "github.com/kube-tarian/kad/capten/model" @@ -79,7 +81,11 @@ func (cp *CrossPlaneApp) configureClusterUpdate(ctx context.Context, req *model. return string(agentmodel.WorkFlowStatusFailed), errors.WithMessage(err, "failed to sync default app value files") } - templateValues := cp.prepareTemplateVaules(req.ManagedClusterName) + templateValues, err := cp.prepareTemplateVaules(ctx, req.ManagedClusterName) + if err != nil { + return string(agentmodel.WorkFlowStatusFailed), errors.WithMessage(err, "failed to prepare template values") + } + if err := fileutil.UpdateFilesInFolderWithTempaltes(clusterDefaultAppValPath, templateValues); err != nil { return string(agentmodel.WorkFlowStatusFailed), errors.WithMessage(err, "failed to update default app template values") } @@ -279,12 +285,29 @@ func removeClusterValues(valuesFileName, clusterName string) error { return err } -func (cp *CrossPlaneApp) prepareTemplateVaules(clusterName string) map[string]string { +func (cp *CrossPlaneApp) prepareTemplateVaules(ctx context.Context, clusterName string) (map[string]string, error) { val := map[string]string{ "DomainName": cp.cfg.DomainName, "ClusterName": clusterName, } - return val + + cred, err := credential.GetClusterGlobalValues(ctx) + if err != nil { + return nil, err + } + + var gvMap map[string]interface{} + + decoder := yaml.NewDecoder(strings.NewReader(cred)) + if err := decoder.Decode(&gvMap); err != nil { + return nil, err + } + + for key, value := range gvMap { + val[key] = value.(string) + } + + return val, nil } func prepareClusterData(clusterName, endpoint string, defaultApps []DefaultApps) Cluster { diff --git a/server/data/store-apps/app_list.yaml b/server/data/store-apps/app_list.yaml index af06912f..21b95946 100644 --- a/server/data/store-apps/app_list.yaml +++ b/server/data/store-apps/app_list.yaml @@ -4,8 +4,9 @@ enabledApps: - crossplane-v1.0.1 - testkube-v1.0.0 - testkube-v1.0.1 - - tekton-v0.1.5 + - tekton-v0.1.7 disabledApps: - tekton-v0.1.1 - tekton-v0.1.4 + - tekton-v0.1.5 diff --git a/server/data/store-apps/conf/tekton-v0.1.5.yaml b/server/data/store-apps/conf/tekton-v0.1.7.yaml similarity index 86% rename from server/data/store-apps/conf/tekton-v0.1.5.yaml rename to server/data/store-apps/conf/tekton-v0.1.7.yaml index a11473e0..7f6c42bf 100644 --- a/server/data/store-apps/conf/tekton-v0.1.5.yaml +++ b/server/data/store-apps/conf/tekton-v0.1.7.yaml @@ -6,12 +6,12 @@ RepoName: "tools" RepoURL: "https://kube-tarian.github.io/helmrepo-supporting-tools" Namespace: "tekton" ReleaseName: "tekton" -Version: "0.1.5" +Version: "0.1.7" PluginName: "Tekton" PluginDescription: "Configure Build pipeline with Tekton" CreateNamespace: true Icon: "tekton.svg" -LaunchURL: https://tekton.{{.DomainName}}/tekton/ +LaunchURL: https://tekton.{{.DomainName}}/ LaunchUIDescription: "Intelops Tekton" LaunchUIIcon: "tekton.svg" OverrideValues: diff --git a/server/data/store-apps/conf/values/tekton-v0.1.5_template.yaml b/server/data/store-apps/conf/values/tekton-v0.1.7_template.yaml similarity index 100% rename from server/data/store-apps/conf/values/tekton-v0.1.5_template.yaml rename to server/data/store-apps/conf/values/tekton-v0.1.7_template.yaml