From 9dd9184cfd7329f8234a95406116e98840084ed2 Mon Sep 17 00:00:00 2001 From: "franz.germann" Date: Thu, 17 Apr 2025 14:31:56 +0200 Subject: [PATCH] uses the new secrets for 'git clone'-command --- template/stacks/core/argocd-sso/argocd-sso-config.yaml | 2 +- template/stacks/core/forgejo-sso/forgejo-sso-config.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/template/stacks/core/argocd-sso/argocd-sso-config.yaml b/template/stacks/core/argocd-sso/argocd-sso-config.yaml index 2770527..f9b7b1c 100644 --- a/template/stacks/core/argocd-sso/argocd-sso-config.yaml +++ b/template/stacks/core/argocd-sso/argocd-sso-config.yaml @@ -61,7 +61,7 @@ spec: git config --global user.email "bot@bots.de" git config --global user.name "bot" - git clone https://${GIT_USERNAME}:${GIT_PASSWORD}@gitea-${DOMAIN}/giteaAdmin/edfbuilder.git + git clone https://${FORGEJO_USER}:${GIT_PASSWORD}@gitea-${DOMAIN}/giteaAdmin/edfbuilder.git cd edfbuilder yq eval '.configs.cm."oidc.config" = "name: Keycloak\nissuer: https://192-168-197-2.c-one-infra.de/keycloak/realms/cnoe\nclientID: argocd\nclientSecret: $auth-generic-oauth-secret:client_secret\nrequestedScopes: [\"openid\", \"profile\", \"email\", \"groups\"]"' -i stacks/core/argocd/values.yaml diff --git a/template/stacks/core/forgejo-sso/forgejo-sso-config.yaml b/template/stacks/core/forgejo-sso/forgejo-sso-config.yaml index cc7e82a..a9a9a3a 100644 --- a/template/stacks/core/forgejo-sso/forgejo-sso-config.yaml +++ b/template/stacks/core/forgejo-sso/forgejo-sso-config.yaml @@ -21,7 +21,7 @@ spec: valueFrom: secretKeyRef: name: auth-generic-oauth-secret - key: client_secret + key: secret - name: FORGEJO_USER valueFrom: secretKeyRef: @@ -66,7 +66,7 @@ spec: git config --global user.email "bot@bots.de" git config --global user.name "giteaAdmin" - git clone https://${GIT_USERNAME}:${GIT_PASSWORD}@gitea-${DOMAIN}/giteaAdmin/edfbuilder.git + git clone https://${FORGEJO_USER}:${FORGEJO_TOKEN}@gitea-${DOMAIN}/giteaAdmin/edfbuilder.git cd edfbuilder yq eval ".gitea.oauth = [ {