From 615516b07e66c4dc8a1ee966166021f075f55c5a Mon Sep 17 00:00:00 2001 From: Allan Hung Date: Mon, 2 Oct 2023 17:13:58 +0800 Subject: [PATCH 1/2] fix issue when set extra containers Signed-off-by: Allan Hung --- charts/prometheus-blackbox-exporter/Chart.yaml | 2 +- charts/prometheus-blackbox-exporter/templates/_helpers.tpl | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/prometheus-blackbox-exporter/Chart.yaml b/charts/prometheus-blackbox-exporter/Chart.yaml index 99ef4f32663..2d8904707a9 100644 --- a/charts/prometheus-blackbox-exporter/Chart.yaml +++ b/charts/prometheus-blackbox-exporter/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 description: Prometheus Blackbox Exporter name: prometheus-blackbox-exporter -version: 8.4.0 +version: 8.4.1 appVersion: v0.24.0 home: https://github.com/prometheus/blackbox_exporter sources: diff --git a/charts/prometheus-blackbox-exporter/templates/_helpers.tpl b/charts/prometheus-blackbox-exporter/templates/_helpers.tpl index 072dfcc661e..82264b8b1a4 100644 --- a/charts/prometheus-blackbox-exporter/templates/_helpers.tpl +++ b/charts/prometheus-blackbox-exporter/templates/_helpers.tpl @@ -150,10 +150,10 @@ securityContext: {{- end }} {{- with .Values.extraInitContainers }} initContainers: - {{- toYaml . | indent 2 }} +{{ toYaml . | indent 2 }} {{- end }} containers: -{{- with .Values.extraContainers }} +{{ with .Values.extraContainers }} {{- toYaml . }} {{- end }} - name: blackbox-exporter From 89c37143801487d7761f81cfc25b08e309a2ba68 Mon Sep 17 00:00:00 2001 From: Allan Hung Date: Tue, 17 Oct 2023 08:23:19 +0800 Subject: [PATCH 2/2] consistent indentation Signed-off-by: Allan Hung --- charts/prometheus-blackbox-exporter/templates/_helpers.tpl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/prometheus-blackbox-exporter/templates/_helpers.tpl b/charts/prometheus-blackbox-exporter/templates/_helpers.tpl index 82264b8b1a4..9fef8563908 100644 --- a/charts/prometheus-blackbox-exporter/templates/_helpers.tpl +++ b/charts/prometheus-blackbox-exporter/templates/_helpers.tpl @@ -110,7 +110,7 @@ automountServiceAccountToken: {{ .Values.automountServiceAccountToken }} serviceAccountName: {{ template "prometheus-blackbox-exporter.serviceAccountName" . }} {{- with .Values.topologySpreadConstraints }} topologySpreadConstraints: - {{- toYaml . | nindent 2 }} +{{ toYaml . }} {{- end }} {{- with .Values.nodeSelector }} nodeSelector: @@ -122,7 +122,7 @@ affinity: {{- end }} {{- with .Values.tolerations }} tolerations: - {{- toYaml . | nindent 2 }} +{{ toYaml . }} {{- end }} {{- if .Values.image.pullSecrets }} imagePullSecrets: @@ -150,7 +150,7 @@ securityContext: {{- end }} {{- with .Values.extraInitContainers }} initContainers: -{{ toYaml . | indent 2 }} +{{ toYaml . }} {{- end }} containers: {{ with .Values.extraContainers }}