github/deprecated-helm-charts
1
0
Fork 0
mirror of https://github.com/helm/charts.git synced 2026-08-23 22:37:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

[stable/kube-state-metrics] fix service monitor label nesting (#14128)

Browse Source 
Signed-off-by: Ryan Belgrave <ryan.belgrave@optum.com>
This commit is contained in:
Ryan Belgrave
2019-05-24 11:11:32 -07:00
committed by Kubernetes Prow Robot
parent 61895ae251
commit e01744bcbe
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stable/kube-state-metrics/Chart.yaml
+1 -1
View File
@@ -5,7 +5,7 @@ keywords:
- metric
- monitoring
- prometheus
version: 1.6.2
version: 1.6.3
appVersion: 1.6.0
home: https://github.com/kubernetes/kube-state-metrics/
sources:
stable/kube-state-metrics/templates/monitor.yaml
+6 -8
View File
@@ -4,15 +4,13 @@ kind: ServiceMonitor
metadata:
name: {{ template "kube-state-metrics.fullname" . }}
labels:
name: {{ template "kube-state-metrics.fullname" . }}
labels:
app: {{ template "kube-state-metrics.name" . }}
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
release: "{{ .Release.Name }}"
heritage: "{{ .Release.Service }}"
{{- if .Values.prometheus.monitor.additionalLabels }}
app: {{ template "kube-state-metrics.name" . }}
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
release: "{{ .Release.Name }}"
heritage: "{{ .Release.Service }}"
{{- if .Values.prometheus.monitor.additionalLabels }}
{{ toYaml .Values.prometheus.monitor.additionalLabels | indent 4 }}
{{- end }}
{{- end }}
spec:
selector:
matchLabels: