From a59a74b3e370126e1117e911b8d4c11c3d2d4b33 Mon Sep 17 00:00:00 2001 From: xeruf <27jf@pm.me> Date: Wed, 29 Jun 2022 23:41:48 +0100 Subject: [PATCH] apps: parametrize variables --- basic/apps/dev/gitea-oauth-client.yaml | 2 +- basic/apps/dev/gitea-values-configmap.yaml | 6 +++--- basic/apps/do/vikunja-oauth-client.yaml | 2 +- basic/apps/do/vikunja-values-configmap.yaml | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/basic/apps/dev/gitea-oauth-client.yaml b/basic/apps/dev/gitea-oauth-client.yaml index 1e3dd0b..8e953da 100644 --- a/basic/apps/dev/gitea-oauth-client.yaml +++ b/basic/apps/dev/gitea-oauth-client.yaml @@ -17,5 +17,5 @@ spec: scope: "openid profile email stackspin_roles" secretName: stackspin-gitea-oauth-variables #redirectUris: - # - https://dev.ftt.gmbh/oauth/openid/ + # - https://dev.${domain}/oauth/openid/ #tokenEndpointAuthMethod: client_secret_post diff --git a/basic/apps/dev/gitea-values-configmap.yaml b/basic/apps/dev/gitea-values-configmap.yaml index 6cdab71..8305beb 100644 --- a/basic/apps/dev/gitea-values-configmap.yaml +++ b/basic/apps/dev/gitea-values-configmap.yaml @@ -11,19 +11,19 @@ data: annotations: kubernetes.io/tls-acme: "true" hosts: - - host: "dev.ftt.gmbh" + - host: "dev.${domain}" paths: - path: / pathType: Prefix tls: - secretName: gitea-tls hosts: - - "dev.ftt.gmbh" + - "dev.${domain}" gitea: oauth: - name: Stackspin provider: 'openidConnect' key: "${client_id}" secret: "${client_secret}" - customAuthUrl: "https://sso.ftt.gmbh" + customAuthUrl: "https://sso.${domain}" #autoDiscoverUrl: 'https://gitea.example.com/.well-known/openid-configuration' diff --git a/basic/apps/do/vikunja-oauth-client.yaml b/basic/apps/do/vikunja-oauth-client.yaml index 804732a..db05121 100644 --- a/basic/apps/do/vikunja-oauth-client.yaml +++ b/basic/apps/do/vikunja-oauth-client.yaml @@ -17,5 +17,5 @@ spec: scope: "openid profile email stackspin_roles" secretName: stackspin-vikunja-oauth-variables redirectUris: - - https://do.ftt.gmbh/oauth/openid/ + - https://do.${domain}/oauth/openid/ tokenEndpointAuthMethod: client_secret_post diff --git a/basic/apps/do/vikunja-values-configmap.yaml b/basic/apps/do/vikunja-values-configmap.yaml index f4eaffc..acc7f7d 100644 --- a/basic/apps/do/vikunja-values-configmap.yaml +++ b/basic/apps/do/vikunja-values-configmap.yaml @@ -17,8 +17,8 @@ data: enabled: true providers: - name: Stackspin - authurl: "https://sso.ftt.gmbh" - clientid: vikunja + authurl: "https://sso.${domain}/" + clientid: "${client_id}" clientsecret: "${client_secret}" local: enabled: false @@ -29,11 +29,11 @@ data: annotations: kubernetes.io/tls-acme: "true" hosts: - - host: "do.ftt.gmbh" + - host: "do.${domain}" paths: - path: / pathType: Prefix tls: - secretName: vikunja hosts: - - "do.ftt.gmbh" + - "do.${domain}"