From 2137b80af811b3b3569218928c04b4d94d747d86 Mon Sep 17 00:00:00 2001
From: xeruf <27jf@pm.me>
Date: Tue, 28 Jun 2022 11:42:58 +0100
Subject: [PATCH] Hardcode the domain for the meantime
---
basic/apps/stackspout/dev/gitea-oauth-client.yaml | 2 +-
.../apps/stackspout/dev/gitea-values-configmap.yaml | 12 ++++++++++--
basic/apps/stackspout/do/vikunja-oauth-client.yaml | 2 +-
.../apps/stackspout/do/vikunja-values-configmap.yaml | 6 +++---
basic/install.sh | 4 ++--
5 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/basic/apps/stackspout/dev/gitea-oauth-client.yaml b/basic/apps/stackspout/dev/gitea-oauth-client.yaml
index 8e953da..1e3dd0b 100644
--- a/basic/apps/stackspout/dev/gitea-oauth-client.yaml
+++ b/basic/apps/stackspout/dev/gitea-oauth-client.yaml
@@ -17,5 +17,5 @@ spec:
scope: "openid profile email stackspin_roles"
secretName: stackspin-gitea-oauth-variables
#redirectUris:
- # - https://dev.${domain}/oauth/openid/
+ # - https://dev.ftt.gmbh/oauth/openid/
#tokenEndpointAuthMethod: client_secret_post
diff --git a/basic/apps/stackspout/dev/gitea-values-configmap.yaml b/basic/apps/stackspout/dev/gitea-values-configmap.yaml
index e8020d1..1b19d6b 100644
--- a/basic/apps/stackspout/dev/gitea-values-configmap.yaml
+++ b/basic/apps/stackspout/dev/gitea-values-configmap.yaml
@@ -11,11 +11,19 @@ data:
annotations:
kubernetes.io/tls-acme: "true"
hosts:
- - host: "dev.${domain}"
+ - host: "dev.ftt.gmbh"
paths:
- path: /
pathType: Prefix
tls:
- secretName: gitea-tls
hosts:
- - "dev.${domain}"
+ - "dev.ftt.gmbh"
+ gitea:
+ oauth:
+ - name: Stackspin
+ provider: 'openidConnect'
+ key: gitea
+ secret: "${client_secret}"
+ customAuthUrl: "https://sso.ftt.gmbh"
+ #autoDiscoverUrl: 'https://gitea.example.com/.well-known/openid-configuration'
diff --git a/basic/apps/stackspout/do/vikunja-oauth-client.yaml b/basic/apps/stackspout/do/vikunja-oauth-client.yaml
index db05121..804732a 100644
--- a/basic/apps/stackspout/do/vikunja-oauth-client.yaml
+++ b/basic/apps/stackspout/do/vikunja-oauth-client.yaml
@@ -17,5 +17,5 @@ spec:
scope: "openid profile email stackspin_roles"
secretName: stackspin-vikunja-oauth-variables
redirectUris:
- - https://do.${domain}/oauth/openid/
+ - https://do.ftt.gmbh/oauth/openid/
tokenEndpointAuthMethod: client_secret_post
diff --git a/basic/apps/stackspout/do/vikunja-values-configmap.yaml b/basic/apps/stackspout/do/vikunja-values-configmap.yaml
index 868dc40..f4eaffc 100644
--- a/basic/apps/stackspout/do/vikunja-values-configmap.yaml
+++ b/basic/apps/stackspout/do/vikunja-values-configmap.yaml
@@ -17,7 +17,7 @@ data:
enabled: true
providers:
- name: Stackspin
- authurl: "https://sso.${domain}"
+ authurl: "https://sso.ftt.gmbh"
clientid: vikunja
clientsecret: "${client_secret}"
local:
@@ -29,11 +29,11 @@ data:
annotations:
kubernetes.io/tls-acme: "true"
hosts:
- - host: "do.${domain}"
+ - host: "do.ftt.gmbh"
paths:
- path: /
pathType: Prefix
tls:
- secretName: vikunja
hosts:
- - "do.${domain}"
+ - "do.ftt.gmbh"
diff --git a/basic/install.sh b/basic/install.sh
index 7bbee51..cacec8f 100755
--- a/basic/install.sh
+++ b/basic/install.sh
@@ -7,7 +7,7 @@ flux create source git stackspout \
--namespace=stackspout \
--url=https://open.greenhost.net/xeruf/stackspout.git \
--branch=main \
- --interval=10m
+ --interval=3m
echo "Creating / updating kustomization stackspout in namespace stackspout"
flux create kustomization stackspout \
@@ -15,7 +15,7 @@ flux create kustomization stackspout \
--source=GitRepository/stackspout \
--path="./basic/clusters/production/" \
--prune=true \
- --interval=10m
+ --interval=3m
python $STACKSPIN/install/generate_secrets.py vikunja
python $STACKSPIN/install/generate_secrets.py gitea
--
GitLab