From ee3081910ce71d84037d4925addd46504a257480 Mon Sep 17 00:00:00 2001 From: Brad McCoy Date: Tue, 29 Nov 2022 10:28:37 +1000 Subject: [PATCH] feat: add backstage configfor argo Signed-off-by: Brad McCoy --- app-config.production.yaml | 11 +++++++++++ app-config.yaml | 9 +++------ chart/backstage/Chart.yaml | 4 ++-- chart/backstage/templates/backend/deployment.yaml | 10 ++++++++++ 4 files changed, 26 insertions(+), 8 deletions(-) diff --git a/app-config.production.yaml b/app-config.production.yaml index 1c38d12..ec39d7b 100644 --- a/app-config.production.yaml +++ b/app-config.production.yaml @@ -59,6 +59,17 @@ kubernetes: skipTLSVerify: true skipMetricsLookup: true +proxy: + '/argocd/api': + target: ${ARGOCD_BASE_URL}/api/v1/ + changeOrigin: true + secure: false + headers: + Cookie: + $env: ${ARGOCD_AUTH_TOKEN} +argocd: + baseUrl: ${ARGOCD_BASE_URL} + # plugin: # auth: # connection: diff --git a/app-config.yaml b/app-config.yaml index 3725c08..b4573e2 100644 --- a/app-config.yaml +++ b/app-config.yaml @@ -62,17 +62,14 @@ integrations: proxy: '/argocd/api': - # url to the api of your hosted argoCD instance - target: https://argocd.ortelius.io/api/v1/ + target: ${ARGOCD_BASE_URL}/api/v1/ changeOrigin: true - # this line is required if your hosted argoCD instance has self-signed certificate secure: false headers: Cookie: - $env: ARGOCD_AUTH_TOKEN - + $env: ${ARGOCD_AUTH_TOKEN} argocd: - baseUrl: https://argocd.ortelius.io + baseUrl: ${ARGOCD_BASE_URL} # Reference documentation http://backstage.io/docs/features/techdocs/configuration # Note: After experimenting with basic setup, use CI/CD to generate docs diff --git a/chart/backstage/Chart.yaml b/chart/backstage/Chart.yaml index 0439e80..804f62d 100644 --- a/chart/backstage/Chart.yaml +++ b/chart/backstage/Chart.yaml @@ -4,8 +4,8 @@ description: A Helm chart for the Ortelius Backstage Instance type: application -version: 0.0.14 -appVersion: "0.0.14" +version: 0.0.15 +appVersion: "0.0.15" home: "https://ortelius.io" icon: https://backstage.io/img/twitter-summary.png diff --git a/chart/backstage/templates/backend/deployment.yaml b/chart/backstage/templates/backend/deployment.yaml index 4e64259..b3b3ce5 100644 --- a/chart/backstage/templates/backend/deployment.yaml +++ b/chart/backstage/templates/backend/deployment.yaml @@ -84,6 +84,16 @@ spec: secretKeyRef: name: backstage-secrets key: KUBERNETES_TOKEN + - name: ARGOCD_BASE_URL + valueFrom: + secretKeyRef: + name: backstage-secrets + key: ARGOCD_URL + - name: ARGOCD_AUTH_TOKEN + valueFrom: + secretKeyRef: + name: backstage-secrets + key: ARGOCD_AUTH_TOKEN {{- with .Values.backend.env }} {{- toYaml . | nindent 12 }} {{- end }}