From 1d7970a42fb3097fb247121ba39bc76af367c6fe Mon Sep 17 00:00:00 2001 From: Mayne0213 Date: Mon, 29 Dec 2025 15:57:47 +0900 Subject: [PATCH] REFACTOR(goldilocks): use managedNS for labels - Remove namespace.yaml files - Add managedNamespaceMetadata with Goldilocks label - Set CreateNamespace=true in syncOptions - Update kustomization.yaml to remove namespace.yaml references --- argocd/kustomization.yaml | 6 ++--- cert-manager/argocd.yaml | 44 +++++++++++++++------------------ cert-manager/kustomization.yaml | 4 +-- cert-manager/namespace.yaml | 6 ----- 4 files changed, 23 insertions(+), 37 deletions(-) delete mode 100644 cert-manager/namespace.yaml diff --git a/argocd/kustomization.yaml b/argocd/kustomization.yaml index 50de2bf..8e0c339 100644 --- a/argocd/kustomization.yaml +++ b/argocd/kustomization.yaml @@ -1,7 +1,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization - resources: - - namespace.yaml - - argocd-cmd-params-cm.yaml - - ingress.yaml +- argocd-cmd-params-cm.yaml +- ingress.yaml diff --git a/cert-manager/argocd.yaml b/cert-manager/argocd.yaml index 0d1d1aa..a258446 100644 --- a/cert-manager/argocd.yaml +++ b/cert-manager/argocd.yaml @@ -4,46 +4,42 @@ metadata: name: cert-manager namespace: argocd finalizers: - - resources-finalizer.argocd.argoproj.io + - resources-finalizer.argocd.argoproj.io spec: project: default - sources: - - repoURL: https://charts.jetstack.io - chart: cert-manager - targetRevision: v1.16.2 - helm: - valueFiles: - - $values/cert-manager/helm-values.yaml - - repoURL: https://gitea0213.kro.kr/bluemayne/cluster-infrastructure.git - targetRevision: main - ref: values - - repoURL: https://gitea0213.kro.kr/bluemayne/cluster-infrastructure.git - targetRevision: main - path: cert-manager - + - repoURL: https://charts.jetstack.io + chart: cert-manager + targetRevision: v1.16.2 + helm: + valueFiles: + - $values/cert-manager/helm-values.yaml + - repoURL: https://gitea0213.kro.kr/bluemayne/cluster-infrastructure.git + targetRevision: main + ref: values + - repoURL: https://gitea0213.kro.kr/bluemayne/cluster-infrastructure.git + targetRevision: main + path: cert-manager destination: server: https://kubernetes.default.svc namespace: cert-manager - syncPolicy: automated: prune: true selfHeal: true allowEmpty: false - syncOptions: - - CreateNamespace=true - - PrunePropagationPolicy=foreground - - PruneLast=true - - ServerSideApply=true - + - CreateNamespace=true + - PrunePropagationPolicy=foreground + - PruneLast=true + - ServerSideApply=true retry: limit: 5 backoff: duration: 5s factor: 2 maxDuration: 3m - + managedNamespaceMetadata: + labels: + goldilocks.fairwinds.com/enabled: 'true' revisionHistoryLimit: 10 - diff --git a/cert-manager/kustomization.yaml b/cert-manager/kustomization.yaml index 0223a6b..a9241d8 100644 --- a/cert-manager/kustomization.yaml +++ b/cert-manager/kustomization.yaml @@ -1,6 +1,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization - resources: - - namespace.yaml - - cluster-issuer.yaml +- cluster-issuer.yaml diff --git a/cert-manager/namespace.yaml b/cert-manager/namespace.yaml deleted file mode 100644 index 55bbf01..0000000 --- a/cert-manager/namespace.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: cert-manager - labels: - goldilocks.fairwinds.com/enabled: "true"