From a8bb442202da98f1838aa96bf112352fac77cf0f Mon Sep 17 00:00:00 2001 From: Michael Lamanuzzi Date: Wed, 18 Dec 2019 16:37:55 -0800 Subject: [PATCH] Fix issue with literal (|) being added to deployment yaml when using extraContainers. (#19384) Signed-off-by: Michael Lamanuzzi --- stable/grafana/Chart.yaml | 2 +- stable/grafana/templates/_pod.tpl | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/stable/grafana/Chart.yaml b/stable/grafana/Chart.yaml index 63a693f4b4..d9727c831d 100644 --- a/stable/grafana/Chart.yaml +++ b/stable/grafana/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: grafana -version: 4.2.1 +version: 4.2.2 appVersion: 6.5.2 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. diff --git a/stable/grafana/templates/_pod.tpl b/stable/grafana/templates/_pod.tpl index 540d10d46e..0868fc1702 100644 --- a/stable/grafana/templates/_pod.tpl +++ b/stable/grafana/templates/_pod.tpl @@ -275,8 +275,8 @@ containers: {{ toYaml .Values.readinessProbe | indent 6 }} resources: {{ toYaml .Values.resources | indent 6 }} -{{- if .Values.extraContainers }} -{{ toYaml .Values.extraContainers | indent 2}} +{{- with .Values.extraContainers }} +{{ tpl . $ | indent 2 }} {{- end }} {{- with .Values.nodeSelector }} nodeSelector: