From 69edc6d8fd4af56a7bd88ece6f6f37bda3aaedc8 Mon Sep 17 00:00:00 2001
From: auricom <27022259+auricom@users.noreply.github.com>
Date: Tue, 8 Oct 2024 09:01:49 +0200
Subject: [PATCH] =?UTF-8?q?feat(container):=20update=20kube-prometheus-sta?=
 =?UTF-8?q?ck=20(=2063.10.0=20=E2=86=92=2065.1.0=20)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/helmrelease.yaml                      | 37 ++++++++-----------
 1 file changed, 16 insertions(+), 21 deletions(-)

diff --git a/kubernetes/apps/monitoring/kube-prometheus-stack/app/helmrelease.yaml b/kubernetes/apps/monitoring/kube-prometheus-stack/app/helmrelease.yaml
index dd570669d..439b65298 100644
--- a/kubernetes/apps/monitoring/kube-prometheus-stack/app/helmrelease.yaml
+++ b/kubernetes/apps/monitoring/kube-prometheus-stack/app/helmrelease.yaml
@@ -10,7 +10,7 @@ spec:
   chart:
     spec:
       chart: kube-prometheus-stack
-      version: 63.1.0
+      version: 65.1.0
       sourceRef:
         kind: HelmRepository
         name: prometheus-community
@@ -40,15 +40,6 @@ spec:
     ###
     kubeApiServer:
       enabled: true
-
-    kubeControllerManager:
-      enabled: false
-
-    kubeEtcd:
-      enabled: false
-
-    kubelet:
-      enabled: true
       serviceMonitor:
         metricRelabelings:
           - action: replace
@@ -58,12 +49,17 @@ spec:
 
     kubeProxy:
       enabled: false
-
-    kubeScheduler:
-      enabled: false
+      service:
+        selector:
+          k8s-app: kube-scheduler
+    kubeControllerManager: &kubeControllerManager
+      service:
+        selector:
+          k8s-app: kube-controller-manager
+    kubeEtcd:
+      <<: *kubeControllerManager # etcd runs on control plane nodes
 
     kubeStateMetrics:
-      enabled: true
       metricLabelsAllowlist:
         - "persistentvolumeclaims=[*]"
       prometheus:
@@ -81,8 +77,6 @@ spec:
       enabled: false
       forceDeployDashboards: true
 
-    nodeExporter:
-      enabled: true
     prometheus-node-exporter:
       resources:
         requests:
@@ -149,11 +143,12 @@ spec:
         replicas: 2
         replicaExternalLabelName: replica
         scrapeInterval: 1m # Must match interval in Grafana Helm chart
-        ruleSelectorNilUsesHelmValues: false
-        serviceMonitorSelectorNilUsesHelmValues: false
-        podMonitorSelectorNilUsesHelmValues: false
-        probeSelectorNilUsesHelmValues: false
-        scrapeConfigSelectorNilUsesHelmValues: false
+        podMonitorSelector: &selector
+          matchLabels: null
+        probeSelector: *selector
+        ruleSelector: *selector
+        scrapeConfigSelector: *selector
+        serviceMonitorSelector: *selector
         retention: 2d
         retentionSize: 15GB
         enableAdminAPI: true