From e4b130ebe61a9be730a5051db6641369aec67e14 Mon Sep 17 00:00:00 2001
From: Denis Patrakeev <denis.patrakeev@avroid.team>
Date: Thu, 6 Mar 2025 14:00:41 +0300
Subject: [PATCH] [hotfix] Fix namespace for kubelet monitoring (!118)

Co-authored-by: denis.patrakeev <denis.patrakeev@avroid.tech>
Reviewed-on: https://git.avroid.tech/K8s/k8s-configs/pulls/118
Reviewed-by: Rustam Tagaev <rustam.tagaev@avroid.team>
Co-authored-by: Denis Patrakeev <denis.patrakeev@avroid.team>
Co-committed-by: Denis Patrakeev <denis.patrakeev@avroid.team>
---
 .../argocd-apps-kube-prometheus-stack-app.yaml        |  4 ----
 .../kube-prometheus-stack/values-override.yaml        | 11 +++++++++++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/clusters/k8s-avroid-office.prod.local/namespaces/kube-prometheus-stack/kube-prometheus-stack/argocd-apps-kube-prometheus-stack-app.yaml b/clusters/k8s-avroid-office.prod.local/namespaces/kube-prometheus-stack/kube-prometheus-stack/argocd-apps-kube-prometheus-stack-app.yaml
index 375269d..193da41 100644
--- a/clusters/k8s-avroid-office.prod.local/namespaces/kube-prometheus-stack/kube-prometheus-stack/argocd-apps-kube-prometheus-stack-app.yaml
+++ b/clusters/k8s-avroid-office.prod.local/namespaces/kube-prometheus-stack/kube-prometheus-stack/argocd-apps-kube-prometheus-stack-app.yaml
@@ -68,7 +68,3 @@ spec:
       kind: ServiceMonitor
     - group: '*'
       kind: Prometheus
-  # When using Applications-in-any-namespace, this field determines which namespaces this AppProject permits
-  # Applications to reside in. Details: https://argo-cd.readthedocs.io/en/stable/operator-manual/app-any-namespace/
-  sourceNamespaces:
-    - "kube-system"
diff --git a/clusters/k8s-avroid-office.prod.local/namespaces/kube-prometheus-stack/kube-prometheus-stack/values-override.yaml b/clusters/k8s-avroid-office.prod.local/namespaces/kube-prometheus-stack/kube-prometheus-stack/values-override.yaml
index b92406f..c7e775e 100644
--- a/clusters/k8s-avroid-office.prod.local/namespaces/kube-prometheus-stack/kube-prometheus-stack/values-override.yaml
+++ b/clusters/k8s-avroid-office.prod.local/namespaces/kube-prometheus-stack/kube-prometheus-stack/values-override.yaml
@@ -25,6 +25,17 @@ alertmanager:
 grafana:
   enabled: false
 
+## Component scraping the kubelet and kubelet-hosted cAdvisor
+##
+kubelet:
+  namespace: kube-prometheus-stack
+
+## Manages Prometheus and Alertmanager components
+##
+prometheusOperator:
+  kubeletService:
+    namespace: kube-prometheus-stack
+
 ## Deploy a Prometheus instance
 ##
 prometheus: