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

---
 kubernetes/infrastructure/kustomization.yaml     |  7 ++++++-
 .../{namespaces => }/adguard-home.yaml           |  0
 .../namespaces/{namespaces => }/capacitor.yaml   |  0
 .../{namespaces => }/cert-manager.yaml           |  0
 .../{namespaces => }/ingress-nginx.yaml          |  0
 .../infrastructure/namespaces/kustomization.yaml |  4 ----
 .../infrastructure/namespaces/namespaces.yaml    | 16 ----------------
 .../namespaces/{namespaces => }/podinfo.yaml     |  0
 .../{namespaces => }/prometheus-operator.yaml    |  0
 9 files changed, 6 insertions(+), 21 deletions(-)
 rename kubernetes/infrastructure/namespaces/{namespaces => }/adguard-home.yaml (100%)
 rename kubernetes/infrastructure/namespaces/{namespaces => }/capacitor.yaml (100%)
 rename kubernetes/infrastructure/namespaces/{namespaces => }/cert-manager.yaml (100%)
 rename kubernetes/infrastructure/namespaces/{namespaces => }/ingress-nginx.yaml (100%)
 delete mode 100644 kubernetes/infrastructure/namespaces/kustomization.yaml
 delete mode 100644 kubernetes/infrastructure/namespaces/namespaces.yaml
 rename kubernetes/infrastructure/namespaces/{namespaces => }/podinfo.yaml (100%)
 rename kubernetes/infrastructure/namespaces/{namespaces => }/prometheus-operator.yaml (100%)

diff --git a/kubernetes/infrastructure/kustomization.yaml b/kubernetes/infrastructure/kustomization.yaml
index cff051c..ff51e0d 100644
--- a/kubernetes/infrastructure/kustomization.yaml
+++ b/kubernetes/infrastructure/kustomization.yaml
@@ -1,7 +1,12 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - ./namespaces/
+  - ./namespaces/adguard-home.yaml
+  - ./namespaces/capacitor.yaml
+  - ./namespaces/cert-manager.yaml
+  - ./namespaces/ingress-nginx.yaml
+  - ./namespaces/podinfo.yaml
+  - ./namespaces/prometheus-operator.yaml
   - ./repositories/repositories.yaml
   - ./cilium/cilium.yaml
   - ./ingress-nginx/ingress-nginx-config.yaml
diff --git a/kubernetes/infrastructure/namespaces/namespaces/adguard-home.yaml b/kubernetes/infrastructure/namespaces/adguard-home.yaml
similarity index 100%
rename from kubernetes/infrastructure/namespaces/namespaces/adguard-home.yaml
rename to kubernetes/infrastructure/namespaces/adguard-home.yaml
diff --git a/kubernetes/infrastructure/namespaces/namespaces/capacitor.yaml b/kubernetes/infrastructure/namespaces/capacitor.yaml
similarity index 100%
rename from kubernetes/infrastructure/namespaces/namespaces/capacitor.yaml
rename to kubernetes/infrastructure/namespaces/capacitor.yaml
diff --git a/kubernetes/infrastructure/namespaces/namespaces/cert-manager.yaml b/kubernetes/infrastructure/namespaces/cert-manager.yaml
similarity index 100%
rename from kubernetes/infrastructure/namespaces/namespaces/cert-manager.yaml
rename to kubernetes/infrastructure/namespaces/cert-manager.yaml
diff --git a/kubernetes/infrastructure/namespaces/namespaces/ingress-nginx.yaml b/kubernetes/infrastructure/namespaces/ingress-nginx.yaml
similarity index 100%
rename from kubernetes/infrastructure/namespaces/namespaces/ingress-nginx.yaml
rename to kubernetes/infrastructure/namespaces/ingress-nginx.yaml
diff --git a/kubernetes/infrastructure/namespaces/kustomization.yaml b/kubernetes/infrastructure/namespaces/kustomization.yaml
deleted file mode 100644
index 0c8f877..0000000
--- a/kubernetes/infrastructure/namespaces/kustomization.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-  - namespaces.yaml
\ No newline at end of file
diff --git a/kubernetes/infrastructure/namespaces/namespaces.yaml b/kubernetes/infrastructure/namespaces/namespaces.yaml
deleted file mode 100644
index 06165de..0000000
--- a/kubernetes/infrastructure/namespaces/namespaces.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/source.toolkit.fluxcd.io/gitrepository_v1.json
-apiVersion: kustomize.toolkit.fluxcd.io/v1
-kind: Kustomization
-metadata:
-  name: namespaces
-  namespace: flux-system
-spec:
-  interval: 10m
-  timeout: 1m30s
-  retryInterval: 30s
-  path: ./kubernetes/infrastructure/namespaces/namespaces
-  prune: true
-  sourceRef:
-    kind: GitRepository
-    namespace: flux-system
-    name: flux-system
diff --git a/kubernetes/infrastructure/namespaces/namespaces/podinfo.yaml b/kubernetes/infrastructure/namespaces/podinfo.yaml
similarity index 100%
rename from kubernetes/infrastructure/namespaces/namespaces/podinfo.yaml
rename to kubernetes/infrastructure/namespaces/podinfo.yaml
diff --git a/kubernetes/infrastructure/namespaces/namespaces/prometheus-operator.yaml b/kubernetes/infrastructure/namespaces/prometheus-operator.yaml
similarity index 100%
rename from kubernetes/infrastructure/namespaces/namespaces/prometheus-operator.yaml
rename to kubernetes/infrastructure/namespaces/prometheus-operator.yaml