From 73e44cc3011f1373928c04ad861601db2073776c Mon Sep 17 00:00:00 2001
From: xeruf <27jf@pm.me>
Date: Mon, 12 Feb 2024 20:44:23 +0100
Subject: [PATCH] apps: try to fix inconsistent configmap domain substitution
---
apps/code/gitea/gitea-values-configmap.yaml | 2 +-
apps/forge/forgejo-secrets-kustomization.yaml | 4 ----
apps/ninja/invoiceninja-kustomization.yaml | 4 ++--
apps/ninja/invoiceninja-secrets-kustomization.yaml | 5 -----
apps/support/zammad/zammad-values-configmap.yaml | 2 +-
apps/time/kimai/kimai-values-configmap.yaml | 2 +-
6 files changed, 5 insertions(+), 14 deletions(-)
diff --git a/apps/code/gitea/gitea-values-configmap.yaml b/apps/code/gitea/gitea-values-configmap.yaml
index 7c0156b..b96fd30 100644
--- a/apps/code/gitea/gitea-values-configmap.yaml
+++ b/apps/code/gitea/gitea-values-configmap.yaml
@@ -26,7 +26,7 @@ data:
provider: "openidConnect"
key: "${client_id}"
secret: "${client_secret}"
- autoDiscoverUrl: "https://sso.${domain}/.well-known/openid-configuration"
+ autoDiscoverUrl: "https://${hydra_domain}/.well-known/openid-configuration"
iconUrl: "https://dashboard.${domain}/favicon-32x32.png"
# https://docs.gitea.io/en-us/config-cheat-sheet
config:
diff --git a/apps/forge/forgejo-secrets-kustomization.yaml b/apps/forge/forgejo-secrets-kustomization.yaml
index 301291e..2c0e363 100644
--- a/apps/forge/forgejo-secrets-kustomization.yaml
+++ b/apps/forge/forgejo-secrets-kustomization.yaml
@@ -16,7 +16,3 @@ spec:
dependsOn:
- name: flux
- name: secrets-controller
- postBuild:
- substituteFrom:
- - kind: Secret
- name: stackspin-cluster-variables
diff --git a/apps/ninja/invoiceninja-kustomization.yaml b/apps/ninja/invoiceninja-kustomization.yaml
index adf4475..4c58fb9 100644
--- a/apps/ninja/invoiceninja-kustomization.yaml
+++ b/apps/ninja/invoiceninja-kustomization.yaml
@@ -21,10 +21,10 @@ spec:
#- name: single-sign-on
postBuild:
substituteFrom:
- - kind: ConfigMap
- name: stackspin-invoiceninja-kustomization-variables
- kind: Secret
name: stackspin-cluster-variables
+ - kind: ConfigMap
+ name: stackspin-invoiceninja-kustomization-variables
- kind: Secret
name: stackspin-invoiceninja-variables
- kind: Secret
diff --git a/apps/ninja/invoiceninja-secrets-kustomization.yaml b/apps/ninja/invoiceninja-secrets-kustomization.yaml
index b9db8d3..29cab4e 100644
--- a/apps/ninja/invoiceninja-secrets-kustomization.yaml
+++ b/apps/ninja/invoiceninja-secrets-kustomization.yaml
@@ -1,4 +1,3 @@
----
apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
kind: Kustomization
metadata:
@@ -16,7 +15,3 @@ spec:
dependsOn:
- name: flux
- name: secrets-controller
- postBuild:
- substituteFrom:
- - kind: Secret
- name: stackspin-cluster-variables
diff --git a/apps/support/zammad/zammad-values-configmap.yaml b/apps/support/zammad/zammad-values-configmap.yaml
index 45e4f7e..8af3491 100644
--- a/apps/support/zammad/zammad-values-configmap.yaml
+++ b/apps/support/zammad/zammad-values-configmap.yaml
@@ -37,4 +37,4 @@ data:
# - name: Stackspin
# key: "${client_id}"
# secret: "${client_secret}"
- # autoDiscoverUrl: 'https://sso.${domain}/.well-known/openid-configuration'
+ # autoDiscoverUrl: 'https://${hydra_domain}/.well-known/openid-configuration'
diff --git a/apps/time/kimai/kimai-values-configmap.yaml b/apps/time/kimai/kimai-values-configmap.yaml
index 9a271c0..3709b5f 100644
--- a/apps/time/kimai/kimai-values-configmap.yaml
+++ b/apps/time/kimai/kimai-values-configmap.yaml
@@ -27,4 +27,4 @@ data:
# - name: Stackspin
# key: "${client_id}"
# secret: "${client_secret}"
- # autoDiscoverUrl: 'https://sso.${domain}/.well-known/openid-configuration'
+ # autoDiscoverUrl: 'https://${hydra_domain}/.well-known/openid-configuration'
--
GitLab