From 692ba857ea50c8c5421cdee75471c88e95df42f5 Mon Sep 17 00:00:00 2001 From: Abhinav-26 Date: Thu, 2 Sep 2021 13:24:08 +0530 Subject: [PATCH 1/6] updated installation script --- manifests/installation-script | 59 ++++++++++++++++++----------------- 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/manifests/installation-script b/manifests/installation-script index 2487e79ca3..bb3d7ca0cf 100644 --- a/manifests/installation-script +++ b/manifests/installation-script @@ -478,35 +478,36 @@ acdPassword = base64EncoderPrefix + `echo "` + acdPassword + `" | tr -d ':\n' ` acdPassword = shellScript acdPassword; if hasDevtron { - devtronSecret = kubectl get secret -n devtroncd devtron-secret; - texternalCIAPISecret = jsonSelect(devtronSecret, "data.EXTERNAL_CI_API_SECRET"); - if texternalCIAPISecret { - externalCIAPISecret = texternalCIAPISecret; - } - twebHookToken = jsonSelect(devtronSecret, "data.WEBHOOK_TOKEN"); - if twebHookToken { - webHookToken = twebHookToken; - } - torchToken = jsonSelect(devtronSecret, "data.ORCH_TOKEN"); - if torchToken { - orchToken = torchToken; - } - tdexSecret = jsonSelect(devtronSecret, "data.DEX_SECRET"); - if tdexSecret { - dexSecret = tdexSecret; - } - tdexJwtKey = jsonSelect(devtronSecret, "data.DEX_JWTKEY"); - if tdexJwtKey { - dexJwtKey = tdexJwtKey; - } - tdexCStoreKey = jsonSelect(devtronSecret, "data.DEX_CSTOREKEY"); - if tdexCStoreKey { - dexCStoreKey = tdexCStoreKey; - } - tacdPassword = jsonSelect(devtronSecret, "data.ACD_PASSWORD"); - if tacdPassword { - acdPassword = tacdPassword; - } + devtronSecret = kubectl get secret -n devtroncd devtron-secret; + texternalCIAPISecret = jsonSelect(devtronSecret, "data.EXTERNAL_CI_API_SECRET"); + twebHookToken = jsonSelect(devtronSecret, "data.WEBHOOK_TOKEN"); + torchToken = jsonSelect(devtronSecret, "data.ORCH_TOKEN"); + tdexSecret = jsonSelect(devtronSecret, "data.DEX_SECRET"); + tdexJwtKey = jsonSelect(devtronSecret, "data.DEX_JWTKEY"); + tdexCStoreKey = jsonSelect(devtronSecret, "data.DEX_CSTOREKEY"); + tacdPassword = jsonSelect(devtronSecret, "data.ACD_PASSWORD"); +} + +if texternalCIAPISecret { + externalCIAPISecret = texternalCIAPISecret; +} +if twebHookToken { + webHookToken = twebHookToken; +} +if torchToken { + orchToken = torchToken; +} +if tdexSecret { + dexSecret = tdexSecret; +} +if tdexJwtKey { + dexJwtKey = tdexJwtKey; +} +if tdexCStoreKey { + dexCStoreKey = tdexCStoreKey; +} +if tacdPassword { + acdPassword = tacdPassword; } From af4f0f8c896dc85f15b655023ed4fe3412c3b01e Mon Sep 17 00:00:00 2001 From: Abhinav Dubey Date: Thu, 2 Sep 2021 14:51:28 +0530 Subject: [PATCH 2/6] Update devtron-installer.yaml --- manifests/install/devtron-installer.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/install/devtron-installer.yaml b/manifests/install/devtron-installer.yaml index 8f8f31f1df..1be24580b3 100644 --- a/manifests/install/devtron-installer.yaml +++ b/manifests/install/devtron-installer.yaml @@ -4,4 +4,4 @@ metadata: name: installer-devtron namespace: devtroncd spec: - url: https://raw.githubusercontent.com/devtron-labs/devtron/v0.2.25/manifests/installation-script + url: https://raw.githubusercontent.com/Abhinav-26/devtron/installation-script-fix/manifests/installation-script From d148d4cc2929bedaaa07e981854724f4ce490fb9 Mon Sep 17 00:00:00 2001 From: Abhinav Dubey Date: Thu, 2 Sep 2021 14:52:48 +0530 Subject: [PATCH 3/6] Update installation-script --- manifests/installation-script | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifests/installation-script b/manifests/installation-script index bb3d7ca0cf..29b45b5ada 100644 --- a/manifests/installation-script +++ b/manifests/installation-script @@ -1,5 +1,5 @@ -LTAG="v0.2.25"; -REPO_RAW_URL="https://raw.githubusercontent.com/devtron-labs/devtron/"; +LTAG="installation-script-fix"; +REPO_RAW_URL="https://raw.githubusercontent.com/Abhinav-26/devtron/"; operatorSecret = kubectl get secret -n devtroncd devtron-operator-secret; operatorConfigMap = kubectl get cm -n devtroncd devtron-operator-cm; From 3bb4c294cb9ce685d1775eb53a084b19ad6658cc Mon Sep 17 00:00:00 2001 From: Abhinav Dubey Date: Thu, 2 Sep 2021 16:51:33 +0530 Subject: [PATCH 4/6] Update devtron-installer.yaml --- manifests/install/devtron-installer.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/install/devtron-installer.yaml b/manifests/install/devtron-installer.yaml index 1be24580b3..8f8f31f1df 100644 --- a/manifests/install/devtron-installer.yaml +++ b/manifests/install/devtron-installer.yaml @@ -4,4 +4,4 @@ metadata: name: installer-devtron namespace: devtroncd spec: - url: https://raw.githubusercontent.com/Abhinav-26/devtron/installation-script-fix/manifests/installation-script + url: https://raw.githubusercontent.com/devtron-labs/devtron/v0.2.25/manifests/installation-script From 7abf5b071aad1938f2c65cbb5dad7ceb9601c62f Mon Sep 17 00:00:00 2001 From: Abhinav Dubey Date: Thu, 2 Sep 2021 16:52:38 +0530 Subject: [PATCH 5/6] Update installation-script --- manifests/installation-script | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifests/installation-script b/manifests/installation-script index 29b45b5ada..bb3d7ca0cf 100644 --- a/manifests/installation-script +++ b/manifests/installation-script @@ -1,5 +1,5 @@ -LTAG="installation-script-fix"; -REPO_RAW_URL="https://raw.githubusercontent.com/Abhinav-26/devtron/"; +LTAG="v0.2.25"; +REPO_RAW_URL="https://raw.githubusercontent.com/devtron-labs/devtron/"; operatorSecret = kubectl get secret -n devtroncd devtron-operator-secret; operatorConfigMap = kubectl get cm -n devtroncd devtron-operator-cm; From 98c29766b8d7a1acfe14d66057af2e7e743594ff Mon Sep 17 00:00:00 2001 From: Abhinav Dubey Date: Thu, 2 Sep 2021 16:52:55 +0530 Subject: [PATCH 6/6] Create installation-script