From f0abbd50f79105a529ff1a762a2619be27e93616 Mon Sep 17 00:00:00 2001
From: Maarten de Waard <maarten@greenhost.nl>
Date: Wed, 23 Feb 2022 13:56:03 +0100
Subject: [PATCH] remove postgresql from password names
---
.../single-sign-on-database-values-configmap.yaml | 8 +++++---
.../single-sign-on/single-sign-on-values-configmap.yaml | 6 +++---
.../stackspin-single-sign-on-variables.yaml.jinja | 7 ++++---
stackspin/cluster.py | 2 +-
4 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/flux2/core/base/single-sign-on/single-sign-on-database-values-configmap.yaml b/flux2/core/base/single-sign-on/single-sign-on-database-values-configmap.yaml
index db6e40363..876e898ed 100644
--- a/flux2/core/base/single-sign-on/single-sign-on-database-values-configmap.yaml
+++ b/flux2/core/base/single-sign-on/single-sign-on-database-values-configmap.yaml
@@ -5,14 +5,16 @@ metadata:
name: stackspin-single-sign-on-database-values
data:
values.yaml: |
+ auth:
+ rootPassword: '${database_root_password}'
persistence:
enabled: true
existingClaim: single-sign-on-database
initdbScripts:
setup.sql: |
- CREATE USER hydra IDENTIFIED BY '${hydra_postgresql_password}';
- CREATE USER kratos IDENTIFIED BY '${kratos_postgresql_password}';
- CREATE USER stackspin IDENTIFIED BY '${dashboard_postgresql_password}';
+ CREATE USER hydra IDENTIFIED BY '${hydra_database_password}';
+ CREATE USER kratos IDENTIFIED BY '${kratos_database_password}';
+ CREATE USER stackspin IDENTIFIED BY '${dashboard_database_password}';
CREATE DATABASE kratos;
CREATE DATABASE hydra;
CREATE DATABASE stackspin;
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 7340801a9..31f2a5366 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
@@ -12,7 +12,7 @@ data:
password: ${userbackend_admin_password}
db:
hostname: single-sign-on-database-mariadb
- password: ${dashboard_postgresql_password}
+ password: ${dashboard_database_password}
hydra-maester:
# Watches the flux-system namespace because that is where the app
@@ -33,7 +33,7 @@ data:
secrets:
system:
- "${hydra_system_secret}"
- dsn: "mysql://hydra:${hydra_postgresql_password}@tcp(single-sign-on-database-mariadb:3306)/hydra?parseTime=true&sql_mode=''"
+ dsn: "mysql://hydra:${hydra_database_password}@tcp(single-sign-on-database-mariadb:3306)/hydra?parseTime=true&sql_mode=''"
ingress:
public:
enabled: true
@@ -55,7 +55,7 @@ data:
kratos:
kratos:
config:
- dsn: "mysql://kratos:${kratos_postgresql_password}@tcp(single-sign-on-database-mariadb:3306)/kratos?parseTime=true&sql_mode=''"
+ dsn: "mysql://kratos:${kratos_database_password}@tcp(single-sign-on-database-mariadb:3306)/kratos?parseTime=true&sql_mode=''"
serve:
public:
base_url: https://sso.${domain}/api/
diff --git a/install/templates/stackspin-single-sign-on-variables.yaml.jinja b/install/templates/stackspin-single-sign-on-variables.yaml.jinja
index e11fbae5d..beb7eb2ba 100644
--- a/install/templates/stackspin-single-sign-on-variables.yaml.jinja
+++ b/install/templates/stackspin-single-sign-on-variables.yaml.jinja
@@ -4,9 +4,10 @@ kind: Secret
metadata:
name: stackspin-single-sign-on-variables
data:
- dashboard_postgresql_password: "{{ 32 | generate_password | b64encode }}"
- hydra_postgresql_password: "{{ 32 | generate_password | b64encode }}"
+ database_root_password: "{{ 32 | generate_password | b64encode }}"
+ dashboard_database_password: "{{ 32 | generate_password | b64encode }}"
+ hydra_database_password: "{{ 32 | generate_password | b64encode }}"
hydra_system_secret: "{{ 32 | generate_password | b64encode }}"
- kratos_postgresql_password: "{{ 32 | generate_password | b64encode }}"
+ kratos_database_password: "{{ 32 | generate_password | b64encode }}"
kratos_session_secret: "{{ 32 | generate_password | b64encode }}"
userbackend_admin_password: "{{ 32 | generate_password | b64encode }}"
diff --git a/stackspin/cluster.py b/stackspin/cluster.py
index 482d757fc..583739249 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',
- 'dashboard_postgresql_password',
+ 'dashboard_database_password',
'hydra_system_secret'],
'stackspin-wordpress-variables': [
'wordpress_admin_password',
--
GitLab