fixin

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
+

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

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:
+  - cm/
-  - 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
 configurations:
   - kustomizeconfig.yaml

components/monitoring/controllers/base/kustomizeconfig.yaml

@@ -4,6 +4,4 @@ nameReference:
   fieldSpecs:
   - path: spec/valuesFrom/name
     kind: HelmRelease
-namespace:
-- kind: RoleBinding
 

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

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