From dddac82cf4dea23e808a735a2989b07c4a355fd0 Mon Sep 17 00:00:00 2001
From: Maarten de Waard <maarten@greenhost.nl>
Date: Mon, 20 Dec 2021 16:25:15 +0100
Subject: [PATCH] fix client_secret substitution for monitoring
---
.../apps/monitoring/kube-prometheus-stack-values-configmap.yaml | 2 +-
flux2/cluster/optional/monitoring/monitoring.yaml | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/flux2/apps/monitoring/kube-prometheus-stack-values-configmap.yaml b/flux2/apps/monitoring/kube-prometheus-stack-values-configmap.yaml
index 11bb919a2..03cf487d6 100644
--- a/flux2/apps/monitoring/kube-prometheus-stack-values-configmap.yaml
+++ b/flux2/apps/monitoring/kube-prometheus-stack-values-configmap.yaml
@@ -155,7 +155,7 @@ data:
name: Stackspin
enabled: true
client_id: grafana
- client_secret: "${grafana_oauth_client_secret}"
+ client_secret: "${client_secret}"
scopes: "openid profile email stackspin_roles"
auth_url: "https://sso.${domain}/oauth2/auth"
token_url: "https://sso.${domain}/oauth2/token"
diff --git a/flux2/cluster/optional/monitoring/monitoring.yaml b/flux2/cluster/optional/monitoring/monitoring.yaml
index 081655743..aea979770 100644
--- a/flux2/cluster/optional/monitoring/monitoring.yaml
+++ b/flux2/cluster/optional/monitoring/monitoring.yaml
@@ -61,6 +61,8 @@ spec:
substituteFrom:
- kind: Secret
name: stackspin-kube-prometheus-stack-variables
+ - kind: Secret
+ name: stackspin-kube-prometheus-stack-oauth-variables
- kind: Secret
name: stackspin-oauth-variables
- kind: Secret
--
GitLab