From d922eadb489ca7a5b22257d5a649ecd6a6a5896c 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
---
 vpa/{argocd/vpa.yaml => argocd.yaml}           | 0
 vpa/{helm-values/vpa.yaml => helm-values.yaml} | 0
 vpa/kustomization.yaml                         | 5 +++--
 vpa/namespace.yaml                             | 6 ++++++
 4 files changed, 9 insertions(+), 2 deletions(-)
 rename vpa/{argocd/vpa.yaml => argocd.yaml} (100%)
 rename vpa/{helm-values/vpa.yaml => helm-values.yaml} (100%)
 create mode 100644 vpa/namespace.yaml

diff --git a/vpa/argocd/vpa.yaml b/vpa/argocd.yaml
similarity index 100%
rename from vpa/argocd/vpa.yaml
rename to vpa/argocd.yaml
diff --git a/vpa/helm-values/vpa.yaml b/vpa/helm-values.yaml
similarity index 100%
rename from vpa/helm-values/vpa.yaml
rename to vpa/helm-values.yaml
diff --git a/vpa/kustomization.yaml b/vpa/kustomization.yaml
index 5a7a8b7..5ed0da7 100644
--- a/vpa/kustomization.yaml
+++ b/vpa/kustomization.yaml
@@ -2,5 +2,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
-  # ArgoCD Application 리소스는 infrastructure/kustomization.yaml에서 관리
-  # - argocd/vpa.yaml
+  # argocd.yaml은 수동으로 관리 (순환 참조 방지)
+  # - argocd.yaml
+  - namespace.yaml
diff --git a/vpa/namespace.yaml b/vpa/namespace.yaml
new file mode 100644
index 0000000..483f553
--- /dev/null
+++ b/vpa/namespace.yaml
@@ -0,0 +1,6 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: vpa
+  labels:
+    goldilocks.fairwinds.com/enabled: "true"