From 55380edbd493459f4e0faa53fd0d943561735bce 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
---
 cnpg/{argocd/cnpg.yaml => argocd.yaml}                  | 0
 cnpg/{helm-values/cnpg.yaml => helm-values.yaml}        | 0
 cnpg/kustomization.yaml                                 | 5 +++--
 cnpg/namespace.yaml                                     | 6 ++++++
 velero/{argocd/velero-ui.yaml => argocd-ui.yaml}        | 0
 velero/{argocd/velero.yaml => argocd-velero.yaml}       | 0
 velero/{helm-values/velero.yaml => helm-values.yaml}    | 0
 velero/{ingress/velero-ui-ingress.yaml => ingress.yaml} | 0
 velero/kustomization.yaml                               | 8 +++++---
 velero/namespace.yaml                                   | 6 ++++++
 10 files changed, 20 insertions(+), 5 deletions(-)
 rename cnpg/{argocd/cnpg.yaml => argocd.yaml} (100%)
 rename cnpg/{helm-values/cnpg.yaml => helm-values.yaml} (100%)
 create mode 100644 cnpg/namespace.yaml
 rename velero/{argocd/velero-ui.yaml => argocd-ui.yaml} (100%)
 rename velero/{argocd/velero.yaml => argocd-velero.yaml} (100%)
 rename velero/{helm-values/velero.yaml => helm-values.yaml} (100%)
 rename velero/{ingress/velero-ui-ingress.yaml => ingress.yaml} (100%)
 create mode 100644 velero/namespace.yaml

diff --git a/cnpg/argocd/cnpg.yaml b/cnpg/argocd.yaml
similarity index 100%
rename from cnpg/argocd/cnpg.yaml
rename to cnpg/argocd.yaml
diff --git a/cnpg/helm-values/cnpg.yaml b/cnpg/helm-values.yaml
similarity index 100%
rename from cnpg/helm-values/cnpg.yaml
rename to cnpg/helm-values.yaml
diff --git a/cnpg/kustomization.yaml b/cnpg/kustomization.yaml
index d412fe5..5ed0da7 100644
--- a/cnpg/kustomization.yaml
+++ b/cnpg/kustomization.yaml
@@ -2,5 +2,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
-  # ArgoCD Application 리소스는 root kustomization.yaml에서 관리
-  # - argocd/cnpg.yaml
+  # argocd.yaml은 수동으로 관리 (순환 참조 방지)
+  # - argocd.yaml
+  - namespace.yaml
diff --git a/cnpg/namespace.yaml b/cnpg/namespace.yaml
new file mode 100644
index 0000000..fcaa371
--- /dev/null
+++ b/cnpg/namespace.yaml
@@ -0,0 +1,6 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: cnpg-system
+  labels:
+    goldilocks.fairwinds.com/enabled: "true"
diff --git a/velero/argocd/velero-ui.yaml b/velero/argocd-ui.yaml
similarity index 100%
rename from velero/argocd/velero-ui.yaml
rename to velero/argocd-ui.yaml
diff --git a/velero/argocd/velero.yaml b/velero/argocd-velero.yaml
similarity index 100%
rename from velero/argocd/velero.yaml
rename to velero/argocd-velero.yaml
diff --git a/velero/helm-values/velero.yaml b/velero/helm-values.yaml
similarity index 100%
rename from velero/helm-values/velero.yaml
rename to velero/helm-values.yaml
diff --git a/velero/ingress/velero-ui-ingress.yaml b/velero/ingress.yaml
similarity index 100%
rename from velero/ingress/velero-ui-ingress.yaml
rename to velero/ingress.yaml
diff --git a/velero/kustomization.yaml b/velero/kustomization.yaml
index 464fa0c..5255442 100644
--- a/velero/kustomization.yaml
+++ b/velero/kustomization.yaml
@@ -2,10 +2,12 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
-  # ArgoCD Application 리소스는 root kustomization.yaml에서 관리
-  # - argocd/velero.yaml
+  # argocd.yaml files은 수동으로 관리 (순환 참조 방지)
+  # - argocd-velero.yaml
+  # - argocd-ui.yaml
+  - namespace.yaml
 
   # Velero credentials from Vault
   - external-secret.yaml
   - vault/velero-ui-secret.yaml
-  - ingress/velero-ui-ingress.yaml
+  - ingress.yaml
diff --git a/velero/namespace.yaml b/velero/namespace.yaml
new file mode 100644
index 0000000..0aae7dc
--- /dev/null
+++ b/velero/namespace.yaml
@@ -0,0 +1,6 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: velero
+  labels:
+    goldilocks.fairwinds.com/enabled: "true"