From e01744bcbe68deb83aa9b1d0ec5ddc57545c6fbf Mon Sep 17 00:00:00 2001
From: Ryan Belgrave <ryan.belgrave@optum.com>
Date: Fri, 24 May 2019 13:11:32 -0500
Subject: [PATCH] [stable/kube-state-metrics] fix service monitor label nesting
 (#14128)

Signed-off-by: Ryan Belgrave <ryan.belgrave@optum.com>
---
 stable/kube-state-metrics/Chart.yaml             |  2 +-
 stable/kube-state-metrics/templates/monitor.yaml | 14 ++++++--------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/stable/kube-state-metrics/Chart.yaml b/stable/kube-state-metrics/Chart.yaml
index 711ca0fec6..79e8c315f0 100644
--- a/stable/kube-state-metrics/Chart.yaml
+++ b/stable/kube-state-metrics/Chart.yaml
@@ -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:
diff --git a/stable/kube-state-metrics/templates/monitor.yaml b/stable/kube-state-metrics/templates/monitor.yaml
index 2aaf35b804..af151f1024 100644
--- a/stable/kube-state-metrics/templates/monitor.yaml
+++ b/stable/kube-state-metrics/templates/monitor.yaml
@@ -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: