From e9623ea5fbe357e73b505d0f892b232bcfd7a426 Mon Sep 17 00:00:00 2001
From: Maarten de Waard <maarten@greenhost.nl>
Date: Thu, 18 Nov 2021 10:47:01 +0100
Subject: [PATCH] use sso version without postgres pvc
---
flux2/core/base/single-sign-on/pvc-database.yaml | 2 +-
.../base/single-sign-on/single-sign-on-values-configmap.yaml | 2 +-
flux2/infrastructure/sources/single-sign-on.yaml | 3 ++-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/flux2/core/base/single-sign-on/pvc-database.yaml b/flux2/core/base/single-sign-on/pvc-database.yaml
index 2167bd048..d75e6df3a 100644
--- a/flux2/core/base/single-sign-on/pvc-database.yaml
+++ b/flux2/core/base/single-sign-on/pvc-database.yaml
@@ -2,7 +2,7 @@
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
- name: stackspin-single-sign-on-database
+ name: single-sign-on-database
spec:
accessModes:
- ReadWriteOnce
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 662e7bca5..e77ce0cd6 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
@@ -41,7 +41,7 @@ data:
postgresql:
persistence:
- existingClaim: stackspin-single-sign-on-database
+ existingClaim: single-sign-on-database
initdbScripts:
setup.sql: |
CREATE USER hydra WITH PASSWORD '${hydra_postgresql_password}';
diff --git a/flux2/infrastructure/sources/single-sign-on.yaml b/flux2/infrastructure/sources/single-sign-on.yaml
index a418f77a0..69c64d9a8 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.4.1
+ # tag: 0.4.1
+ branch: 99-database-pvc-creation-should-be-optional
--
GitLab