From 9e4035b01ec54d2e68202f2a846036c19084c274 Mon Sep 17 00:00:00 2001
From: janlud <65601859+janlud@users.noreply.github.com>
Date: Tue, 9 Feb 2021 19:32:38 +0100
Subject: [PATCH] fix: allow overriding of selector for kube-state-metrics
 serviceMonitor (#303)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

app.kubernetes.io/instance is overriden by ArgoCD on the service and because of that this serviceMonitor fails to detect the service

Signed-off-by: Jan Ludvik <jan.ludvik@deltatre.com>

Co-authored-by: Jan Ludvik <jan.ludvik@deltatre.com>
Co-authored-by: André Bauer <monotek@users.noreply.github.com>
---
 charts/kube-prometheus-stack/Chart.yaml                       | 2 +-
 .../exporters/kube-state-metrics/serviceMonitor.yaml          | 4 ++++
 charts/kube-prometheus-stack/values.yaml                      | 3 +++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/charts/kube-prometheus-stack/Chart.yaml b/charts/kube-prometheus-stack/Chart.yaml
index 0e234a68..395c31a0 100644
--- a/charts/kube-prometheus-stack/Chart.yaml
+++ b/charts/kube-prometheus-stack/Chart.yaml
@@ -18,7 +18,7 @@ name: kube-prometheus-stack
 sources:
   - https://github.com/prometheus-community/helm-charts
   - https://github.com/prometheus-operator/kube-prometheus
-version: 13.5.1
+version: 13.6.0
 appVersion: 0.45.0
 kubeVersion: ">=1.16.0-0"
 home: https://github.com/prometheus-operator/kube-prometheus
diff --git a/charts/kube-prometheus-stack/templates/exporters/kube-state-metrics/serviceMonitor.yaml b/charts/kube-prometheus-stack/templates/exporters/kube-state-metrics/serviceMonitor.yaml
index f09de5d2..bc814faf 100644
--- a/charts/kube-prometheus-stack/templates/exporters/kube-state-metrics/serviceMonitor.yaml
+++ b/charts/kube-prometheus-stack/templates/exporters/kube-state-metrics/serviceMonitor.yaml
@@ -25,6 +25,10 @@ spec:
 {{- end }}
   selector:
     matchLabels:
+      {{- if .Values.kubeStateMetrics.serviceMonitor.selectorOverride }}
+      {{ toYaml .Values.kubeStateMetrics.serviceMonitor.selectorOverride }}
+      {{ else }}
       app.kubernetes.io/name: kube-state-metrics
       app.kubernetes.io/instance: "{{ $.Release.Name }}"
+      {{- end }}
 {{- end }}
diff --git a/charts/kube-prometheus-stack/values.yaml b/charts/kube-prometheus-stack/values.yaml
index f367e960..caa38b02 100644
--- a/charts/kube-prometheus-stack/values.yaml
+++ b/charts/kube-prometheus-stack/values.yaml
@@ -1151,6 +1151,9 @@ kubeStateMetrics:
     ## Scrape interval. If not set, the Prometheus default scrape interval is used.
     ##
     interval: ""
+    ## Override serviceMonitor selector
+    ##
+    selectorOverride: {}
 
     ## 	metric relabel configs to apply to samples before ingestion.
     ##