From e168b448efd33dde373925e7dd8a0011f84f9b2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20R=C3=BCger?= <manuel@rueg.eu>
Date: Thu, 31 Aug 2023 21:31:27 +0200
Subject: [PATCH] [kube-state-metrics] Add missing metadata keys (#3744)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Manuel Rüger <manuel@rueg.eu>
---
 charts/kube-state-metrics/Chart.yaml                    | 2 +-
 charts/kube-state-metrics/templates/crs-configmap.yaml  | 7 +++++++
 charts/kube-state-metrics/templates/rbac-configmap.yaml | 8 +++++++-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/charts/kube-state-metrics/Chart.yaml b/charts/kube-state-metrics/Chart.yaml
index 9c01f5c2e2f..8367bb441b4 100644
--- a/charts/kube-state-metrics/Chart.yaml
+++ b/charts/kube-state-metrics/Chart.yaml
@@ -7,7 +7,7 @@ keywords:
 - prometheus
 - kubernetes
 type: application
-version: 5.12.0
+version: 5.12.1
 appVersion: 2.10.0
 home: https://github.com/kubernetes/kube-state-metrics/
 sources:
diff --git a/charts/kube-state-metrics/templates/crs-configmap.yaml b/charts/kube-state-metrics/templates/crs-configmap.yaml
index 72986a60775..d38a75a51df 100644
--- a/charts/kube-state-metrics/templates/crs-configmap.yaml
+++ b/charts/kube-state-metrics/templates/crs-configmap.yaml
@@ -3,6 +3,13 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ template "kube-state-metrics.fullname" . }}-customresourcestate-config
+  namespace: {{ template "kube-state-metrics.namespace" . }}
+  labels:
+    {{- include "kube-state-metrics.labels" . | indent 4 }}
+  {{- if .Values.annotations }}
+  annotations:
+    {{ toYaml .Values.annotations | nindent 4 }}
+  {{- end }}
 data:
   config.yaml: |
     {{- toYaml .Values.customResourceState.config | nindent 4 }}
diff --git a/charts/kube-state-metrics/templates/rbac-configmap.yaml b/charts/kube-state-metrics/templates/rbac-configmap.yaml
index b0a511e9cd5..671dc9d6604 100644
--- a/charts/kube-state-metrics/templates/rbac-configmap.yaml
+++ b/charts/kube-state-metrics/templates/rbac-configmap.yaml
@@ -4,6 +4,12 @@ kind: ConfigMap
 metadata:
   name: {{ template "kube-state-metrics.fullname" . }}-rbac-config
   namespace: {{ template "kube-state-metrics.namespace" . }}
+  labels:
+    {{- include "kube-state-metrics.labels" . | indent 4 }}
+  {{- if .Values.annotations }}
+  annotations:
+    {{ toYaml .Values.annotations | nindent 4 }}
+  {{- end }}
 data:
   config-file.yaml: |+
     authorization:
@@ -13,4 +19,4 @@ data:
         resource: services
         subresource: {{ template "kube-state-metrics.fullname" . }}
         name: {{ template "kube-state-metrics.fullname" . }}
-{{- end }}
\ No newline at end of file
+{{- end }}