diff --git a/helm/kube-prometheus/requirements.yaml b/helm/kube-prometheus/requirements.yaml index a44b1bc5a..97a816d3f 100644 --- a/helm/kube-prometheus/requirements.yaml +++ b/helm/kube-prometheus/requirements.yaml @@ -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/ diff --git a/helm/prometheus/Chart.yaml b/helm/prometheus/Chart.yaml index a4b12100f..159573b22 100755 --- a/helm/prometheus/Chart.yaml +++ b/helm/prometheus/Chart.yaml @@ -7,4 +7,4 @@ maintainers: name: prometheus sources: - https://github.com/coreos/prometheus-operator -version: 0.0.9 +version: 0.0.10 diff --git a/helm/prometheus/templates/prometheus.yaml b/helm/prometheus/templates/prometheus.yaml index 6180319e6..ec56a7b02 100755 --- a/helm/prometheus/templates/prometheus.yaml +++ b/helm/prometheus/templates/prometheus.yaml @@ -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 }}