[kimai2] support mariadb.auth.existingSecret

possible fix robjuz#69
linuxmaniac · Oct 24, 2023 · 2565bef · 2565bef
1 parent a071ae6
commit 2565bef
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/charts/kimai2/templates/_helpers.tpl b/charts/kimai2/templates/_helpers.tpl
@@ -105,7 +105,14 @@ Return the MariaDB Password
 */}}
 {{- define "kimai.databasePassword" -}}
 {{- if .Values.mariadb.enabled }}
-    {{- printf "%s" .Values.mariadb.auth.password -}}
+    {{- if .Values.mariadb.existingSecret }}
+        {{- $secret := (lookup "v1" "Secret" .Release.Namespace (include "mariadb.secretName" .)).data -}}
+        {{- if hasKey $secret "mariadb-password" }}
+            {{- printf "%s" (get $secret "mariadb-password") -}}
+        {{- end -}}
+    {{- else -}}
+        {{- printf "%s" .Values.mariadb.auth.password -}}
+    {{- end -}}
 {{- else -}}
     {{- printf "%s" .Values.externalDatabase.password -}}
 {{- end -}}

diff --git a/charts/kimai2/values.yaml b/charts/kimai2/values.yaml
@@ -847,6 +847,9 @@ mariadb:
     database: kimai
     username: kimai
     password: kimai
+    ## @param mariadb.auth.existingSecret Use existing secret for password details (`mariadb.auth.rootPassword`, `mariadb.auth.password` will be ignored and picked up from this secret).
+    ## The secret has to contain the keys `mariadb-root-password` and `mariadb-password`
+    existingSecret: ""
   ## MariaDB Primary configuration
   ##
   primary: