Skip to content

Commit

Permalink
[stable/prometheus-operator] Add conditional for prometheus.ingress.h…
Browse files Browse the repository at this point in the history
…osts (helm#16977)

* Add conditional for prometheus.ingress.hosts

Signed-off-by: Tom Gehrke <t.gehrke@reply.de>

* Bump patch version to 6.9.1

Signed-off-by: Tom Gehrke <t.gehrke@reply.de>

* Add condition for alertmanager as well

Signed-off-by: Tom Gehrke <t.gehrke@reply.de>
  • Loading branch information
phyrog authored and Ram Sri committed Sep 30, 2019
1 parent d357d57 commit 65d558e
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion stable/prometheus-operator/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ name: prometheus-operator
sources:
- https://github.com/coreos/prometheus-operator
- https://coreos.com/operators/prometheus
version: 6.9.0
version: 6.9.1
appVersion: 0.32.0
home: https://github.com/coreos/prometheus-operator
keywords:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
serviceAccountName: {{ template "prometheus-operator.alertmanager.serviceAccountName" . }}
{{- if .Values.alertmanager.alertmanagerSpec.externalUrl }}
externalUrl: "{{ .Values.alertmanager.alertmanagerSpec.externalUrl }}"
{{- else if .Values.alertmanager.ingress.enabled }}
{{- else if and .Values.alertmanager.ingress.enabled .Values.alertmanager.ingress.hosts }}
externalUrl: "http://{{ index .Values.alertmanager.ingress.hosts 0 }}{{ .Values.alertmanager.alertmanagerSpec.routePrefix }}"
{{- else }}
externalUrl: http://{{ template "prometheus-operator.fullname" . }}-alertmanager.{{ .Release.Namespace }}:9093
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ spec:
{{- end }}
{{- if .Values.prometheus.prometheusSpec.externalUrl }}
externalUrl: "{{ .Values.prometheus.prometheusSpec.externalUrl }}"
{{- else if .Values.prometheus.ingress.enabled }}
{{- else if and .Values.prometheus.ingress.enabled .Values.prometheus.ingress.hosts }}
externalUrl: "http://{{ index .Values.prometheus.ingress.hosts 0 }}{{ .Values.prometheus.prometheusSpec.routePrefix }}"
{{- else }}
externalUrl: http://{{ template "prometheus-operator.fullname" . }}-prometheus.{{ .Release.Namespace }}:9090
Expand Down

0 comments on commit 65d558e

Please sign in to comment.