From d96b7d6a413debb14b97cfed825fa963fffc398f Mon Sep 17 00:00:00 2001
From: V <vlad@dev.local>
Date: Tue, 18 Nov 2025 14:29:11 +0000
Subject: [PATCH] fixin

---
 .../base/{ => cm}/kube-state-metrics-config.yaml   |  0
 .../controllers/base/cm/kustomization.yaml         | 12 ++++++++++++
 .../controllers/base/kube-prometheus-stack.yaml    |  2 ++
 .../monitoring/controllers/base/kustomization.yaml | 14 ++++----------
 .../controllers/base/kustomizeconfig.yaml          |  2 --
 .../controllers/base/metrics-server.yaml           |  4 +++-
 .../controllers/dev-arm64/kustomization.yaml       |  4 ++--
 7 files changed, 23 insertions(+), 15 deletions(-)
 rename components/monitoring/controllers/base/{ => cm}/kube-state-metrics-config.yaml (100%)
 create mode 100644 components/monitoring/controllers/base/cm/kustomization.yaml

diff --git a/components/monitoring/controllers/base/kube-state-metrics-config.yaml b/components/monitoring/controllers/base/cm/kube-state-metrics-config.yaml
similarity index 100%
rename from components/monitoring/controllers/base/kube-state-metrics-config.yaml
rename to components/monitoring/controllers/base/cm/kube-state-metrics-config.yaml
diff --git a/components/monitoring/controllers/base/cm/kustomization.yaml b/components/monitoring/controllers/base/cm/kustomization.yaml
new file mode 100644
index 0000000..426aab2
--- /dev/null
+++ b/components/monitoring/controllers/base/cm/kustomization.yaml
@@ -0,0 +1,12 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: monitoring
+configMapGenerator:
+  - name: flux-kube-state-metrics-config
+    files:
+      - kube-state-metrics-config.yaml
+    options:
+      labels:
+        app.kubernetes.io/part-of: flux
+        app.kubernetes.io/component: monitoring
+
diff --git a/components/monitoring/controllers/base/kube-prometheus-stack.yaml b/components/monitoring/controllers/base/kube-prometheus-stack.yaml
index c76d856..884b4a8 100644
--- a/components/monitoring/controllers/base/kube-prometheus-stack.yaml
+++ b/components/monitoring/controllers/base/kube-prometheus-stack.yaml
@@ -2,6 +2,7 @@ apiVersion: source.toolkit.fluxcd.io/v1
 kind: HelmRepository
 metadata:
     name: prometheus-community
+    namespace: monitoring
 spec:
     interval: 12h
     type: oci
@@ -11,6 +12,7 @@ apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
     name: kube-prometheus-stack
+    namespace: monitoring
 spec:
     serviceAccountName: flux
     interval: 1h
diff --git a/components/monitoring/controllers/base/kustomization.yaml b/components/monitoring/controllers/base/kustomization.yaml
index 5e14fc4..79071cd 100644
--- a/components/monitoring/controllers/base/kustomization.yaml
+++ b/components/monitoring/controllers/base/kustomization.yaml
@@ -1,19 +1,13 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-namespace: monitoring
+# Namespace is specified in each file in this case due to an issue with the RoleBinding
+# namespace: monitoring
 resources:
   - namespace.yaml
   - rbac.yaml
   - grafana-auth-secret.yaml
   - kube-prometheus-stack.yaml
   - metrics-server.yaml
-configMapGenerator:
-  - name: flux-kube-state-metrics-config
-    files:
-      - kube-state-metrics-config.yaml
-    options:
-      labels:
-        app.kubernetes.io/part-of: flux
-        app.kubernetes.io/component: monitoring
+  - cm/
 configurations:
-  - kustomizeconfig.yaml
\ No newline at end of file
+  - kustomizeconfig.yaml
diff --git a/components/monitoring/controllers/base/kustomizeconfig.yaml b/components/monitoring/controllers/base/kustomizeconfig.yaml
index 317814b..e92da5d 100644
--- a/components/monitoring/controllers/base/kustomizeconfig.yaml
+++ b/components/monitoring/controllers/base/kustomizeconfig.yaml
@@ -4,6 +4,4 @@ nameReference:
   fieldSpecs:
   - path: spec/valuesFrom/name
     kind: HelmRelease
-namespace:
-- kind: RoleBinding
 
diff --git a/components/monitoring/controllers/base/metrics-server.yaml b/components/monitoring/controllers/base/metrics-server.yaml
index f867d60..6d15fb6 100644
--- a/components/monitoring/controllers/base/metrics-server.yaml
+++ b/components/monitoring/controllers/base/metrics-server.yaml
@@ -2,6 +2,7 @@ apiVersion: source.toolkit.fluxcd.io/v1
 kind: OCIRepository
 metadata:
   name: metrics-server
+  namespace: monitoring
 spec:
   interval: 1h
   url: oci://ghcr.io/controlplaneio-fluxcd/charts/metrics-server
@@ -15,6 +16,7 @@ apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
   name: metrics-server
+  namespace: monitoring
 spec:
   serviceAccountName: flux
   interval: 1h
@@ -24,4 +26,4 @@ spec:
   # https://github.com/kubernetes-sigs/metrics-server/blob/master/charts/metrics-server/values.yaml
   values:
     args:
-      - --kubelet-insecure-tls
\ No newline at end of file
+      - --kubelet-insecure-tls
diff --git a/components/monitoring/controllers/dev-arm64/kustomization.yaml b/components/monitoring/controllers/dev-arm64/kustomization.yaml
index 8f4651f..f37daaf 100644
--- a/components/monitoring/controllers/dev-arm64/kustomization.yaml
+++ b/components/monitoring/controllers/dev-arm64/kustomization.yaml
@@ -1,7 +1,7 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - ../base
+  - ../base/
 patches:
   - patch: |
       - op: replace
@@ -19,4 +19,4 @@ patches:
 #        name: metrics-server
 #    target:
 #      kind: HelmRelease
-#      name: metrics-server
\ No newline at end of file
+#      name: metrics-server