From 19adcadfdf33dc9d27d29af1ccef8dc6c9c55aa4 Mon Sep 17 00:00:00 2001 From: Mayne0213 Date: Mon, 29 Dec 2025 15:57:46 +0900 Subject: [PATCH] REFACTOR(goldilocks): use managedNsMeta for Goldil - Remove namespace.yaml files - Add managedNamespaceMetadata with Goldilocks label - Set CreateNamespace=true in syncOptions - Update kustomization.yaml to remove namespace.yaml references --- code-server/argocd.yaml | 35 ++++++++++++------------ code-server/kustomization.yaml | 11 +++----- code-server/namespace.yaml | 6 ----- docusaurus/argocd.yaml | 47 +++++++++++++++----------------- docusaurus/kustomization.yaml | 10 +++---- docusaurus/namespace.yaml | 6 ----- gitea/argocd.yaml | 43 +++++++++++++---------------- gitea/kustomization.yaml | 17 +++++------- gitea/namespace.yaml | 6 ----- homer/argocd.yaml | 17 ++++++------ homer/kustomization.yaml | 17 +++++------- homer/namespace.yaml | 6 ----- umami/argocd.yaml | 49 ++++++++++++++++------------------ umami/kustomization.yaml | 6 ++--- umami/namespace.yaml | 6 ----- 15 files changed, 111 insertions(+), 171 deletions(-) delete mode 100644 code-server/namespace.yaml delete mode 100644 docusaurus/namespace.yaml delete mode 100644 gitea/namespace.yaml delete mode 100644 homer/namespace.yaml delete mode 100644 umami/namespace.yaml diff --git a/code-server/argocd.yaml b/code-server/argocd.yaml index cbfb674..f84dc83 100644 --- a/code-server/argocd.yaml +++ b/code-server/argocd.yaml @@ -4,36 +4,37 @@ metadata: name: code-server namespace: argocd finalizers: - - resources-finalizer.argocd.argoproj.io + - resources-finalizer.argocd.argoproj.io spec: project: default - sources: - - repoURL: https://github.com/coder/code-server.git - targetRevision: main - path: ci/helm-chart - helm: - valueFiles: - - $values/code-server/helm-values.yaml - - repoURL: https://gitea0213.kro.kr/bluemayne/applications.git - targetRevision: main - ref: values - - repoURL: https://gitea0213.kro.kr/bluemayne/applications.git - targetRevision: main - path: code-server - + - repoURL: https://github.com/coder/code-server.git + targetRevision: main + path: ci/helm-chart + helm: + valueFiles: + - $values/code-server/helm-values.yaml + - repoURL: https://gitea0213.kro.kr/bluemayne/applications.git + targetRevision: main + ref: values + - repoURL: https://gitea0213.kro.kr/bluemayne/applications.git + targetRevision: main + path: code-server destination: server: https://kubernetes.default.svc namespace: code-server - syncPolicy: automated: prune: true selfHeal: true - retry: limit: 5 backoff: duration: 5s factor: 2 maxDuration: 3m + managedNamespaceMetadata: + labels: + goldilocks.fairwinds.com/enabled: 'true' + syncOptions: + - CreateNamespace=true diff --git a/code-server/kustomization.yaml b/code-server/kustomization.yaml index ddb951e..008a2cc 100644 --- a/code-server/kustomization.yaml +++ b/code-server/kustomization.yaml @@ -1,12 +1,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization - namespace: code-server - resources: - - - namespace.yaml - - - vault/code-server-password.yaml - - rbac.yaml - - ingress.yaml +- vault/code-server-password.yaml +- rbac.yaml +- ingress.yaml diff --git a/code-server/namespace.yaml b/code-server/namespace.yaml deleted file mode 100644 index d08ed23..0000000 --- a/code-server/namespace.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: code-server - labels: - goldilocks.fairwinds.com/enabled: "true" diff --git a/docusaurus/argocd.yaml b/docusaurus/argocd.yaml index 3099fef..fa4780b 100644 --- a/docusaurus/argocd.yaml +++ b/docusaurus/argocd.yaml @@ -4,49 +4,44 @@ metadata: name: docusaurus namespace: argocd finalizers: - - resources-finalizer.argocd.argoproj.io + - resources-finalizer.argocd.argoproj.io spec: project: default - sources: - - repoURL: https://gitea0213.kro.kr/bluemayne/applications.git - targetRevision: main - path: docusaurus - + - repoURL: https://gitea0213.kro.kr/bluemayne/applications.git + targetRevision: main + path: docusaurus destination: server: https://kubernetes.default.svc namespace: docusaurus - syncPolicy: automated: prune: true selfHeal: true allowEmpty: false - syncOptions: - - PrunePropagationPolicy=foreground - - PruneLast=true - + - CreateNamespace=true + - PrunePropagationPolicy=foreground + - PruneLast=true retry: limit: 5 backoff: duration: 5s factor: 2 maxDuration: 3m - + managedNamespaceMetadata: + labels: + goldilocks.fairwinds.com/enabled: 'true' revisionHistoryLimit: 10 - - # Ignore differences in checksum annotations and manual restart annotations ignoreDifferences: - - group: apps - kind: Deployment - jqPathExpressions: - - .spec.template.metadata.annotations - - .metadata.annotations - - - group: "" - kind: Service - name: docusaurus - namespace: docusaurus - jsonPointers: - - /spec/clusterIP + - group: apps + kind: Deployment + jqPathExpressions: + - .spec.template.metadata.annotations + - .metadata.annotations + - group: '' + kind: Service + name: docusaurus + namespace: docusaurus + jsonPointers: + - /spec/clusterIP diff --git a/docusaurus/kustomization.yaml b/docusaurus/kustomization.yaml index d7cc8b7..c33ea97 100644 --- a/docusaurus/kustomization.yaml +++ b/docusaurus/kustomization.yaml @@ -1,11 +1,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization - resources: - - - namespace.yaml - - deployment.yaml - - service.yaml - - ingress.yaml - +- deployment.yaml +- service.yaml +- ingress.yaml namespace: docusaurus diff --git a/docusaurus/namespace.yaml b/docusaurus/namespace.yaml deleted file mode 100644 index 2cb5a67..0000000 --- a/docusaurus/namespace.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: docusaurus - labels: - goldilocks.fairwinds.com/enabled: "true" diff --git a/gitea/argocd.yaml b/gitea/argocd.yaml index 57b1304..015983b 100644 --- a/gitea/argocd.yaml +++ b/gitea/argocd.yaml @@ -4,46 +4,41 @@ metadata: name: gitea namespace: argocd finalizers: - - resources-finalizer.argocd.argoproj.io + - resources-finalizer.argocd.argoproj.io spec: project: default - sources: - # Helm chart from Gitea repository - - repoURL: https://dl.gitea.com/charts/ - chart: gitea - targetRevision: 12.4.0 - helm: - valueFiles: - - $values/gitea/helm-values.yaml - # Values file from applications repository - - repoURL: https://gitea0213.kro.kr/bluemayne/applications.git - targetRevision: main - ref: values - # Vault secrets from applications repository - - repoURL: https://gitea0213.kro.kr/bluemayne/applications.git - targetRevision: main - path: gitea - + - repoURL: https://dl.gitea.com/charts/ + chart: gitea + targetRevision: 12.4.0 + helm: + valueFiles: + - $values/gitea/helm-values.yaml + - repoURL: https://gitea0213.kro.kr/bluemayne/applications.git + targetRevision: main + ref: values + - repoURL: https://gitea0213.kro.kr/bluemayne/applications.git + targetRevision: main + path: gitea destination: server: https://kubernetes.default.svc namespace: gitea - syncPolicy: automated: prune: true selfHeal: true allowEmpty: false - syncOptions: - - PrunePropagationPolicy=foreground - - PruneLast=true - + - CreateNamespace=true + - PrunePropagationPolicy=foreground + - PruneLast=true retry: limit: 5 backoff: duration: 5s factor: 2 maxDuration: 3m - + managedNamespaceMetadata: + labels: + goldilocks.fairwinds.com/enabled: 'true' revisionHistoryLimit: 10 diff --git a/gitea/kustomization.yaml b/gitea/kustomization.yaml index 9762e0d..3ad80f7 100644 --- a/gitea/kustomization.yaml +++ b/gitea/kustomization.yaml @@ -1,15 +1,10 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization - resources: - - namespace.yaml - - - deployment.yaml - - - vault/gitea-admin-secret.yaml - - vault/gitea-postgres-password.yaml - - vault/gitea-runner-token.yaml - - vault/gitea-minio-credentials.yaml - - vault/minio-root-password.yaml - +- deployment.yaml +- vault/gitea-admin-secret.yaml +- vault/gitea-postgres-password.yaml +- vault/gitea-runner-token.yaml +- vault/gitea-minio-credentials.yaml +- vault/minio-root-password.yaml namespace: gitea diff --git a/gitea/namespace.yaml b/gitea/namespace.yaml deleted file mode 100644 index 302db53..0000000 --- a/gitea/namespace.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: gitea - labels: - goldilocks.fairwinds.com/enabled: "true" diff --git a/homer/argocd.yaml b/homer/argocd.yaml index 98e21fd..0d17867 100644 --- a/homer/argocd.yaml +++ b/homer/argocd.yaml @@ -4,27 +4,28 @@ metadata: name: homer namespace: argocd finalizers: - - resources-finalizer.argocd.argoproj.io + - resources-finalizer.argocd.argoproj.io spec: project: default - sources: - - repoURL: https://gitea0213.kro.kr/bluemayne/applications.git - targetRevision: main - path: homer - + - repoURL: https://gitea0213.kro.kr/bluemayne/applications.git + targetRevision: main + path: homer destination: server: https://kubernetes.default.svc namespace: homer - syncPolicy: automated: prune: true selfHeal: true - retry: limit: 5 backoff: duration: 5s factor: 2 maxDuration: 3m + managedNamespaceMetadata: + labels: + goldilocks.fairwinds.com/enabled: 'true' + syncOptions: + - CreateNamespace=true diff --git a/homer/kustomization.yaml b/homer/kustomization.yaml index 0fda00b..1f78d09 100644 --- a/homer/kustomization.yaml +++ b/homer/kustomization.yaml @@ -1,14 +1,11 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization - resources: - - namespace.yaml - - deployment.yaml - - service.yaml - - ingress.yaml - +- deployment.yaml +- service.yaml +- ingress.yaml configMapGenerator: - - name: homer-config - namespace: homer - files: - - config.yml +- name: homer-config + namespace: homer + files: + - config.yml diff --git a/homer/namespace.yaml b/homer/namespace.yaml deleted file mode 100644 index ae7e02c..0000000 --- a/homer/namespace.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: homer - labels: - goldilocks.fairwinds.com/enabled: "true" diff --git a/umami/argocd.yaml b/umami/argocd.yaml index 2ebcf06..06754af 100644 --- a/umami/argocd.yaml +++ b/umami/argocd.yaml @@ -4,46 +4,43 @@ metadata: name: umami namespace: argocd finalizers: - - resources-finalizer.argocd.argoproj.io + - resources-finalizer.argocd.argoproj.io spec: project: default - sources: - - repoURL: https://charts.christianhuth.de - chart: umami - targetRevision: 6.0.1 - helm: - valueFiles: - - $values/umami/helm-values.yaml - - repoURL: https://gitea0213.kro.kr/bluemayne/applications.git - targetRevision: main - ref: values - - repoURL: https://gitea0213.kro.kr/bluemayne/applications.git - targetRevision: main - path: umami - + - repoURL: https://charts.christianhuth.de + chart: umami + targetRevision: 6.0.1 + helm: + valueFiles: + - $values/umami/helm-values.yaml + - repoURL: https://gitea0213.kro.kr/bluemayne/applications.git + targetRevision: main + ref: values + - repoURL: https://gitea0213.kro.kr/bluemayne/applications.git + targetRevision: main + path: umami destination: server: https://kubernetes.default.svc namespace: umami - ignoreDifferences: - # Ignore app-secret data changes in umami-app-secret - # Helm chart generates random app-secret value on each sync, - # causing ArgoCD to detect it as OutOfSync - - group: "" - kind: Secret - name: umami-app-secret - jsonPointers: - - /data - + - group: '' + kind: Secret + name: umami-app-secret + jsonPointers: + - /data syncPolicy: automated: prune: true selfHeal: true - retry: limit: 5 backoff: duration: 5s factor: 2 maxDuration: 3m + managedNamespaceMetadata: + labels: + goldilocks.fairwinds.com/enabled: 'true' + syncOptions: + - CreateNamespace=true diff --git a/umami/kustomization.yaml b/umami/kustomization.yaml index 25efff4..ae0e9e5 100644 --- a/umami/kustomization.yaml +++ b/umami/kustomization.yaml @@ -1,7 +1,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization - resources: - - namespace.yaml - - vault/umami-password.yaml - - ingress.yaml +- vault/umami-password.yaml +- ingress.yaml diff --git a/umami/namespace.yaml b/umami/namespace.yaml deleted file mode 100644 index 0150427..0000000 --- a/umami/namespace.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: umami - labels: - goldilocks.fairwinds.com/enabled: "true"