From 6209cfbcc7dfee8ce9c8f30e8a37281d6e3e2973 Mon Sep 17 00:00:00 2001 From: Ioannis Canellos Date: Wed, 4 Dec 2024 20:48:39 +0200 Subject: [PATCH] chore: uncomment argocd backend config --- .../helm/configmap/app-config.qshift.yaml | 19 +++++++++--------- manifest/templates/app-config.qshift.tmpl | 20 +++++++++---------- 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/manifest/helm/configmap/app-config.qshift.yaml b/manifest/helm/configmap/app-config.qshift.yaml index f8705ab..159368b 100644 --- a/manifest/helm/configmap/app-config.qshift.yaml +++ b/manifest/helm/configmap/app-config.qshift.yaml @@ -76,15 +76,15 @@ integrations: # about setting up the GitHub integration here: https://backstage.io/docs/getting-started/configuration#setting-up-a-github-integration token: ${GITHUB_PERSONAL_ACCESS_TOKEN} -#argocd: -# username: admin -# password: ${ARGOCD_ADMIN_PASSWORD} -# baseUrl: ${ARGOCD_SERVER} -# appLocatorMethods: -# - type: config -# instances: -# - name: argocdQShift -# url: ${ARGOCD_SERVER} +argocd: + username: admin + password: ${ARGOCD_ADMIN_PASSWORD} + baseUrl: ${ARGOCD_SERVER} + appLocatorMethods: + - type: config + instances: + - name: argocdQShift + url: ${ARGOCD_SERVER} kubernetes: serviceLocatorMethod: @@ -108,6 +108,7 @@ kubernetes: - apiVersion: 'v1' group: 'route.openshift.io' plural: 'routes' + proxy: '/argocd/api': target: ${ARGOCD_SERVER}/api/v1/ diff --git a/manifest/templates/app-config.qshift.tmpl b/manifest/templates/app-config.qshift.tmpl index 250115d..c0cbaf3 100644 --- a/manifest/templates/app-config.qshift.tmpl +++ b/manifest/templates/app-config.qshift.tmpl @@ -81,15 +81,15 @@ integrations: username: ${GITEA_USERNAME} password: "${GITEA_PASSWORD}" -#argocd: -# username: ${ARGOCD_ADMIN_USER} -# password: ${ARGOCD_ADMIN_PASSWORD} -# baseUrl: ${ARGOCD_SERVER} -# appLocatorMethods: -# - type: config -# instances: -# - name: argocdQShift -# url: ${ARGOCD_SERVER} +argocd: + username: ${ARGOCD_ADMIN_USER} + password: ${ARGOCD_ADMIN_PASSWORD} + baseUrl: ${ARGOCD_SERVER} + appLocatorMethods: + - type: config + instances: + - name: argocdQShift + url: ${ARGOCD_SERVER} kubernetes: serviceLocatorMethod: @@ -120,4 +120,4 @@ proxy: secure: false headers: Cookie: - $env: ${ARGOCD_AUTH_TOKEN} + $env: ${ARGOCD_COOKIE}