Merge pull request #373 from kube-tarian/feature/tekton_ui_kubiz_lb

tekton version change with launch ui

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

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 {

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

server/data/store-apps/conf/tekton-v0.1.5.yaml → 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: