From 2f486d7629140da850ca586fee300767095b1d92 Mon Sep 17 00:00:00 2001 From: Malte Date: Tue, 3 Mar 2020 14:51:37 +0100 Subject: [PATCH] [stable/prometheus] Support tmpl files which are not YAML (#21208) Signed-off-by: Malte Krupa --- stable/prometheus/Chart.yaml | 2 +- stable/prometheus/templates/alertmanager-configmap.yaml | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/stable/prometheus/Chart.yaml b/stable/prometheus/Chart.yaml index 1b131a4497..a46ff78309 100644 --- a/stable/prometheus/Chart.yaml +++ b/stable/prometheus/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: prometheus -version: 11.0.0 +version: 11.0.1 appVersion: 2.16.0 description: Prometheus is a monitoring system and time series database. home: https://prometheus.io/ diff --git a/stable/prometheus/templates/alertmanager-configmap.yaml b/stable/prometheus/templates/alertmanager-configmap.yaml index f2d78e2f6c..6f6efcece9 100644 --- a/stable/prometheus/templates/alertmanager-configmap.yaml +++ b/stable/prometheus/templates/alertmanager-configmap.yaml @@ -8,7 +8,11 @@ metadata: data: {{- $root := . -}} {{- range $key, $value := .Values.alertmanagerFiles }} + {{- if $key | regexMatch ".*\\.ya?ml$" }} {{ $key }}: | {{ toYaml $value | default "{}" | indent 4 }} + {{- else }} + {{ $key }}: {{ toYaml $value | indent 4 }} + {{- end }} {{- end -}} {{- end -}}