From 8316736e5e92dbef1578ea702a894dd1546ff010 Mon Sep 17 00:00:00 2001
From: Edward Cheng <edward@cheng.sydney>
Date: Tue, 11 Jun 2024 06:03:35 +1000
Subject: [PATCH 1/2] fix namespace issue

---
 .../{app => config}/namespace.yaml            |  0
 .../ingress-nginx/ingress-nginx.yaml          | 19 ++-----------------
 2 files changed, 2 insertions(+), 17 deletions(-)
 rename kubernetes/infrastructure/ingress-nginx/{app => config}/namespace.yaml (100%)

diff --git a/kubernetes/infrastructure/ingress-nginx/app/namespace.yaml b/kubernetes/infrastructure/ingress-nginx/config/namespace.yaml
similarity index 100%
rename from kubernetes/infrastructure/ingress-nginx/app/namespace.yaml
rename to kubernetes/infrastructure/ingress-nginx/config/namespace.yaml
diff --git a/kubernetes/infrastructure/ingress-nginx/ingress-nginx.yaml b/kubernetes/infrastructure/ingress-nginx/ingress-nginx.yaml
index c267b45..4ff876c 100644
--- a/kubernetes/infrastructure/ingress-nginx/ingress-nginx.yaml
+++ b/kubernetes/infrastructure/ingress-nginx/ingress-nginx.yaml
@@ -1,23 +1,8 @@
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
-metadata:
-  name: ingress-nginx-namespace
-  namespace: ingress-nginx
-spec:
-  interval: 1h
-  targetNamespace: ingress-nginx
-  path: ./kubernetes/infrastructure/ingress-nginx/app
-  prune: true
-  sourceRef:
-    kind: GitRepository
-    namespace: flux-system
-    name: flux-system
----
-apiVersion: kustomize.toolkit.fluxcd.io/v1
-kind: Kustomization
 metadata:
   name: ingress-nginx-config
-  namespace: ingress-nginx
+  namespace: flux-system
 spec:
   interval: 1h
   targetNamespace: ingress-nginx
@@ -34,7 +19,7 @@ apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
   name: ingress-nginx
-  namespace: ingress-nginx
+  namespace: flux-system
 spec:
   interval: 1h
   targetNamespace: ingress-nginx

From 469069b8f296a34c5f685ab79044214c070115c0 Mon Sep 17 00:00:00 2001
From: Edward Cheng <edward@cheng.sydney>
Date: Tue, 11 Jun 2024 06:03:53 +1000
Subject: [PATCH 2/2] fix namespace issue

---
 kubernetes/infrastructure/ingress-nginx/ingress-nginx.yaml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/kubernetes/infrastructure/ingress-nginx/ingress-nginx.yaml b/kubernetes/infrastructure/ingress-nginx/ingress-nginx.yaml
index 4ff876c..bae3ecc 100644
--- a/kubernetes/infrastructure/ingress-nginx/ingress-nginx.yaml
+++ b/kubernetes/infrastructure/ingress-nginx/ingress-nginx.yaml
@@ -12,8 +12,6 @@ spec:
     kind: GitRepository
     namespace: flux-system
     name: flux-system
-  dependsOn:
-    - name: ingress-nginx-namespace
 ---
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization