From 9d2c5e61623fceca750c9f923f1cab0a4cf870ae Mon Sep 17 00:00:00 2001
From: Edward Cheng <edward@cheng.sydney>
Date: Sun, 16 Jun 2024 11:11:26 +1000
Subject: [PATCH] update namespaces for apps

---
 kubernetes/apps/adguard-home/adguard-home.yaml              | 2 +-
 kubernetes/apps/adguard-home/app/ingress.yaml               | 2 +-
 kubernetes/apps/capacitor/app/ingress.yaml                  | 2 +-
 kubernetes/apps/capacitor/app/manifest.yaml                 | 4 ++--
 kubernetes/apps/capacitor/app/rbac.yaml                     | 2 +-
 kubernetes/apps/capacitor/capacitor.yaml                    | 2 +-
 kubernetes/apps/cert-manager/cert-manager.yaml              | 6 +++---
 kubernetes/apps/podinfo/podinfo.yaml                        | 2 +-
 kubernetes/apps/prometheus-operator/app/namespace.yaml      | 4 ++++
 .../apps/prometheus-operator/prometheus-operator.yaml       | 2 +-
 kubernetes/infrastructure/ingress-nginx/config/values.yaml  | 2 +-
 .../infrastructure/ingress-nginx/ingress-nginx-config.yaml  | 2 +-
 kubernetes/infrastructure/ingress-nginx/ingress-nginx.yaml  | 2 +-
 13 files changed, 19 insertions(+), 15 deletions(-)
 create mode 100644 kubernetes/apps/prometheus-operator/app/namespace.yaml

diff --git a/kubernetes/apps/adguard-home/adguard-home.yaml b/kubernetes/apps/adguard-home/adguard-home.yaml
index ce20174..c3221ba 100644
--- a/kubernetes/apps/adguard-home/adguard-home.yaml
+++ b/kubernetes/apps/adguard-home/adguard-home.yaml
@@ -2,7 +2,7 @@ apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
   name: adguard-home
-  namespace: flux-system
+  namespace: adguard-home
 spec:
   interval: 10m
   timeout: 1m30s
diff --git a/kubernetes/apps/adguard-home/app/ingress.yaml b/kubernetes/apps/adguard-home/app/ingress.yaml
index 2c57855..b5bcd9a 100644
--- a/kubernetes/apps/adguard-home/app/ingress.yaml
+++ b/kubernetes/apps/adguard-home/app/ingress.yaml
@@ -2,7 +2,7 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: adguard-home-ingress
-  namespace: flux-system
+  namespace: adguard-home
   annotations:
     nginx.ingress.kubernetes.io/ssl-redirect: "false"
     nginx.ingress.kubernetes.io/use-regex: "true"
diff --git a/kubernetes/apps/capacitor/app/ingress.yaml b/kubernetes/apps/capacitor/app/ingress.yaml
index e95b47f..8ff6124 100644
--- a/kubernetes/apps/capacitor/app/ingress.yaml
+++ b/kubernetes/apps/capacitor/app/ingress.yaml
@@ -2,7 +2,7 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: capacitor-ingress
-  namespace: flux-system
+  namespace: capacitor
   annotations:
     nginx.ingress.kubernetes.io/ssl-redirect: "false"
     nginx.ingress.kubernetes.io/use-regex: "true"
diff --git a/kubernetes/apps/capacitor/app/manifest.yaml b/kubernetes/apps/capacitor/app/manifest.yaml
index e3212ee..8f16651 100644
--- a/kubernetes/apps/capacitor/app/manifest.yaml
+++ b/kubernetes/apps/capacitor/app/manifest.yaml
@@ -4,7 +4,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: capacitor
-  namespace: flux-system
+  namespace: capacitor
   labels:
     helm.sh/chart: onechart-0.63.0
     app.kubernetes.io/name: onechart
@@ -26,7 +26,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: capacitor
-  namespace: flux-system
+  namespace: capacitor
   labels:
     helm.sh/chart: onechart-0.63.0
     app.kubernetes.io/name: onechart
diff --git a/kubernetes/apps/capacitor/app/rbac.yaml b/kubernetes/apps/capacitor/app/rbac.yaml
index 61ef613..07157d1 100644
--- a/kubernetes/apps/capacitor/app/rbac.yaml
+++ b/kubernetes/apps/capacitor/app/rbac.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: capacitor
-  namespace: flux-system
+  namespace: capacitor
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
diff --git a/kubernetes/apps/capacitor/capacitor.yaml b/kubernetes/apps/capacitor/capacitor.yaml
index 804279a..c3ff292 100644
--- a/kubernetes/apps/capacitor/capacitor.yaml
+++ b/kubernetes/apps/capacitor/capacitor.yaml
@@ -2,7 +2,7 @@ apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
   name: capacitor
-  namespace: flux-system
+  namespace: capacitor
 spec:
   interval: 10m
   timeout: 1m30s
diff --git a/kubernetes/apps/cert-manager/cert-manager.yaml b/kubernetes/apps/cert-manager/cert-manager.yaml
index 1f456c0..11de5e0 100644
--- a/kubernetes/apps/cert-manager/cert-manager.yaml
+++ b/kubernetes/apps/cert-manager/cert-manager.yaml
@@ -2,7 +2,7 @@ apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
   name: cert-manager
-  namespace: flux-system
+  namespace: cert-manager
 spec:
   interval: 10m
   timeout: 1m30s
@@ -19,7 +19,7 @@ apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
   name: clusterissuer-secrets
-  namespace: flux-system
+  namespace: cert-manager
 spec:
   interval: 10m
   timeout: 1m30s
@@ -42,7 +42,7 @@ apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
   name: clusterissuer
-  namespace: flux-system
+  namespace: cert-manager
 spec:
   interval: 10m
   timeout: 1m30s
diff --git a/kubernetes/apps/podinfo/podinfo.yaml b/kubernetes/apps/podinfo/podinfo.yaml
index 5bb45d4..fe06bd5 100644
--- a/kubernetes/apps/podinfo/podinfo.yaml
+++ b/kubernetes/apps/podinfo/podinfo.yaml
@@ -2,7 +2,7 @@ apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
   name: podinfo
-  namespace: flux-system
+  namespace: podinfo
 spec:
   interval: 10m
   timeout: 1m30s
diff --git a/kubernetes/apps/prometheus-operator/app/namespace.yaml b/kubernetes/apps/prometheus-operator/app/namespace.yaml
new file mode 100644
index 0000000..a586749
--- /dev/null
+++ b/kubernetes/apps/prometheus-operator/app/namespace.yaml
@@ -0,0 +1,4 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: prometheus-operator
diff --git a/kubernetes/apps/prometheus-operator/prometheus-operator.yaml b/kubernetes/apps/prometheus-operator/prometheus-operator.yaml
index 330aa66..84310e0 100644
--- a/kubernetes/apps/prometheus-operator/prometheus-operator.yaml
+++ b/kubernetes/apps/prometheus-operator/prometheus-operator.yaml
@@ -2,7 +2,7 @@ apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
   name: prometheus-operator
-  namespace: flux-system
+  namespace: prometheus-operator
 spec:
   suspend: true
   interval: 1h
diff --git a/kubernetes/infrastructure/ingress-nginx/config/values.yaml b/kubernetes/infrastructure/ingress-nginx/config/values.yaml
index 9fbd9d8..bfd5e09 100644
--- a/kubernetes/infrastructure/ingress-nginx/config/values.yaml
+++ b/kubernetes/infrastructure/ingress-nginx/config/values.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: ingress-nginx-values
-  namespace: flux-system
+  namespace: ingress-nginx
 data:
   use_geoip2: "false"
   disable_ipv6: "true"
diff --git a/kubernetes/infrastructure/ingress-nginx/ingress-nginx-config.yaml b/kubernetes/infrastructure/ingress-nginx/ingress-nginx-config.yaml
index 38cad47..53e5622 100644
--- a/kubernetes/infrastructure/ingress-nginx/ingress-nginx-config.yaml
+++ b/kubernetes/infrastructure/ingress-nginx/ingress-nginx-config.yaml
@@ -2,7 +2,7 @@ apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
   name: ingress-nginx-config
-  namespace: flux-system
+  namespace: ingress-nginx
 spec:
   interval: 10m
   timeout: 1m30s
diff --git a/kubernetes/infrastructure/ingress-nginx/ingress-nginx.yaml b/kubernetes/infrastructure/ingress-nginx/ingress-nginx.yaml
index c189c3d..001c917 100644
--- a/kubernetes/infrastructure/ingress-nginx/ingress-nginx.yaml
+++ b/kubernetes/infrastructure/ingress-nginx/ingress-nginx.yaml
@@ -2,7 +2,7 @@ apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
   name: ingress-nginx
-  namespace: flux-system
+  namespace: ingress-nginx
 spec:
   interval: 10m
   timeout: 1m30s