From b0117315dd9aa6943d8a35daa81385f7c4013c35 Mon Sep 17 00:00:00 2001
From: Maarten de Waard <maarten@greenhost.nl>
Date: Mon, 20 Dec 2021 17:31:04 +0100
Subject: [PATCH] fix monitoring, wp and zulip oidc
---
.../apps/monitoring/kube-prometheus-stack-values-configmap.yaml | 2 +-
flux2/apps/wordpress/kustomization.yaml | 2 +-
flux2/apps/zulip/kustomization.yaml | 1 -
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/flux2/apps/monitoring/kube-prometheus-stack-values-configmap.yaml b/flux2/apps/monitoring/kube-prometheus-stack-values-configmap.yaml
index 03cf487d6..5d65d1c59 100644
--- a/flux2/apps/monitoring/kube-prometheus-stack-values-configmap.yaml
+++ b/flux2/apps/monitoring/kube-prometheus-stack-values-configmap.yaml
@@ -154,7 +154,7 @@ data:
auth.generic_oauth:
name: Stackspin
enabled: true
- client_id: grafana
+ client_id: kube-prometheus-stack
client_secret: "${client_secret}"
scopes: "openid profile email stackspin_roles"
auth_url: "https://sso.${domain}/oauth2/auth"
diff --git a/flux2/apps/wordpress/kustomization.yaml b/flux2/apps/wordpress/kustomization.yaml
index 3481b8ad7..2613c9160 100644
--- a/flux2/apps/wordpress/kustomization.yaml
+++ b/flux2/apps/wordpress/kustomization.yaml
@@ -5,4 +5,4 @@ resources:
- pvc.yaml
- release.yaml
- wordpress-values-configmap.yaml
- - wp-oauth.yaml
+ - wordpress-oauth-client.yaml
diff --git a/flux2/apps/zulip/kustomization.yaml b/flux2/apps/zulip/kustomization.yaml
index 8cc5ffa9f..b44408188 100644
--- a/flux2/apps/zulip/kustomization.yaml
+++ b/flux2/apps/zulip/kustomization.yaml
@@ -1,6 +1,5 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
-namespace: stackspin-apps
resources:
- release.yaml
- zulip-data-pvc.yaml
--
GitLab