Skip to content

Commit

Permalink
[stable/prometheus] Disable "enableServiceLinks" on Kubernetes prior …
Browse files Browse the repository at this point in the history
…1.13 (helm#23299)

* [stable/prometheus] Disable "enableServiceLinks" on Kubernetes prior 1.13

Signed-off-by: Mohammad Abdolirad <[email protected]>

* [stable/prometheus] Chart Version bumped

Signed-off-by: Mohammad Abdolirad <[email protected]>
Signed-off-by: Adrien Loiseau <[email protected]>
  • Loading branch information
atkrad authored and li-adrienloiseau committed Jul 29, 2020
1 parent 5807b90 commit 8d9e6f8
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion stable/prometheus/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v1
name: prometheus
version: 11.9.1
version: 11.10.0
appVersion: 2.19.0
description: Prometheus is a monitoring system and time series database.
home: https://prometheus.io/
Expand Down
2 changes: 2 additions & 0 deletions stable/prometheus/templates/statefulsets/server.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,13 @@ spec:
{{- if .Values.server.schedulerName }}
schedulerName: "{{ .Values.server.schedulerName }}"
{{- end }}
{{- if semverCompare ">=1.13-0" .Capabilities.KubeVersion.GitVersion }}
{{- if or (.Values.server.enableServiceLinks) (eq (.Values.server.enableServiceLinks | toString) "<nil>") }}
enableServiceLinks: true
{{- else }}
enableServiceLinks: false
{{- end }}
{{- end }}
serviceAccountName: {{ template "prometheus.serviceAccountName.server" . }}
containers:
{{- if .Values.configmapReload.prometheus.enabled }}
Expand Down

0 comments on commit 8d9e6f8

Please sign in to comment.