Merge pull request #900 from pburgisser/make_enableservicelinks_optional

[grafana] Allowing older version of Kubernetes (<1.13) to use the latest versio…
grafana · Dec 16, 2021 · 3840758 · 3840758
2 parents ecb8e80 + 63e80bd
commit 3840758
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: grafana
-version: 6.19.4
+version: 6.20.0
 appVersion: 8.3.3
 kubeVersion: "^1.8.0-0"
 description: The leading tool for querying and visualizing time series and metrics.

diff --git a/charts/grafana/templates/_pod.tpl b/charts/grafana/templates/_pod.tpl
@@ -125,7 +125,9 @@ imagePullSecrets:
   - name: {{ . }}
 {{- end}}
 {{- end }}
+{{- if not .Values.enableKubeBackwardCompatibility }}
 enableServiceLinks: {{ .Values.enableServiceLinks }}
+{{- end }}
 containers:
 {{- if .Values.sidecar.dashboards.enabled }}
   - name: {{ template "grafana.name" . }}-sc-dashboard

diff --git a/charts/grafana/values.yaml b/charts/grafana/values.yaml
@@ -788,3 +788,6 @@ networkPolicy:
   ##    - {key: role, operator: In, values: [frontend]}
   ##
   explicitNamespacesSelector: {}
+
+# Enable backward compatibility of kubernetes where version below 1.13 doesn't have the enableServiceLinks option
+enableKubeBackwardCompatibility: false