mirrors/prometheus-operator
mirrors/prometheus-operator
1
0
Fork 0
mirror of https://github.com/prometheus-operator/prometheus-operator.git synced 2025-04-21 03:38:43 +00:00
Code Activity

Adding default value to serviceMonitorSelector ()

Browse source 
Fixes
This commit is contained in:
Olve S. Hansen 2018-06-05 22:00:15 +02:00 • committed by Giancarlo Rubio
parent 1d3c462fd5
commit 698019c7ac
4 changed files with 5 additions and 5 deletions
helm
kube-prometheus
Chart.yamlrequirements.yaml
prometheus
Chart.yaml
templates
prometheus.yaml

2
helm/kube-prometheus/Chart.yaml
View file

@ -7,4 +7,4 @@ maintainers:
name: kube-prometheus
sources:
- https://github.com/coreos/prometheus-operator
version: 0.0.79
version: 0.0.80

2
helm/kube-prometheus/requirements.yaml
View file

@ -6,7 +6,7 @@ dependencies:
condition: deployAlertManager
- name: prometheus
version: 0.0.42
version: 0.0.43
#e2e-repository: file://../prometheus
repository: https://s3-eu-west-1.amazonaws.com/coreos-charts/stable/

2
helm/prometheus/Chart.yaml
View file

@ -7,4 +7,4 @@ maintainers:
name: prometheus
sources:
- https://github.com/coreos/prometheus-operator
version: 0.0.42
version: 0.0.43

4
helm/prometheus/templates/prometheus.yaml
View file

@ -63,10 +63,10 @@ spec:
{{- else if .Values.serviceMonitorsSelector }}
serviceMonitorSelector:
{{ toYaml .Values.serviceMonitorsSelector | indent 4 }}
{{- else if .Values.prometheusLabelValue }}
{{- else }}
serviceMonitorSelector:
matchLabels:
prometheus: {{ .Values.prometheusLabelValue }}
prometheus: {{ .Values.prometheusLabelValue | default .Release.Name | quote }}
{{- end }}
{{- if .Values.serviceMonitorNamespaceSelector }}
serviceMonitorNamespaceSelector: