From d73224418141fb7a2bae8d083de8f6e88e493c3d Mon Sep 17 00:00:00 2001 From: Krzysztof Opasiak Date: Thu, 30 Jan 2020 12:10:40 +0100 Subject: [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 Signed-off-by: Sylvain Desbureaux --- kubernetes/common/mariadb-init/templates/_mariadb.tpl | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'kubernetes/common/mariadb-init/templates/_mariadb.tpl') 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 -}} -- cgit 1.2.3-korg