aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes/common/mariadb-init/templates/_mariadb.tpl
diff options
context:
space:
mode:
authorKrzysztof Opasiak <k.opasiak@samsung.com>2020-01-30 12:10:40 +0100
committerKrzysztof Opasiak <k.opasiak@samsung.com>2020-02-01 00:10:01 +0100
commitd73224418141fb7a2bae8d083de8f6e88e493c3d (patch)
tree34222cfe247b1cdff71ffeac5f5c0e6375a7f517 /kubernetes/common/mariadb-init/templates/_mariadb.tpl
parent137d7ccd2597a6492e926818eebab2f6067fb382 (diff)
[COMMON] Use common secret template in mariadb-init
Use common secret template for all passwords that are used inside this chart. Issue-ID: OOM-2248 Change-Id: Ia94b87a4d0316a3d334fd492521be5a255c14b4e Signed-off-by: Krzysztof Opasiak <k.opasiak@samsung.com> Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Diffstat (limited to 'kubernetes/common/mariadb-init/templates/_mariadb.tpl')
-rw-r--r--kubernetes/common/mariadb-init/templates/_mariadb.tpl6
1 files changed, 1 insertions, 5 deletions
diff --git a/kubernetes/common/mariadb-init/templates/_mariadb.tpl b/kubernetes/common/mariadb-init/templates/_mariadb.tpl
index 231fd875e2..64c15ed862 100644
--- a/kubernetes/common/mariadb-init/templates/_mariadb.tpl
+++ b/kubernetes/common/mariadb-init/templates/_mariadb.tpl
@@ -18,9 +18,5 @@
Choose the name of the mariadb secret to use.
*/}}
{{- define "mariadbInit.mariadbClusterSecret" -}}
- {{- if (eq "default" .Values.global.mariadbGalera.userRootSecret) -}}
- {{- printf "%s-%s-db-root-password" (include "common.release" .) .Values.global.mariadbGalera.nameOverride -}}
- {{- else -}}
- {{- .Values.global.mariadbGalera.userRootSecret -}}
- {{- end -}}
+ {{- printf "%s-%s-db-root-password" (include "common.release" .) (default "mariadb-galera" .Values.global.mariadbGalera.nameOverride) -}}
{{- end -}}