From ce2ee8d39edd10fb84756b396cf1450b75b20207 Mon Sep 17 00:00:00 2001
From: Mayne0213 <bluemayne0213@icloud.com>
Date: Mon, 29 Dec 2025 02:21:00 +0900
Subject: [PATCH] REFACTOR(repo): restructure infra folder structure

- Remove argocd/, helm-values/, ingress/ subdirectories
- Move files to parent directory with standardized names
- Add namespace.yaml to all apps with Goldilocks labels
- Preserve vault/ subdirectories (falco, velero)
- Update main kustomization.yaml to reference argocd.yaml files directly
- Comment out argocd.yaml in each app's kustomization.yaml to prevent
  circular reference

Applications restructured:
- cert-manager (2 ArgoCD apps)
- external-secrets
- reloader
- vault (2 ArgoCD apps)
- velero (2 ArgoCD apps)
- falco
- cnpg
- haproxy
- metallb
- vpa
- argocd
---
 .../{ingress/argocd-server-ingress.yaml => ingress.yaml}   | 0
 argocd/kustomization.yaml                                  | 3 ++-
 argocd/namespace.yaml                                      | 6 ++++++
 .../{argocd/cert-manager.yaml => argocd-certmanager.yaml}  | 0
 .../cert-manager-issuers.yaml => argocd-issuers.yaml}      | 0
 .../{helm-values/cert-manager.yaml => helm-values.yaml}    | 0
 cert-manager/kustomization.yaml                            | 7 ++++---
 cert-manager/namespace.yaml                                | 6 ++++++
 8 files changed, 18 insertions(+), 4 deletions(-)
 rename argocd/{ingress/argocd-server-ingress.yaml => ingress.yaml} (100%)
 create mode 100644 argocd/namespace.yaml
 rename cert-manager/{argocd/cert-manager.yaml => argocd-certmanager.yaml} (100%)
 rename cert-manager/{argocd/cert-manager-issuers.yaml => argocd-issuers.yaml} (100%)
 rename cert-manager/{helm-values/cert-manager.yaml => helm-values.yaml} (100%)
 create mode 100644 cert-manager/namespace.yaml

diff --git a/argocd/ingress/argocd-server-ingress.yaml b/argocd/ingress.yaml
similarity index 100%
rename from argocd/ingress/argocd-server-ingress.yaml
rename to argocd/ingress.yaml
diff --git a/argocd/kustomization.yaml b/argocd/kustomization.yaml
index d7e68be..50de2bf 100644
--- a/argocd/kustomization.yaml
+++ b/argocd/kustomization.yaml
@@ -2,5 +2,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
+  - namespace.yaml
   - argocd-cmd-params-cm.yaml
-  - ingress/argocd-server-ingress.yaml
+  - ingress.yaml
diff --git a/argocd/namespace.yaml b/argocd/namespace.yaml
new file mode 100644
index 0000000..271d708
--- /dev/null
+++ b/argocd/namespace.yaml
@@ -0,0 +1,6 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: argocd
+  labels:
+    goldilocks.fairwinds.com/enabled: "true"
diff --git a/cert-manager/argocd/cert-manager.yaml b/cert-manager/argocd-certmanager.yaml
similarity index 100%
rename from cert-manager/argocd/cert-manager.yaml
rename to cert-manager/argocd-certmanager.yaml
diff --git a/cert-manager/argocd/cert-manager-issuers.yaml b/cert-manager/argocd-issuers.yaml
similarity index 100%
rename from cert-manager/argocd/cert-manager-issuers.yaml
rename to cert-manager/argocd-issuers.yaml
diff --git a/cert-manager/helm-values/cert-manager.yaml b/cert-manager/helm-values.yaml
similarity index 100%
rename from cert-manager/helm-values/cert-manager.yaml
rename to cert-manager/helm-values.yaml
diff --git a/cert-manager/kustomization.yaml b/cert-manager/kustomization.yaml
index c492df9..4bf1b87 100644
--- a/cert-manager/kustomization.yaml
+++ b/cert-manager/kustomization.yaml
@@ -2,8 +2,9 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
-  # ArgoCD Application 리소스는 infrastructure/kustomization.yaml에서 관리
-  # - argocd/cert-manager.yaml
-  # - argocd/cert-manager-issuers.yaml
+  # argocd.yaml files은 수동으로 관리 (순환 참조 방지)
+  # - argocd-certmanager.yaml
+  # - argocd-issuers.yaml
+  - namespace.yaml
   - cluster-issuer-prod.yaml
   - cluster-issuer-staging.yaml
diff --git a/cert-manager/namespace.yaml b/cert-manager/namespace.yaml
new file mode 100644
index 0000000..55bbf01
--- /dev/null
+++ b/cert-manager/namespace.yaml
@@ -0,0 +1,6 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: cert-manager
+  labels:
+    goldilocks.fairwinds.com/enabled: "true"