From 9598716fe68d3e2877816baa8b1bc284602b662f Mon Sep 17 00:00:00 2001
From: Maarten de Waard <maarten@greenhost.nl>
Date: Fri, 12 Nov 2021 11:08:39 +0100
Subject: [PATCH] use newest single-se-sign-on version and adjust values for
new hydra
---
.../base/single-sign-on/single-sign-on-values-configmap.yaml | 3 ++-
flux2/infrastructure/sources/single-sign-on.yaml | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/flux2/core/base/single-sign-on/single-sign-on-values-configmap.yaml b/flux2/core/base/single-sign-on/single-sign-on-values-configmap.yaml
index 923ea1ef5..1c72c28ac 100644
--- a/flux2/core/base/single-sign-on/single-sign-on-values-configmap.yaml
+++ b/flux2/core/base/single-sign-on/single-sign-on-values-configmap.yaml
@@ -48,7 +48,8 @@ data:
login: "https://sso.${domain}/login"
consent: "https://sso.${domain}/consent"
secrets:
- system: "${hydra_system_secret}"
+ system:
+ - "${hydra_system_secret}"
dsn: "memory"
ingress:
public:
diff --git a/flux2/infrastructure/sources/single-sign-on.yaml b/flux2/infrastructure/sources/single-sign-on.yaml
index 0b51a45cc..ed825d265 100644
--- a/flux2/infrastructure/sources/single-sign-on.yaml
+++ b/flux2/infrastructure/sources/single-sign-on.yaml
@@ -14,4 +14,5 @@ spec:
# For all available options, see:
# https://toolkit.fluxcd.io/components/source/api/#source.toolkit.fluxcd.io/v1beta1.GitRepositoryRef
ref:
- tag: 0.2.11
+ # tag: 0.2.11
+ branch: 96-bump-chart-version-because-of-hydra-upgrade
--
GitLab