From 5fff5faedd4e188e0d702877343aaf2d598d0f12 Mon Sep 17 00:00:00 2001
From: Denis Patrakeev <denis.patrakeev@avroid.team>
Date: Thu, 6 Mar 2025 15:30:38 +0300
Subject: [PATCH] [hotfix] Fix namespace for kube-prometheus-stack 2 (!121)

Co-authored-by: denis.patrakeev <denis.patrakeev@avroid.tech>
Reviewed-on: https://git.avroid.tech/K8s/k8s-configs/pulls/121
Reviewed-by: Rustam Tagaev <rustam.tagaev@avroid.team>
---
 .../argocd-apps-kube-prometheus-stack-app.yaml    |  8 ++++++--
 .../kube-prometheus-stack/values-override.yaml    | 15 ---------------
 2 files changed, 6 insertions(+), 17 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 193da41..0e13993 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
@@ -44,8 +44,7 @@ spec:
     - https://nexus.avroid.tech/repository/devops-helm-proxy-helm/
   # Only permit applications to deploy to the guestbook namespace in the same cluster
   destinations:
-    - namespace: kube-prometheus-stack
-      server: https://kubernetes.default.svc
+    - server: https://kubernetes.default.svc
   # Deny all cluster-scoped resources from being created, except for Namespace
   clusterResourceWhitelist:
     - group: ''
@@ -68,3 +67,8 @@ 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-prometheus-stack"
+    - "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 5f6178f..b92406f 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
@@ -2,10 +2,6 @@
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
-## Override the deployment namespace
-##
-namespaceOverride: "kube-prometheus-stack"
-
 ## Create default rules for monitoring the cluster
 ##
 defaultRules:
@@ -29,17 +25,6 @@ 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: