From 128ccf1e9b80960890561f0f2fad291a5f015dfc Mon Sep 17 00:00:00 2001 From: yogananth subramanian Date: Wed, 19 Jun 2024 12:21:01 +0530 Subject: [PATCH] fix(RHIDP-2675): fix backend secret for ver 1.1 Patch adds backward compatibility to use RHDH 1.1 helm repo, by setting backend secret name in the helm charts as a variable. Tested with below config: For RHDH 1.1 RHDH_HELM_REPO="https://raw.githubusercontent.com/rhdh-bot/openshift-helm-charts/developer-hub-1.1.0/installation/" RHDH_HELM_CHART="developer-hub" For RHDH 1.2 RHDH_HELM_REPO=https://raw.githubusercontent.com/rhdh-bot/openshift-helm-charts/redhat-developer-hub-1.2-103-CI/installation/ RHDH_HELM_CHART=redhat-developer-hub --- .../template/backstage/helm/chart-values.image-override.yaml | 2 +- ci-scripts/rhdh-setup/template/backstage/helm/chart-values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ci-scripts/rhdh-setup/template/backstage/helm/chart-values.image-override.yaml b/ci-scripts/rhdh-setup/template/backstage/helm/chart-values.image-override.yaml index 0d93bc5..ee0a0ed 100644 --- a/ci-scripts/rhdh-setup/template/backstage/helm/chart-values.image-override.yaml +++ b/ci-scripts/rhdh-setup/template/backstage/helm/chart-values.image-override.yaml @@ -61,7 +61,7 @@ upstream: valueFrom: secretKeyRef: key: backend-secret - name: "{{ .Release.Name }}-auth" + name: '{{ include "janus-idp.backend-secret-name" $ }}' - name: GITHUB_TOKEN valueFrom: secretKeyRef: diff --git a/ci-scripts/rhdh-setup/template/backstage/helm/chart-values.yaml b/ci-scripts/rhdh-setup/template/backstage/helm/chart-values.yaml index b4de2be..67d7b98 100644 --- a/ci-scripts/rhdh-setup/template/backstage/helm/chart-values.yaml +++ b/ci-scripts/rhdh-setup/template/backstage/helm/chart-values.yaml @@ -61,7 +61,7 @@ upstream: valueFrom: secretKeyRef: key: backend-secret - name: "{{ .Release.Name }}-auth" + name: '{{ include "janus-idp.backend-secret-name" $ }}' - name: GITHUB_TOKEN valueFrom: secretKeyRef: