From 34a1c9f7834edbe043d6cba8bc1a8b1f597d6d08 Mon Sep 17 00:00:00 2001 From: Mayne0213 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 --- .../{argocd/external-secrets.yaml => argocd.yaml} | 0 .../external-secrets.yaml => helm-values.yaml} | 0 external-secrets/kustomization.yaml | 5 +++-- external-secrets/namespace.yaml | 6 ++++++ falco/{argocd/falco.yaml => argocd.yaml} | 0 falco/{helm-values/falco.yaml => helm-values.yaml} | 0 falco/{ingress/falco-ui-ingress.yaml => ingress.yaml} | 0 falco/kustomization.yaml | 7 ++++--- falco/namespace.yaml | 6 ++++++ vault/{argocd/vault-secrets.yaml => argocd-secrets.yaml} | 0 vault/{argocd/vault.yaml => argocd-vault.yaml} | 0 vault/{helm-values/vault.yaml => helm-values.yaml} | 0 vault/kustomization.yaml | 7 ++++--- vault/namespace.yaml | 6 ++++++ 14 files changed, 29 insertions(+), 8 deletions(-) rename external-secrets/{argocd/external-secrets.yaml => argocd.yaml} (100%) rename external-secrets/{helm-values/external-secrets.yaml => helm-values.yaml} (100%) create mode 100644 external-secrets/namespace.yaml rename falco/{argocd/falco.yaml => argocd.yaml} (100%) rename falco/{helm-values/falco.yaml => helm-values.yaml} (100%) rename falco/{ingress/falco-ui-ingress.yaml => ingress.yaml} (100%) create mode 100644 falco/namespace.yaml rename vault/{argocd/vault-secrets.yaml => argocd-secrets.yaml} (100%) rename vault/{argocd/vault.yaml => argocd-vault.yaml} (100%) rename vault/{helm-values/vault.yaml => helm-values.yaml} (100%) create mode 100644 vault/namespace.yaml diff --git a/external-secrets/argocd/external-secrets.yaml b/external-secrets/argocd.yaml similarity index 100% rename from external-secrets/argocd/external-secrets.yaml rename to external-secrets/argocd.yaml diff --git a/external-secrets/helm-values/external-secrets.yaml b/external-secrets/helm-values.yaml similarity index 100% rename from external-secrets/helm-values/external-secrets.yaml rename to external-secrets/helm-values.yaml diff --git a/external-secrets/kustomization.yaml b/external-secrets/kustomization.yaml index cad8be1..5ed0da7 100644 --- a/external-secrets/kustomization.yaml +++ b/external-secrets/kustomization.yaml @@ -2,5 +2,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - # ArgoCD Application 리소스는 infrastructure/kustomization.yaml에서 관리 - # - argocd/external-secrets.yaml + # argocd.yaml은 수동으로 관리 (순환 참조 방지) + # - argocd.yaml + - namespace.yaml diff --git a/external-secrets/namespace.yaml b/external-secrets/namespace.yaml new file mode 100644 index 0000000..8f68275 --- /dev/null +++ b/external-secrets/namespace.yaml @@ -0,0 +1,6 @@ +apiVersion: v1 +kind: Namespace +metadata: + name: external-secrets + labels: + goldilocks.fairwinds.com/enabled: "true" diff --git a/falco/argocd/falco.yaml b/falco/argocd.yaml similarity index 100% rename from falco/argocd/falco.yaml rename to falco/argocd.yaml diff --git a/falco/helm-values/falco.yaml b/falco/helm-values.yaml similarity index 100% rename from falco/helm-values/falco.yaml rename to falco/helm-values.yaml diff --git a/falco/ingress/falco-ui-ingress.yaml b/falco/ingress.yaml similarity index 100% rename from falco/ingress/falco-ui-ingress.yaml rename to falco/ingress.yaml diff --git a/falco/kustomization.yaml b/falco/kustomization.yaml index 857dc52..67db141 100644 --- a/falco/kustomization.yaml +++ b/falco/kustomization.yaml @@ -2,10 +2,11 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - # ArgoCD Application 리소스는 root kustomization.yaml에서 관리 - # - argocd/falco.yaml + # argocd.yaml은 수동으로 관리 (순환 참조 방지) + # - argocd.yaml + - namespace.yaml # Falco UI credentials from Vault - vault/falco-ui-secret.yaml # Falco UI Ingress - - ingress/falco-ui-ingress.yaml + - ingress.yaml diff --git a/falco/namespace.yaml b/falco/namespace.yaml new file mode 100644 index 0000000..a13bd9f --- /dev/null +++ b/falco/namespace.yaml @@ -0,0 +1,6 @@ +apiVersion: v1 +kind: Namespace +metadata: + name: falco + labels: + goldilocks.fairwinds.com/enabled: "true" diff --git a/vault/argocd/vault-secrets.yaml b/vault/argocd-secrets.yaml similarity index 100% rename from vault/argocd/vault-secrets.yaml rename to vault/argocd-secrets.yaml diff --git a/vault/argocd/vault.yaml b/vault/argocd-vault.yaml similarity index 100% rename from vault/argocd/vault.yaml rename to vault/argocd-vault.yaml diff --git a/vault/helm-values/vault.yaml b/vault/helm-values.yaml similarity index 100% rename from vault/helm-values/vault.yaml rename to vault/helm-values.yaml diff --git a/vault/kustomization.yaml b/vault/kustomization.yaml index cefc105..123f1ca 100644 --- a/vault/kustomization.yaml +++ b/vault/kustomization.yaml @@ -2,9 +2,10 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - # ArgoCD Application 리소스는 infrastructure/kustomization.yaml에서 관리 - # - argocd/vault.yaml - # - argocd/vault-secrets.yaml + # argocd.yaml files은 수동으로 관리 (순환 참조 방지) + # - argocd-vault.yaml + # - argocd-secrets.yaml + - namespace.yaml # External Secrets integration # ServiceAccount is managed by external-secrets Helm chart diff --git a/vault/namespace.yaml b/vault/namespace.yaml new file mode 100644 index 0000000..64ec313 --- /dev/null +++ b/vault/namespace.yaml @@ -0,0 +1,6 @@ +apiVersion: v1 +kind: Namespace +metadata: + name: vault + labels: + goldilocks.fairwinds.com/enabled: "true"