From c6df9a936d62e19ddff13dad93d75d1ce85c50a6 Mon Sep 17 00:00:00 2001 From: Tom Gehrke Date: Mon, 9 Sep 2019 20:38:55 +0200 Subject: [PATCH] [stable/prometheus-operator] Add conditional for prometheus.ingress.hosts (#16977) * Add conditional for prometheus.ingress.hosts Signed-off-by: Tom Gehrke * Bump patch version to 6.9.1 Signed-off-by: Tom Gehrke * Add condition for alertmanager as well Signed-off-by: Tom Gehrke --- stable/prometheus-operator/Chart.yaml | 2 +- .../templates/alertmanager/alertmanager.yaml | 2 +- stable/prometheus-operator/templates/prometheus/prometheus.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/stable/prometheus-operator/Chart.yaml b/stable/prometheus-operator/Chart.yaml index 626841e071ce..4537952bcf99 100644 --- a/stable/prometheus-operator/Chart.yaml +++ b/stable/prometheus-operator/Chart.yaml @@ -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: diff --git a/stable/prometheus-operator/templates/alertmanager/alertmanager.yaml b/stable/prometheus-operator/templates/alertmanager/alertmanager.yaml index 465b8b0cf9a6..ff448105b4aa 100644 --- a/stable/prometheus-operator/templates/alertmanager/alertmanager.yaml +++ b/stable/prometheus-operator/templates/alertmanager/alertmanager.yaml @@ -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 diff --git a/stable/prometheus-operator/templates/prometheus/prometheus.yaml b/stable/prometheus-operator/templates/prometheus/prometheus.yaml index 46b374dcaee4..46a630959443 100644 --- a/stable/prometheus-operator/templates/prometheus/prometheus.yaml +++ b/stable/prometheus-operator/templates/prometheus/prometheus.yaml @@ -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