mirror of
https://github.com/helm/charts.git
synced 2026-08-23 14:27:18 +00:00
[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 <andrew_mellen@icloud.com>
* Merge remote-tracking branch 'upstream/master' into feature/match-all-svcmonitors
Signed-off-by: Andrew Mellen <andrew_mellen@icloud.com>
* Bump version for svcmonitor update
Signed-off-by: Andrew Mellen <andrew_mellen@icloud.com>
This commit is contained in:
committed by
Kubernetes Prow Robot
parent
921e968df1
commit
76e9f774b7
@@ -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:
|
||||
|
||||
@@ -72,6 +72,8 @@ spec:
|
||||
serviceMonitorSelector:
|
||||
matchLabels:
|
||||
release: {{ .Release.Name | quote }}
|
||||
{{ else }}
|
||||
serviceMonitorSelector: {}
|
||||
{{- end }}
|
||||
{{- if .Values.prometheus.prometheusSpec.serviceMonitorNamespaceSelector }}
|
||||
serviceMonitorNamespaceSelector:
|
||||
|
||||
Reference in New Issue
Block a user