This commit is contained in:
franz.germann 2025-04-16 15:24:28 +02:00
parent 42d65e95be
commit 11d9ad5fcc
2 changed files with 8 additions and 8 deletions

View file

@ -51,9 +51,9 @@ spec:
git config --global user.email "bot@bots.de" git config --global user.email "bot@bots.de"
git config --global user.name "bot" git config --global user.name "bot"
git clone https://${GIT_USERNAME}:${GIT_PASSWORD}@{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder.git git clone https://${GIT_USERNAME}:${GIT_PASSWORD}@gitea-${DOMAIN}/giteaAdmin/edfbuilder.git
cd edfbuilder cd edfbuilder
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 yq eval '.configs.cm."oidc.config" = "name: Keycloak\nissuer: https://${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 git add stacks/core/argocd/values.yaml
git commit -m "adds Forgejo SSO config" git commit -m "adds Forgejo SSO config"

View file

@ -26,10 +26,10 @@ spec:
- | - |
#! /bin/bash #! /bin/bash
if [[ "$client_secret" == "" ]]; # if [[ "$client_secret" == "" ]];
then # then
exit 1 # exit 1
fi # fi
apt -qq update apt -qq update
apt -qq install git wget -y apt -qq install git wget -y
@ -50,14 +50,14 @@ spec:
git config --global user.email "bot@bots.de" git config --global user.email "bot@bots.de"
git config --global user.name "giteaAdmin" git config --global user.name "giteaAdmin"
git clone https://${GIT_USERNAME}:${GIT_PASSWORD}@{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder.git git clone https://${GIT_USERNAME}:${GIT_PASSWORD}@gitea-${DOMAIN}/giteaAdmin/edfbuilder.git
cd edfbuilder cd edfbuilder
yq eval ".gitea.oauth = [ yq eval ".gitea.oauth = [
{ {
\"name\": \"Keycloak\", \"name\": \"Keycloak\",
\"provider\": \"openidConnect\", \"provider\": \"openidConnect\",
\"existingSecret\": \"auth-generic-oauth-secret\", \"existingSecret\": \"auth-generic-oauth-secret\",
\"autoDiscoverUrl\": \"https://{{{ .Env.DOMAIN }}}/keycloak/realms/cnoe/.well-known/openid-configuration\" \"autoDiscoverUrl\": \"https://${DOMAIN}/keycloak/realms/cnoe/.well-known/openid-configuration\"
} }
] | ] |
(.gitea.oauth[] | .name) |= (. style=\"single\") (.gitea.oauth[] | .name) |= (. style=\"single\")