From 76e9f774b766590efce4f1bea534ab978f3d2dfd Mon Sep 17 00:00:00 2001 From: Andrew Mellen Date: Sat, 5 Jan 2019 12:01:39 -0500 Subject: [PATCH] [stable/prometheus-operator] Set default for svc monitor selector (#10390) * Set default for svc monitor selector If selector = {} and nilusehelmvals = false, nothing gets put. I want selector to be {} so it matches all service monitors Signed-off-by: Andrew Mellen * Merge remote-tracking branch 'upstream/master' into feature/match-all-svcmonitors Signed-off-by: Andrew Mellen * Bump version for svcmonitor update Signed-off-by: Andrew Mellen --- stable/prometheus-operator/Chart.yaml | 2 +- stable/prometheus-operator/templates/prometheus/prometheus.yaml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/stable/prometheus-operator/Chart.yaml b/stable/prometheus-operator/Chart.yaml index f902f8d316..b0cbe39981 100644 --- a/stable/prometheus-operator/Chart.yaml +++ b/stable/prometheus-operator/Chart.yaml @@ -9,7 +9,7 @@ name: prometheus-operator sources: - https://github.com/coreos/prometheus-operator - https://coreos.com/operators/prometheus -version: 1.5.0 +version: 1.5.1 appVersion: 0.26.0 home: https://github.com/coreos/prometheus-operator keywords: diff --git a/stable/prometheus-operator/templates/prometheus/prometheus.yaml b/stable/prometheus-operator/templates/prometheus/prometheus.yaml index 6f47e7b795..509142e2be 100644 --- a/stable/prometheus-operator/templates/prometheus/prometheus.yaml +++ b/stable/prometheus-operator/templates/prometheus/prometheus.yaml @@ -72,6 +72,8 @@ spec: serviceMonitorSelector: matchLabels: release: {{ .Release.Name | quote }} +{{ else }} + serviceMonitorSelector: {} {{- end }} {{- if .Values.prometheus.prometheusSpec.serviceMonitorNamespaceSelector }} serviceMonitorNamespaceSelector: