From 30ac9b61d1fb74dfb1a669dd1ede7f4913f18a6a Mon Sep 17 00:00:00 2001 From: Fabian Scheidt Date: Wed, 18 Jan 2023 12:34:05 +0100 Subject: [PATCH] [bitnami/mariadb] Allow templates for initdbScriptsConfigMap and auth.existingSecret (#14404) Signed-off-by: Fabian Scheidt Signed-off-by: Fabian Scheidt --- bitnami/mariadb/Chart.yaml | 2 +- bitnami/mariadb/templates/_helpers.tpl | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bitnami/mariadb/Chart.yaml b/bitnami/mariadb/Chart.yaml index e470de85dd..06e8f5c398 100644 --- a/bitnami/mariadb/Chart.yaml +++ b/bitnami/mariadb/Chart.yaml @@ -26,4 +26,4 @@ sources: - https://github.com/bitnami/containers/tree/main/bitnami/mariadb - https://github.com/prometheus/mysqld_exporter - https://mariadb.org -version: 11.4.3 +version: 11.4.4 diff --git a/bitnami/mariadb/templates/_helpers.tpl b/bitnami/mariadb/templates/_helpers.tpl index 5a67bd506d..49cb4a4757 100644 --- a/bitnami/mariadb/templates/_helpers.tpl +++ b/bitnami/mariadb/templates/_helpers.tpl @@ -46,7 +46,7 @@ Get the initialization scripts ConfigMap name. */}} {{- define "mariadb.initdbScriptsCM" -}} {{- if .Values.initdbScriptsConfigMap -}} -{{- printf "%s" .Values.initdbScriptsConfigMap -}} +{{- printf "%s" (tpl .Values.initdbScriptsConfigMap $) -}} {{- else -}} {{- printf "%s-init-scripts" (include "mariadb.primary.fullname" .) -}} {{- end -}} @@ -110,7 +110,7 @@ Return the secret with MariaDB credentials */}} {{- define "mariadb.secretName" -}} {{- if .Values.auth.existingSecret -}} - {{- printf "%s" .Values.auth.existingSecret -}} + {{- printf "%s" (tpl .Values.auth.existingSecret $) -}} {{- else -}} {{- printf "%s" (include "common.names.fullname" .) -}} {{- end -}}