From d4998796fe022eb4d23f39e66c6dfaab80092c71 Mon Sep 17 00:00:00 2001
From: xeruf <27jf@pm.me>
Date: Thu, 7 Jul 2022 10:58:20 +0100
Subject: [PATCH] suitecrm: use underscore variable separators
---
basic/apps/people/suitecrm-values-configmap.yaml | 9 +++------
templates/stackspin-suitecrm-variables.yaml.jinja | 6 +++---
2 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/basic/apps/people/suitecrm-values-configmap.yaml b/basic/apps/people/suitecrm-values-configmap.yaml
index 5043ea4..46431fd 100644
--- a/basic/apps/people/suitecrm-values-configmap.yaml
+++ b/basic/apps/people/suitecrm-values-configmap.yaml
@@ -8,19 +8,16 @@ data:
values.yaml: |
ingress:
enabled: true
- #annotations:
- # kubernetes.io/tls-acme: "true"
hostname: "people.${domain}"
tls: true
certManager: true
suitecrmUsername: "admin"
suitecrmEmail: "${admin_email}"
- suitecrmPassword: "${suitecrm-password}"
- #existingSecret: stackspin-suitecrm-variables
+ suitecrmPassword: "${suitecrm_password}"
mariadb:
auth:
- password: "${mariadb-password}"
- rootPassword: "${mariadb-root-password}"
+ password: "${mariadb_password}"
+ rootPassword: "${mariadb_root_password}"
# TODO Adjust OIDC SSO to service
# - name: Stackspin
# key: "${client_id}"
diff --git a/templates/stackspin-suitecrm-variables.yaml.jinja b/templates/stackspin-suitecrm-variables.yaml.jinja
index 45004f7..eb1a66e 100644
--- a/templates/stackspin-suitecrm-variables.yaml.jinja
+++ b/templates/stackspin-suitecrm-variables.yaml.jinja
@@ -3,6 +3,6 @@ kind: Secret
metadata:
name: stackspin-suitecrm-variables
data:
- suitecrm-password: "{{ 32 | generate_password | b64encode }}"
- mariadb-password: "{{ 32 | generate_password | b64encode }}"
- mariadb-root-password: "{{ 32 | generate_password | b64encode }}"
+ suitecrm_password: "{{ 32 | generate_password | b64encode }}"
+ mariadb_password: "{{ 32 | generate_password | b64encode }}"
+ mariadb_root_password: "{{ 32 | generate_password | b64encode }}"
--
GitLab