[stable/prometheus] Fix incorrect rendering of enableServiceLinks (#2…

…2391) cf. helm/helm#3308 Signed-off-by: Yong Wen Chua <lawliet89@users.noreply.github.com>
helm · May 14, 2020 · 0dfb119 · 0dfb119
1 parent b71c8c6
commit 0dfb119
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/stable/prometheus/Chart.yaml b/stable/prometheus/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: prometheus
-version: 11.2.2
+version: 11.2.3
 appVersion: 2.18.1
 description: Prometheus is a monitoring system and time series database.
 home: https://prometheus.io/

diff --git a/stable/prometheus/templates/server-statefulset.yaml b/stable/prometheus/templates/server-statefulset.yaml
@@ -38,7 +38,11 @@ spec:
 {{- if .Values.server.schedulerName }}
       schedulerName: "{{ .Values.server.schedulerName }}"
 {{- end }}
-      enableServiceLinks: {{ .Values.server.enableServiceLinks | default "true" }}
+      {{- if or (.Values.server.enableServiceLinks) (eq (.Values.server.enableServiceLinks | toString) "<nil>") }}
+      enableServiceLinks: true
+      {{- else }}
+      enableServiceLinks: false
+      {{- end }}
       serviceAccountName: {{ template "prometheus.serviceAccountName.server" . }}
       containers:
         {{- if .Values.configmapReload.prometheus.enabled }}