From e08e386f3ca099ae52071ffcee3e68505efc83d3 Mon Sep 17 00:00:00 2001
From: Edward Cheng <edward@cheng.sydney>
Date: Sun, 16 Jun 2024 16:04:36 +1000
Subject: [PATCH] consolidate namespace

---
 kubernetes/infrastructure/kustomization.yaml     |  1 +
 .../infrastructure/namespaces/namespaces.yaml    | 16 ++++++++++++++++
 .../namespaces/namespaces/adguard-home.yaml}     |  0
 .../namespaces/namespaces/capacitor.yaml         |  4 ++++
 .../namespaces/namespaces/cert-manager.yaml}     |  0
 .../namespaces/ingress-nginx.yaml}               |  0
 .../namespaces/namespaces/podinfo.yaml}          |  0
 .../namespaces/prometheus-operator.yaml}         |  0
 8 files changed, 21 insertions(+)
 create mode 100644 kubernetes/infrastructure/namespaces/namespaces.yaml
 rename kubernetes/{apps/adguard-home/app/namespace.yaml => infrastructure/namespaces/namespaces/adguard-home.yaml} (100%)
 create mode 100644 kubernetes/infrastructure/namespaces/namespaces/capacitor.yaml
 rename kubernetes/{apps/cert-manager/app/namespace.yaml => infrastructure/namespaces/namespaces/cert-manager.yaml} (100%)
 rename kubernetes/infrastructure/{ingress-nginx/config/namespace.yaml => namespaces/namespaces/ingress-nginx.yaml} (100%)
 rename kubernetes/{apps/podinfo/app/namespace.yaml => infrastructure/namespaces/namespaces/podinfo.yaml} (100%)
 rename kubernetes/{apps/prometheus-operator/app/namespace.yaml => infrastructure/namespaces/namespaces/prometheus-operator.yaml} (100%)

diff --git a/kubernetes/infrastructure/kustomization.yaml b/kubernetes/infrastructure/kustomization.yaml
index 1e8bf93..61d226e 100644
--- a/kubernetes/infrastructure/kustomization.yaml
+++ b/kubernetes/infrastructure/kustomization.yaml
@@ -1,6 +1,7 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
+  - ./namespaces/namespaces.yaml
   - ./repositories/repositories.yaml
   - ./cilium/cilium.yaml
   - ./ingress-nginx/ingress-nginx-config.yaml
diff --git a/kubernetes/infrastructure/namespaces/namespaces.yaml b/kubernetes/infrastructure/namespaces/namespaces.yaml
new file mode 100644
index 0000000..fac74ad
--- /dev/null
+++ b/kubernetes/infrastructure/namespaces/namespaces.yaml
@@ -0,0 +1,16 @@
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: namespaces
+  namespace: flux-system
+spec:
+  interval: 10m
+  timeout: 1m30s
+  retryInterval: 30s
+  targetNamespace: flux-system
+  path: ./kubernetes/infrastructure/namespaces/namespaces
+  prune: true
+  sourceRef:
+    kind: GitRepository
+    namespace: flux-system
+    name: flux-system
\ No newline at end of file
diff --git a/kubernetes/apps/adguard-home/app/namespace.yaml b/kubernetes/infrastructure/namespaces/namespaces/adguard-home.yaml
similarity index 100%
rename from kubernetes/apps/adguard-home/app/namespace.yaml
rename to kubernetes/infrastructure/namespaces/namespaces/adguard-home.yaml
diff --git a/kubernetes/infrastructure/namespaces/namespaces/capacitor.yaml b/kubernetes/infrastructure/namespaces/namespaces/capacitor.yaml
new file mode 100644
index 0000000..537ce6c
--- /dev/null
+++ b/kubernetes/infrastructure/namespaces/namespaces/capacitor.yaml
@@ -0,0 +1,4 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: capacitor
diff --git a/kubernetes/apps/cert-manager/app/namespace.yaml b/kubernetes/infrastructure/namespaces/namespaces/cert-manager.yaml
similarity index 100%
rename from kubernetes/apps/cert-manager/app/namespace.yaml
rename to kubernetes/infrastructure/namespaces/namespaces/cert-manager.yaml
diff --git a/kubernetes/infrastructure/ingress-nginx/config/namespace.yaml b/kubernetes/infrastructure/namespaces/namespaces/ingress-nginx.yaml
similarity index 100%
rename from kubernetes/infrastructure/ingress-nginx/config/namespace.yaml
rename to kubernetes/infrastructure/namespaces/namespaces/ingress-nginx.yaml
diff --git a/kubernetes/apps/podinfo/app/namespace.yaml b/kubernetes/infrastructure/namespaces/namespaces/podinfo.yaml
similarity index 100%
rename from kubernetes/apps/podinfo/app/namespace.yaml
rename to kubernetes/infrastructure/namespaces/namespaces/podinfo.yaml
diff --git a/kubernetes/apps/prometheus-operator/app/namespace.yaml b/kubernetes/infrastructure/namespaces/namespaces/prometheus-operator.yaml
similarity index 100%
rename from kubernetes/apps/prometheus-operator/app/namespace.yaml
rename to kubernetes/infrastructure/namespaces/namespaces/prometheus-operator.yaml