fix: type of db ExtraEnvVars values (#466)

Author: bidord

charts/mailu/templates/_database.tpl

@@ -125,12 +125,12 @@
 
 {{/* Return the database name for Roundcube */}}
 {{- define "mailu.database.roundcube.name" -}}
-{{- .Values.global.database.roundcube.database | quote }}
+{{- .Values.global.database.roundcube.database }}
 {{- end -}}
 
 {{/* Return the database username for Roundcube */}}
 {{- define "mailu.database.roundcube.username" -}}
-{{- .Values.global.database.roundcube.username | quote }}
+{{- .Values.global.database.roundcube.username }}
 {{- end -}}
 
 {{/* Return the database password for Roundcube */}}

charts/mailu/templates/envvars-configmap.yaml

@@ -211,8 +211,8 @@ data:
 
 {{- if not (eq (include "mailu.database.type" .) "sqlite") }}
 {{- if .Values.webmail.enabled }}
-  ROUNDCUBE_DB_USER: {{ include "mailu.database.roundcube.username" . }}
-  ROUNDCUBE_DB_NAME: {{ include "mailu.database.roundcube.name" . }}
+  ROUNDCUBE_DB_USER: {{ include "mailu.database.roundcube.username" . | quote }}
+  ROUNDCUBE_DB_NAME: {{ include "mailu.database.roundcube.name" . | quote }}
   ROUNDCUBE_DB_HOST: {{ printf "%s:%s" (include "mailu.database.host" .) (include "mailu.database.port" .) | quote}}
 {{- end }}
 {{- end }}

charts/mailu/values.yaml

@@ -387,16 +387,16 @@ mariadb:
 
     ## @skip mariadb.primary.extraEnvVars
     ## Array with extra environment variables, used to create the initial Roundcube database; DO NOT EDIT; see `global.database` instead
-    extraEnvVars: |
+    extraEnvVars:
       - name: ROUNDCUBE_DB_PW
         valueFrom:
           secretKeyRef:
-            name: {{ include "mailu.database.roundcube.secretName" . }}
-            key: {{ include "mailu.database.roundcube.secretKey" . }}
+            name: '{{ include "mailu.database.roundcube.secretName" . }}'
+            key: '{{ include "mailu.database.roundcube.secretKey" . }}'
       - name: ROUNDCUBE_DB_NAME
-        value: {{ include "mailu.database.roundcube.name" . }}
+        value: '{{ include "mailu.database.roundcube.name" . }}'
       - name: ROUNDCUBE_DB_USER
-        value: {{ include "mailu.database.roundcube.username" . }}
+        value: '{{ include "mailu.database.roundcube.username" . }}'
 
   ## @skip mariadb.initdbScripts.create_roundcube_database.sh
   ## DO NOT EDIT Script to create the Roundcube database
@@ -482,16 +482,16 @@ postgresql:
   primary:
     ## @skip postgresql.primary.extraEnvVars
     ## Array with extra environment variables, used to create the initial Roundcube database; DO NOT EDIT; see `global.database` instead
-    extraEnvVars: |
+    extraEnvVars:
       - name: ROUNDCUBE_DB_PW
         valueFrom:
           secretKeyRef:
-            name: {{ include "mailu.database.roundcube.secretName" . }}
-            key: {{ include "mailu.database.roundcube.secretKey" . }}
+            name: '{{ include "mailu.database.roundcube.secretName" . }}'
+            key: '{{ include "mailu.database.roundcube.secretKey" . }}'
       - name: ROUNDCUBE_DB_NAME
-        value: {{ include "mailu.database.roundcube.name" . }}
+        value: '{{ include "mailu.database.roundcube.name" . }}'
       - name: ROUNDCUBE_DB_USER
-        value: {{ include "mailu.database.roundcube.username" . }}
+        value: '{{ include "mailu.database.roundcube.username" . }}'
 
     initdb:
       ## @skip postgresql.primary.initdb.scripts.create_roundcube_database.sh