From 4b09e6456f503a03d565a5777e6f91b76907e498 Mon Sep 17 00:00:00 2001 From: Vikram Singh Date: Thu, 18 Feb 2021 16:57:10 +0530 Subject: [PATCH 1/8] changes for hosturl --- yamls/dashboard.yaml | 2 +- yamls/devtron.yaml | 2 +- yamls/migrator.yaml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/yamls/dashboard.yaml b/yamls/dashboard.yaml index 030b645..e622bdc 100644 --- a/yamls/dashboard.yaml +++ b/yamls/dashboard.yaml @@ -261,7 +261,7 @@ spec: - name: envoy-config-volume mountPath: /etc/envoy-config/ - name: dashboard - image: "quay.io/devtron/dashboard:6ed0e287-136-3310" + image: "quay.io/devtron/dashboard:23f35c82-154-3442" imagePullPolicy: IfNotPresent ports: - name: app diff --git a/yamls/devtron.yaml b/yamls/devtron.yaml index 6012edc..dd2362d 100644 --- a/yamls/devtron.yaml +++ b/yamls/devtron.yaml @@ -168,7 +168,7 @@ spec: serviceAccountName: devtron containers: - name: devtron - image: "quay.io/devtron/devtron:78218b88-146-3302" + image: "quay.io/devtron/devtron:50445884-184-3443" imagePullPolicy: IfNotPresent ports: - name: devtron diff --git a/yamls/migrator.yaml b/yamls/migrator.yaml index b3203c3..cb58cf3 100644 --- a/yamls/migrator.yaml +++ b/yamls/migrator.yaml @@ -40,7 +40,7 @@ spec: - name: MIGRATE_TO_VERSION value: "0" - name: GIT_HASH - value: c26045b3a846388e170d4e6472072d2544747ac6 + value: 5044588463ab8cc996bede675e3e1f395f896a12 envFrom: - secretRef: name: postgresql-migrator @@ -76,7 +76,7 @@ spec: - name: MIGRATE_TO_VERSION value: "0" - name: GIT_HASH - value: c20d049c96db2562933c7a89988a3856d5c7d10a + value: 5044588463ab8cc996bede675e3e1f395f896a12 - name: GIT_BRANCH value: main envFrom: From b88547f22a95c805d8bebc8a808da002efcb1c13 Mon Sep 17 00:00:00 2001 From: Vikram Singh Date: Thu, 18 Feb 2021 17:03:13 +0530 Subject: [PATCH 2/8] changes for hosturl --- install/devtron-installer.yaml | 2 +- installation-script | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/install/devtron-installer.yaml b/install/devtron-installer.yaml index b5aca2f..af6e6b0 100644 --- a/install/devtron-installer.yaml +++ b/install/devtron-installer.yaml @@ -4,4 +4,4 @@ metadata: name: installer-devtron namespace: default spec: - url: https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/main/installation-script + url: https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/hosturl-changes/installation-script diff --git a/installation-script b/installation-script index fef65f0..afa3cca 100644 --- a/installation-script +++ b/installation-script @@ -47,7 +47,7 @@ if !baseURL { argocd = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/main/yamls/argocd.yaml"); clair = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/main/yamls/clair.yaml"); clairConfig = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/main/yamls/clair-config.yaml"); -dashboard = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/main/yamls/dashboard.yaml"); +dashboard = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/hosturl-changes/yamls/dashboard.yaml"); gitSensor = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/main/yamls/gitsensor.yaml"); guard = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/main/yamls/guard.yaml"); postgresql = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/main/yamls/postgresql.yaml"); @@ -59,7 +59,7 @@ natsOperator = download("https://raw.githubusercontent.com/devtron-labs/devtron- natsServer = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/main/yamls/nats-server.yaml"); natsStreaming = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/main/yamls/nats-streaming.yaml"); notifier = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/main/yamls/notifier.yaml"); -devtron = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/main/yamls/devtron.yaml"); +devtron = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/hosturl-changes/yamls/devtron.yaml"); devtronDexIngress = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/main/yamls/devtron-dex-ingress.yaml"); workflow = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/main/yamls/workflow.yaml"); serviceAccount = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/main/yamls/serviceaccount.yaml"); From e781e9718993ce7b0b59f75edb1cfc1724791a33 Mon Sep 17 00:00:00 2001 From: Vikram Singh Date: Thu, 18 Feb 2021 17:19:11 +0530 Subject: [PATCH 3/8] changes for hosturl migration --- installation-script | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installation-script b/installation-script index afa3cca..b6ba44d 100644 --- a/installation-script +++ b/installation-script @@ -54,7 +54,7 @@ postgresql = download("https://raw.githubusercontent.com/devtron-labs/devtron-in imageScanner = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/main/yamls/image-scanner.yaml"); kubewatch = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/main/yamls/kubewatch.yaml"); lens = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/main/yamls/lens.yaml"); -migrator = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/main/yamls/migrator.yaml"); +migrator = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/hosturl-changes/yamls/migrator.yaml"); natsOperator = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/main/yamls/nats-operator.yaml"); natsServer = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/main/yamls/nats-server.yaml"); natsStreaming = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/main/yamls/nats-streaming.yaml"); From 6a394f7d96cb0cfe6918ccbfa5861fa537176a1c Mon Sep 17 00:00:00 2001 From: Vikram Singh Date: Thu, 18 Feb 2021 17:41:35 +0530 Subject: [PATCH 4/8] changes for hosturl notifier --- installation-script | 2 +- yamls/notifier.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/installation-script b/installation-script index b6ba44d..05dc94c 100644 --- a/installation-script +++ b/installation-script @@ -58,7 +58,7 @@ migrator = download("https://raw.githubusercontent.com/devtron-labs/devtron-inst natsOperator = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/main/yamls/nats-operator.yaml"); natsServer = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/main/yamls/nats-server.yaml"); natsStreaming = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/main/yamls/nats-streaming.yaml"); -notifier = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/main/yamls/notifier.yaml"); +notifier = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/hosturl-changes/yamls/notifier.yaml"); devtron = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/hosturl-changes/yamls/devtron.yaml"); devtronDexIngress = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/main/yamls/devtron-dex-ingress.yaml"); workflow = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/main/yamls/workflow.yaml"); diff --git a/yamls/notifier.yaml b/yamls/notifier.yaml index 6a8b539..25468d5 100644 --- a/yamls/notifier.yaml +++ b/yamls/notifier.yaml @@ -66,7 +66,7 @@ spec: restartPolicy: Always containers: - name: notifier - image: quay.io/devtron/notifier:3b7b5d33-74-2197 + image: quay.io/devtron/notifier:60a5ced6-137-3447 imagePullPolicy: IfNotPresent ports: - name: app From 532fd955bd2fa689c1486f172da1417019e6ecd0 Mon Sep 17 00:00:00 2001 From: Vikram Singh Date: Thu, 18 Feb 2021 17:54:46 +0530 Subject: [PATCH 5/8] changes for hosturl notifier --- install/devtron-operator-configs.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/install/devtron-operator-configs.yaml b/install/devtron-operator-configs.yaml index a04148b..524f5a9 100644 --- a/install/devtron-operator-configs.yaml +++ b/install/devtron-operator-configs.yaml @@ -15,9 +15,7 @@ metadata: name: devtron-operator-cm namespace: devtroncd data: - BASE_URL_SCHEME: "http" #url without scheme and without trailing '/' - BASE_URL: "change-me" DEX_CONFIG: "change-me" DEFAULT_CD_LOGS_BUCKET_REGION: "change-me" DEFAULT_CACHE_BUCKET: "change-me" From b69b0dd8c0735a36f19e1045e34d49cf44f92242 Mon Sep 17 00:00:00 2001 From: Vikram Singh Date: Thu, 18 Feb 2021 18:09:16 +0530 Subject: [PATCH 6/8] removed BASE_URL and SCHEME env variable removed --- charts/devtron/values.yaml | 2 -- installation-script | 3 --- 2 files changed, 5 deletions(-) diff --git a/charts/devtron/values.yaml b/charts/devtron/values.yaml index 185aac3..127da2c 100644 --- a/charts/devtron/values.yaml +++ b/charts/devtron/values.yaml @@ -9,9 +9,7 @@ secrets: # value: "#########" configs: - BASE_URL_SCHEME: "http" #url without scheme and without trailing '/' - BASE_URL: "www.example.com" #DEX_CONFIG: |- # connectors: # - type: oidc diff --git a/installation-script b/installation-script index 05dc94c..8bd6ec3 100644 --- a/installation-script +++ b/installation-script @@ -6,8 +6,6 @@ webHookToken = jsonSelect(operatorSecret, "data.WEBHOOK_TOKEN"); grafanaPassword = jsonSelect(operatorSecret, "data.GRAFANA_PASSWORD"); azureAccountKey = jsonSelect(operatorSecret, "data.AZURE_ACCOUNT_KEY"); -baseURLScheme = jsonSelect(operatorConfigMap, "data.BASE_URL_SCHEME"); -baseURL = jsonSelect(operatorConfigMap, "data.BASE_URL"); dexConfig = jsonSelect(operatorConfigMap, "data.DEX_CONFIG"); defaultCDLogsBucketRegion = jsonSelect(operatorConfigMap, "data.DEFAULT_CD_LOGS_BUCKET_REGION"); defaultCacheBucket = jsonSelect(operatorConfigMap, "data.DEFAULT_CACHE_BUCKET"); @@ -271,7 +269,6 @@ kubeYamlEdit(gitSensor, "data.PG_PASSWORD", postgresqlPassword, `/Secret//git-se #notifier kubeYamlEdit(notifier, "data.DB_PWD", postgresqlPassword, `/Secret//notifier-secret`); -kubeYamlEdit(notifier, "data.BASE_URL", baseURLScheme + "://" + baseURL, `/ConfigMap//notifier-cm`); #image-scanner kubeYamlEdit(imageScanner, "data.PG_PASSWORD", postgresqlPassword, `/Secret//image-scanner-secret`); From f6eeb20621a6d39099a80c61e3f3128a66777a47 Mon Sep 17 00:00:00 2001 From: Vikram Singh Date: Thu, 18 Feb 2021 19:15:12 +0530 Subject: [PATCH 7/8] removed dex config env variable removed --- charts/devtron/values.yaml | 13 ------------- install/devtron-operator-configs.yaml | 1 - installation-script | 2 +- 3 files changed, 1 insertion(+), 15 deletions(-) diff --git a/charts/devtron/values.yaml b/charts/devtron/values.yaml index 127da2c..6f8971f 100644 --- a/charts/devtron/values.yaml +++ b/charts/devtron/values.yaml @@ -9,19 +9,6 @@ secrets: # value: "#########" configs: - #url without scheme and without trailing '/' - #DEX_CONFIG: |- - # connectors: - # - type: oidc - # id: google - # name: Google - # config: - # issuer: https://accounts.google.com - # clientID: xxxxxxxx-xxxxxxxxxxxxxxxxx.apps.googleusercontent.com - # clientSecret: xxxxxxxxxxxxxxxxx - # redirectURI: :///api/dex/callback - # hostedDomains: - # - example.com DEFAULT_CD_LOGS_BUCKET_REGION: "change-me" DEFAULT_CACHE_BUCKET: "change-me" DEFAULT_CACHE_BUCKET_REGION: "change-me" diff --git a/install/devtron-operator-configs.yaml b/install/devtron-operator-configs.yaml index 524f5a9..936e134 100644 --- a/install/devtron-operator-configs.yaml +++ b/install/devtron-operator-configs.yaml @@ -16,7 +16,6 @@ metadata: namespace: devtroncd data: #url without scheme and without trailing '/' - DEX_CONFIG: "change-me" DEFAULT_CD_LOGS_BUCKET_REGION: "change-me" DEFAULT_CACHE_BUCKET: "change-me" DEFAULT_CACHE_BUCKET_REGION: "change-me" diff --git a/installation-script b/installation-script index 8bd6ec3..7d6aa8b 100644 --- a/installation-script +++ b/installation-script @@ -6,7 +6,7 @@ webHookToken = jsonSelect(operatorSecret, "data.WEBHOOK_TOKEN"); grafanaPassword = jsonSelect(operatorSecret, "data.GRAFANA_PASSWORD"); azureAccountKey = jsonSelect(operatorSecret, "data.AZURE_ACCOUNT_KEY"); -dexConfig = jsonSelect(operatorConfigMap, "data.DEX_CONFIG"); + defaultCDLogsBucketRegion = jsonSelect(operatorConfigMap, "data.DEFAULT_CD_LOGS_BUCKET_REGION"); defaultCacheBucket = jsonSelect(operatorConfigMap, "data.DEFAULT_CACHE_BUCKET"); defaultCacheBucketRegion = jsonSelect(operatorConfigMap, "data.DEFAULT_CACHE_BUCKET_REGION"); From 712108f53d2b48752def3a531a7f7afdd0738012 Mon Sep 17 00:00:00 2001 From: Vikram Singh Date: Thu, 18 Feb 2021 22:23:11 +0530 Subject: [PATCH 8/8] grafana removed from installation-script --- installation-script | 131 +------------------------------------------- 1 file changed, 1 insertion(+), 130 deletions(-) diff --git a/installation-script b/installation-script index 7d6aa8b..432cbb2 100644 --- a/installation-script +++ b/installation-script @@ -3,7 +3,6 @@ operatorConfigMap = kubectl get cm -n devtroncd devtron-operator-cm; postgresqlPassword = jsonSelect(operatorSecret, "data.POSTGRESQL_PASSWORD"); acdPassword = jsonSelect(operatorSecret, "data.ACD_PASSWORD"); webHookToken = jsonSelect(operatorSecret, "data.WEBHOOK_TOKEN"); -grafanaPassword = jsonSelect(operatorSecret, "data.GRAFANA_PASSWORD"); azureAccountKey = jsonSelect(operatorSecret, "data.AZURE_ACCOUNT_KEY"); @@ -38,9 +37,6 @@ base64DecoderSuffix = ` | base64 -d | tr -d ':\n'`; if !postgresqlPassword { log("postgresql password is mandatory"); } -if !baseURL { - log("baseURL is mandatory"); -} argocd = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/main/yamls/argocd.yaml"); clair = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/main/yamls/clair.yaml"); @@ -63,7 +59,6 @@ workflow = download("https://raw.githubusercontent.com/devtron-labs/devtron-inst serviceAccount = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/main/yamls/serviceaccount.yaml"); namespace = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/main/yamls/namespace.yaml"); externalSecret = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/main/yamls/external-secret.yaml"); -grafana = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/main/yamls/grafana.yaml"); rollout = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/main/yamls/rollout.yaml"); minio = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/main/yamls/minio.yaml"); @@ -85,124 +80,8 @@ natsStreamingOverride = download("https://raw.githubusercontent.com/devtron-labs devtronDexIngressOverride = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/updates/yamls/devtron-dex-ingress.yaml"); workflowOverride = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/main/updates/workflow.yaml"); externalSecretOverride = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/main/updates/external-secret.yaml"); -grafanaOverride = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/main/updates/grafana.yaml"); rolloutOverride = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/main/updates/rollout.yaml"); -#grafana -grafanaSecret = kubectl get -n devtroncd secret devtron-grafana-cred-secret; -hasgrafana = kubectl get -n devtroncd deployment devtron-grafana; -grafanaPassword = jsonSelect(grafanaSecret, "data.admin-password"); -if !grafanaPassword { - log ("not found"); - grafanaPassword = shellScript passwordGen; -} -grafanaPasswordPlain = base64DecoderPrefix + `echo "` + grafanaPassword + `" | tr -d ':\n' ` + base64DecoderSuffix; -grafanaPasswordPlain = shellScript grafanaPasswordPlain; -kubeYamlEdit(grafana, "data.admin-password", grafanaPassword, `/Secret//devtron-grafana-cred-secret`); -grafanaUrl = baseURLScheme + "://%s:%s@" + baseURL + "/grafana"; -grafanaUrlWithPwd = baseURLScheme + "://admin:"+ grafanaPasswordPlain + "@" + baseURL + "/grafana"; - -grafanaIni = `[analytics] -check_for_updates = true -[auth.anonymous] -enabled = true -org_name = devtron-metrics-view -org_role = Viewer -[grafana_net] -url = https://grafana.net -[log] -mode = console -[paths] -data = /var/lib/grafana/data -logs = /var/log/grafana -plugins = /var/lib/grafana/plugins -provisioning = /etc/grafana/provisioning -[security] -allow_embedding = true -[server] -root_url = ` + baseURLScheme + "://" + baseURL + `/grafana -serve_from_sub_path = true -[users] -allow_org_create = true - `; -kubeYamlEdit(grafana, `data.grafana\.ini`, grafanaIni, `/ConfigMap/devtroncd/devtron-grafana`); -grafana = kubectl apply -n devtroncd grafana -u grafanaOverride; -log("setup grafana"); - -if !hasgrafana { - createOrgScript = shebang + ` - sleep 50 - ORG_ID=$( curl -d '{"name":"devtron-metrics-view"}' -H "Content-Type: application/json" -X POST '` + grafanaUrlWithPwd + `/api/orgs' ) - echo $ORG_ID - `; - createOrg = shellScript createOrgScript; - log("created org " + createOrg); - - orgId = jsonSelect(createOrg, "orgId"); - if !orgId { - orgId = "2"; - } - - activeOrgScript = shebang + ` - curl -X POST '` + grafanaUrlWithPwd + `/api/user/using/` + orgId +`'`; - activeOrg = shellScript activeOrgScript; - log("activated org"); - - setPreferenceScript = shebang + ` - curl -X PUT -H "Content-Type: application/json" -d '{"homeDashboardId":0,"theme":"light","timezone":"browser"}' '`+ grafanaUrlWithPwd + `/api/org/preferences'`; - setPreference = shellScript setPreferenceScript; - log("set preference"); - - prometheusDatasourceScript = shebang + ` - curl '` + grafanaUrlWithPwd + `/api/datasources' \ - -H 'content-type: application/json' \ - -H 'x-grafana-org-id: ` + orgId + `' \ - --data-raw '{"name":"Prometheus-devtron","type":"prometheus","access":"proxy","isDefault":true}' - `; - prometheusDatasource = shellScript prometheusDatasourceScript; - log("data source setup step 1"); - - datasourceId = jsonSelect(prometheusDatasource, "datasource.id"); - log("datasource id " + datasourceId); - - prometheusDatasourceScriptUpdate = shebang + ` - curl '` + grafanaUrlWithPwd + `/api/datasources/` + datasourceId + `' -X PUT \ - -H 'content-type: application/json' \ - -H 'x-grafana-org-id: ` + orgId + `' \ - --data-raw '{"id":` + datasourceId +` , - "orgId":` + orgId + `, - "name":"Prometheus-devtron","type":"prometheus","access":"proxy", - "url":"` + prometheusUrl + `", - "basicAuth":true,"jsonData":{},"version":1}' - `; - prometheusDatasourceUpdate = shellScript prometheusDatasourceScriptUpdate; - log("data source setup step 2"); - - grafanaDashboardProvider = ` -apiVersion: 1 -providers: -- disableDeletion: true - editable: false - folder: "" - name: devtron-provider - options: - path: /var/lib/grafana/dashboards/devtron-provider - orgId: `+ orgId + ` - type: file - `; - - grafanaCm = kubectl get -n devtroncd cm devtron-grafana; - jsonEdit(grafanaCm, `data.dashboardproviders\.yaml`, grafanaDashboardProvider); - grafanaCm = kubectl apply -n devtroncd grafanaCm; - log("setup up grafana cm with provider yaml"); - - allDevtroncdPo = kubectl get po -n devtroncd; - grafanaPodnamePattern = `items.#(metadata.name%"devtron-grafana*").metadata.name`; - grafanaPodname = jsonSelect(allDevtroncdPo, grafanaPodnamePattern); - grafanaPoddelete = kubectl delete -n devtroncd po grafanaPodname; - log("deleted grafana pod to reload configmap"); -} - namespaces = kubectl apply namespace; log("created namespaces"); sa = kubectl apply serviceAccount; @@ -237,13 +116,9 @@ helmRepo = `- name: incubator url: https://charts.helm.sh/stable`; kubeYamlEdit(argocd, `data.repositories`, helmRepo, `/ConfigMap//argocd-cm` ); -kubeYamlEdit(argocd, "data.url", baseURLScheme + "://" + baseURL, `/ConfigMap//argocd-cm`); -if dexConfig { - kubeYamlEdit(argocd, `data.dex\.config`, dexConfig, `/ConfigMap//argocd-cm`); -} + kubeYamlEdit(argocd, `data.policy\.default`, `role:admin`, `/ConfigMap//argocd-rbac-cm`); -# patchLoad = '{"data":{"url":"' + baseURL + '", "dex.config:"' + dexConfig + '}}'; # pa = kubectl patch -n devtroncd cm/argocd-cm --type "application/merge-patch+json" -p patchLoad; kubeYamlEdit(argocd, `subjects.0.namespace`, "devtroncd", `rbac.authorization.k8s.io/ClusterRoleBinding//argocd-application-controller`); @@ -256,7 +131,6 @@ if hasArgocd { kubeYamlDelete(argocd, filter=`/ConfigMap//argocd-tls-certs-cm`); } argocd = kubectl apply -n devtroncd argocd -u argocdOverride; -#patchLoad = '{"data":{"url":"' + baseURL + '", "dex.config:"' + dexConfig + '}}'; #pa = kubectl patch -n devtroncd cm/argocd-cm --type "application/merge-patch+json" -p patchLoad; log("executed argocd setup command"); @@ -376,15 +250,12 @@ kubeYamlEdit(devtron, "data.DEX_SECRET", dexSecret, `/Secret//devtron-secret`); kubeYamlEdit(devtron, "data.DEX_JWTKEY", dexJwtKey, `/Secret//devtron-secret`); kubeYamlEdit(devtron, "data.DEX_CSTOREKEY", dexCStoreKey, `/Secret//devtron-secret`); kubeYamlEdit(devtron, "data.ACD_PASSWORD", acdPassword, `/Secret//devtron-secret`); -kubeYamlEdit(devtron, "data.GRAFANA_PASSWORD", grafanaPassword, `/Secret//devtron-secret`); -kubeYamlEdit(devtron, "data.EXTERNAL_CI_WEB_HOOK_URL", baseURLScheme + "://" + baseURL+"/orchestrator/webhook/ext-ci", `/ConfigMap//devtron-cm`); kubeYamlEdit(devtron, "data.DEFAULT_CD_LOGS_BUCKET_REGION", defaultCDLogsBucketRegion, `/ConfigMap//devtron-cm`); kubeYamlEdit(devtron, "data.DEFAULT_CACHE_BUCKET", defaultCacheBucket, `/ConfigMap//devtron-cm`); kubeYamlEdit(devtron, "data.DEFAULT_CACHE_BUCKET_REGION", defaultCacheBucketRegion, `/ConfigMap//devtron-cm`); kubeYamlEdit(devtron, "data.DEFAULT_BUILD_LOGS_BUCKET", defaultBuildLogsBucket, `/ConfigMap//devtron-cm`); -kubeYamlEdit(devtron, "data.GRAFANA_URL", grafanaUrl, `/ConfigMap//devtron-cm`); if !cloudProvider { cloudProvider="AWS";