From 76374fc0c6b382c9cc2de7a22b5237d0cc0b93f4 Mon Sep 17 00:00:00 2001
From: Maarten de Waard <maarten@greenhost.nl>
Date: Wed, 8 Dec 2021 16:10:46 +0100
Subject: [PATCH] do not retry sso installation, increase sso installation
timeout
---
flux2/core/base/single-sign-on/release.yaml | 4 +---
.../single-sign-on/single-sign-on-values-configmap.yaml | 6 ++++++
.../templates/stackspin-single-sign-on-variables.yaml.jinja | 1 -
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/flux2/core/base/single-sign-on/release.yaml b/flux2/core/base/single-sign-on/release.yaml
index 02aefb7bf..7f240d648 100644
--- a/flux2/core/base/single-sign-on/release.yaml
+++ b/flux2/core/base/single-sign-on/release.yaml
@@ -17,9 +17,7 @@ spec:
namespace: flux-system
interval: 1h0m0s
install:
- remediation:
- retries: 3
- timeout: 10m
+ timeout: 20m
upgrade:
crds: CreateReplace
valuesFrom:
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 cfa0d5974..5f1c178a4 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
@@ -7,6 +7,12 @@ data:
values.yaml: |
singleSignOnHost: &SSO_HOST "sso.${domain}"
+ login:
+ user: ${admin_email}
+ password: ${userbackend_admin_password}
+ db:
+ password: ${userbackend_postgres_password}
+
postgresql:
persistence:
existingClaim: single-sign-on-database
diff --git a/install/templates/stackspin-single-sign-on-variables.yaml.jinja b/install/templates/stackspin-single-sign-on-variables.yaml.jinja
index 70caab657..31502141f 100644
--- a/install/templates/stackspin-single-sign-on-variables.yaml.jinja
+++ b/install/templates/stackspin-single-sign-on-variables.yaml.jinja
@@ -4,7 +4,6 @@ kind: Secret
metadata:
name: stackspin-single-sign-on-variables
data:
- userbackend_admin_username: '{{ "admin" | b64encode }}'
userbackend_admin_password: "{{ 32 | generate_password | b64encode }}"
userbackend_postgres_password: "{{ 32 | generate_password | b64encode }}"
hydra_system_secret: "{{ 32 | generate_password | b64encode }}"
--
GitLab