coreos/prometheus-operator
1
0
Fork 0
mirror of https://github.com/coreos/prometheus-operator.git synced 2026-02-05 15:46:31 +01:00
Code Issues Releases Wiki Activity

helm/prometheus: support not having a serviceMonitorSelector (#874)

Browse Source
This commit is contained in:
Christopher Randles
2018-01-13 04:47:47 -05:00
committed by Giancarlo Rubio
parent 0b87bfa150
commit ed212b0a9f
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,7 +5,7 @@ dependencies:
repository: https://s3-eu-west-1.amazonaws.com/coreos-charts/stable/
- name: prometheus
version: 0.0.9
version: 0.0.10
#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.9
version: 0.0.10

3
helm/prometheus/templates/prometheus.yaml
View File

@@ -54,7 +54,8 @@ spec:
{{- if .Values.rbacEnable }}
serviceAccountName: {{ template "prometheus.fullname" . }}
{{- end }}
{{- if .Values.serviceMonitorsSelector }}
{{ if and .Values.config.specifiedInValues .Values.config.value }}
{{- else if .Values.serviceMonitorsSelector }}
serviceMonitorSelector:
{{ toYaml .Values.serviceMonitorsSelector | indent 4 }}
{{- else }}