From e903a49b29aa486e13824f8b9a626192a465eb0a Mon Sep 17 00:00:00 2001 From: "franz.germann" Date: Wed, 30 Apr 2025 11:31:27 +0200 Subject: [PATCH] updates sso jobs to use the cefor stacks-instances repository --- .../stacks/core/argocd/manifests/argocd-sso-config.yaml | 7 +++++-- .../stacks/core/forgejo/manifests/forgejo-sso-config.yaml | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/template/stacks/core/argocd/manifests/argocd-sso-config.yaml b/template/stacks/core/argocd/manifests/argocd-sso-config.yaml index 27160cf..e145bb3 100644 --- a/template/stacks/core/argocd/manifests/argocd-sso-config.yaml +++ b/template/stacks/core/argocd/manifests/argocd-sso-config.yaml @@ -29,6 +29,9 @@ spec: - | #! /bin/bash + CLIENT_REPO_ID=fngr + LOCAL_DOMAIN=factory.c-one-infra.de + apt -qq update apt -qq install git wget -y if [[ "$(uname -m)" == "x86_64" ]]; then @@ -44,8 +47,8 @@ spec: git config --global user.email "bot@bots.de" git config --global user.name "bot" - git clone https://${FORGEJO_USER}:${FORGEJO_TOKEN}@{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder.git - cd edfbuilder + git clone https://${FORGEJO_USER}:${FORGEJO_TOKEN}@forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/stacks-instances.git + cd $(CLIENT_REPO_ID)/$(LOCAL_DOMAIN) yq eval '.configs.cm."oidc.config" = "name: Keycloak\nissuer: https://{{{ .Env.DOMAIN }}}/keycloak/realms/cnoe\nclientID: argocd\nclientSecret: $auth-generic-oauth-secret:client_secret\nrequestedScopes: [\"openid\", \"profile\", \"email\", \"groups\"]"' -i stacks/core/argocd/values.yaml git add stacks/core/argocd/values.yaml diff --git a/template/stacks/core/forgejo/manifests/forgejo-sso-config.yaml b/template/stacks/core/forgejo/manifests/forgejo-sso-config.yaml index 875e348..bee50fe 100644 --- a/template/stacks/core/forgejo/manifests/forgejo-sso-config.yaml +++ b/template/stacks/core/forgejo/manifests/forgejo-sso-config.yaml @@ -29,6 +29,9 @@ spec: - | #! /bin/bash + CLIENT_REPO_ID=fngr + LOCAL_DOMAIN=factory.c-one-infra.de + apt -qq update apt -qq install git wget -y if [[ "$(uname -m)" == "x86_64" ]]; then @@ -44,8 +47,8 @@ spec: git config --global user.email "bot@bots.de" git config --global user.name "giteaAdmin" - git clone https://${FORGEJO_USER}:${FORGEJO_TOKEN}@{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder.git - cd edfbuilder + git clone https://${FORGEJO_USER}:${FORGEJO_TOKEN}@forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/stacks-instances.git + cd $(CLIENT_REPO_ID)/$(LOCAL_DOMAIN) yq eval ".gitea.oauth = [ { \"name\": \"Keycloak\",