From 9c21c602ecdb8492d88224d7a5ed823275106907 Mon Sep 17 00:00:00 2001
From: Kjeld Schouten <kjeld@schouten-lebbing.nl>
Date: Mon, 8 Apr 2024 19:55:27 +0200
Subject: [PATCH] Update values.yaml

Signed-off-by: Kjeld Schouten <kjeld@schouten-lebbing.nl>
---
 charts/stable/mariadb/values.yaml | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/charts/stable/mariadb/values.yaml b/charts/stable/mariadb/values.yaml
index c09d76306d8..6fc6bcfd812 100644
--- a/charts/stable/mariadb/values.yaml
+++ b/charts/stable/mariadb/values.yaml
@@ -10,16 +10,8 @@ workload:
       containers:
         main:
           env:
-            MARIADB_PASSWORD:
-              secretKeyRef:
-                expandObjectName: "{{ if .Values.mariadbPassword }}true{{ else }}false{{ end }}"
-                name: '{{ if .Values.mariadbPassword }}credentials{{ else if .Values.existingSecret }}{{ .Values.existingSecret }}{{ else }}{{ printf "%s-%s" .Release.Name "mariadbcreds" }}{{ end }}'
-                key: "mariadb-password"
-            MARIADB_ROOT_PASSWORD:
-              secretKeyRef:
-                expandObjectName: "{{ if .Values.mariadbPassword }}true{{ else }}false{{ end }}"
-                name: '{{ if .Values.mariadbPassword }}credentials{{ else if .Values.existingSecret }}{{ .Values.existingSecret }}{{ else }}{{ printf "%s-%s" .Release.Name "mariadbcreds" }}{{ end }}'
-                key: "mariadb-root-password"
+            MARIADB_PASSWORD: "{{ .Values.password }}"
+            MARIADB_ROOT_PASSWORD: "{{ .Values.rootPassword }}"
             MARIADB_USER: "{{ .Values.mariadbUsername }}"
             MARIADB_DATABASE: "{{ .Values.mariadbDatabase }}"
           probes:
@@ -58,18 +50,18 @@ secret:
   credentials:
     enabled: true
     data:
-      mariadb-password: '{{ ( .Values.mariadbPassword | default "empty" ) }}'
-      mariadb-root-password: '{{ ( .Values.mariadbRootPassword | default "empty" ) }}'
+      mariadb-password: '{{ ( .Values.password | default "empty" ) }}'
+      mariadb-root-password: '{{ ( .Values.rootPassword | default "empty" ) }}'
 persistence:
   data:
     enabled: true
     mountPath: "/bitnami/mariadb"
 mariadbUsername: "test"
 mariadbDatabase: "test"
-mariadbRootPassword: "testroot"
+rootPassword: "testroot"
 # -- Secret or password
 # One of these options is required, unless used as a dependency for another TrueCharts chart.
-mariadbPassword: ""
+password: "placeholderpass"
 existingSecret: ""
 portal:
   open: