From 4c85969336bbe3aebf6bbc8a07e871f2ac7c5743 Mon Sep 17 00:00:00 2001
From: Maarten de Waard <maarten@greenhost.nl>
Date: Tue, 21 Dec 2021 17:39:10 +0100
Subject: [PATCH] use dashboard_postgresql_password consistently
---
.../base/single-sign-on/single-sign-on-values-configmap.yaml | 2 +-
install/templates/stackspin-single-sign-on-variables.yaml.jinja | 1 -
stackspin/cluster.py | 2 +-
3 files changed, 2 insertions(+), 3 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 2556b1ffc..fc7060c7c 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
@@ -11,7 +11,7 @@ data:
user: ${admin_email}
password: ${userbackend_admin_password}
db:
- password: ${userbackend_postgres_password}
+ password: ${dashboard_postgresql_password}
postgresql:
persistence:
diff --git a/install/templates/stackspin-single-sign-on-variables.yaml.jinja b/install/templates/stackspin-single-sign-on-variables.yaml.jinja
index 56ccc93f9..e11fbae5d 100644
--- a/install/templates/stackspin-single-sign-on-variables.yaml.jinja
+++ b/install/templates/stackspin-single-sign-on-variables.yaml.jinja
@@ -10,4 +10,3 @@ data:
kratos_postgresql_password: "{{ 32 | generate_password | b64encode }}"
kratos_session_secret: "{{ 32 | generate_password | b64encode }}"
userbackend_admin_password: "{{ 32 | generate_password | b64encode }}"
- userbackend_postgres_password: "{{ 32 | generate_password | b64encode }}"
diff --git a/stackspin/cluster.py b/stackspin/cluster.py
index c98858ac3..fd9f8fdd5 100644
--- a/stackspin/cluster.py
+++ b/stackspin/cluster.py
@@ -210,7 +210,7 @@ KUBECONFIG={cluster_dir}/kube_config_cluster.yml
'onlyoffice_rabbitmq_password'],
'stackspin-single-sign-on-variables': [
'userbackend_admin_password',
- 'userbackend_postgres_password',
+ 'dashboard_postgresql_password',
'hydra_system_secret'],
'stackspin-wordpress-variables': [
'wordpress_admin_password',
--
GitLab