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
This commit is contained in:
2025-12-29 15:57:46 +09:00
parent 0996187c82
commit 19adcadfdf
15 changed files with 111 additions and 171 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -1,6 +0,0 @@
apiVersion: v1
kind: Namespace
metadata:
name: code-server
labels:
goldilocks.fairwinds.com/enabled: "true"

View File

@@ -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

View File

@@ -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

View File

@@ -1,6 +0,0 @@
apiVersion: v1
kind: Namespace
metadata:
name: docusaurus
labels:
goldilocks.fairwinds.com/enabled: "true"

View File

@@ -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

View File

@@ -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

View File

@@ -1,6 +0,0 @@
apiVersion: v1
kind: Namespace
metadata:
name: gitea
labels:
goldilocks.fairwinds.com/enabled: "true"

View File

@@ -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

View File

@@ -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

View File

@@ -1,6 +0,0 @@
apiVersion: v1
kind: Namespace
metadata:
name: homer
labels:
goldilocks.fairwinds.com/enabled: "true"

View File

@@ -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

View File

@@ -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

View File

@@ -1,6 +0,0 @@
apiVersion: v1
kind: Namespace
metadata:
name: umami
labels:
goldilocks.fairwinds.com/enabled: "true"