From 5ec1a3323d16482c6de631808c655904602ecfac Mon Sep 17 00:00:00 2001 From: Mayne0213 Date: Mon, 29 Dec 2025 15:57:47 +0900 Subject: [PATCH] REFACTOR(goldilocks): use managedNamespaceMetad... - Remove namespace.yaml files - Add managedNamespaceMetadata with Goldilocks label - Set CreateNamespace=true in syncOptions - Update kustomization.yaml to remove namespace.yaml references --- alertmanager/argocd.yaml | 37 +++++++++----------- alertmanager/kustomization.yaml | 4 +-- alertmanager/namespace.yaml | 6 ---- goldilocks/argocd.yaml | 49 ++++++++++++--------------- goldilocks/kustomization.yaml | 4 +-- goldilocks/namespace.yaml | 6 ---- grafana/argocd.yaml | 44 +++++++++++------------- grafana/kustomization.yaml | 6 ++-- grafana/namespace.yaml | 6 ---- kube-state-metrics/argocd.yaml | 37 +++++++++----------- kube-state-metrics/kustomization.yaml | 4 +-- kube-state-metrics/namespace.yaml | 6 ---- loki/argocd.yaml | 23 +++++++------ loki/kustomization.yaml | 4 +-- loki/namespace.yaml | 6 ---- node-exporter/argocd.yaml | 37 +++++++++----------- node-exporter/kustomization.yaml | 4 +-- node-exporter/namespace.yaml | 6 ---- prometheus/argocd.yaml | 44 +++++++++++------------- prometheus/kustomization.yaml | 4 +-- prometheus/namespace.yaml | 6 ---- promtail/argocd.yaml | 23 +++++++------ promtail/kustomization.yaml | 4 +-- promtail/namespace.yaml | 6 ---- vpa/argocd.yaml | 49 ++++++++++++--------------- vpa/kustomization.yaml | 4 +-- vpa/namespace.yaml | 6 ---- 27 files changed, 164 insertions(+), 271 deletions(-) delete mode 100644 alertmanager/namespace.yaml delete mode 100644 goldilocks/namespace.yaml delete mode 100644 grafana/namespace.yaml delete mode 100644 kube-state-metrics/namespace.yaml delete mode 100644 loki/namespace.yaml delete mode 100644 node-exporter/namespace.yaml delete mode 100644 prometheus/namespace.yaml delete mode 100644 promtail/namespace.yaml delete mode 100644 vpa/namespace.yaml diff --git a/alertmanager/argocd.yaml b/alertmanager/argocd.yaml index 6eb1b96..aa6ec20 100644 --- a/alertmanager/argocd.yaml +++ b/alertmanager/argocd.yaml @@ -4,43 +4,38 @@ metadata: name: alertmanager namespace: argocd finalizers: - - resources-finalizer.argocd.argoproj.io + - resources-finalizer.argocd.argoproj.io spec: project: default - sources: - # Helm chart from external repository - - repoURL: https://prometheus-community.github.io/helm-charts - chart: alertmanager - targetRevision: 1.29.0 - helm: - valueFiles: - - $values/alertmanager/helm-values.yaml - # Values file from Git repository - - repoURL: https://gitea0213.kro.kr/bluemayne/monitoring.git - targetRevision: main - ref: values - + - repoURL: https://prometheus-community.github.io/helm-charts + chart: alertmanager + targetRevision: 1.29.0 + helm: + valueFiles: + - $values/alertmanager/helm-values.yaml + - repoURL: https://gitea0213.kro.kr/bluemayne/monitoring.git + targetRevision: main + ref: values destination: server: https://kubernetes.default.svc namespace: alertmanager - syncPolicy: automated: prune: true selfHeal: true allowEmpty: false - syncOptions: - - CreateNamespace=true - - 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/alertmanager/kustomization.yaml b/alertmanager/kustomization.yaml index dca4a51..b83b23e 100644 --- a/alertmanager/kustomization.yaml +++ b/alertmanager/kustomization.yaml @@ -1,5 +1,3 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization - -resources: - - namespace.yaml +resources: [] diff --git a/alertmanager/namespace.yaml b/alertmanager/namespace.yaml deleted file mode 100644 index 66c4c06..0000000 --- a/alertmanager/namespace.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: alertmanager - labels: - goldilocks.fairwinds.com/enabled: "true" diff --git a/goldilocks/argocd.yaml b/goldilocks/argocd.yaml index 6e04302..077ef36 100644 --- a/goldilocks/argocd.yaml +++ b/goldilocks/argocd.yaml @@ -4,51 +4,44 @@ metadata: name: goldilocks namespace: argocd finalizers: - - resources-finalizer.argocd.argoproj.io + - resources-finalizer.argocd.argoproj.io spec: project: default - sources: - # Helm chart from external repository - - repoURL: https://charts.fairwinds.com/stable - chart: goldilocks - targetRevision: 8.0.2 - helm: - valueFiles: - - $values/goldilocks/helm-values.yaml - # Values file from Git repository - - repoURL: https://gitea0213.kro.kr/bluemayne/monitoring.git - targetRevision: main - ref: values - + - repoURL: https://charts.fairwinds.com/stable + chart: goldilocks + targetRevision: 8.0.2 + helm: + valueFiles: + - $values/goldilocks/helm-values.yaml + - repoURL: https://gitea0213.kro.kr/bluemayne/monitoring.git + targetRevision: main + ref: values destination: server: https://kubernetes.default.svc namespace: goldilocks - syncPolicy: automated: prune: true selfHeal: true allowEmpty: false - syncOptions: - - CreateNamespace=true - - PrunePropagationPolicy=foreground - - PruneLast=true - - RespectIgnoreDifferences=true - + - CreateNamespace=true + - PrunePropagationPolicy=foreground + - PruneLast=true + - RespectIgnoreDifferences=true retry: limit: 5 backoff: duration: 5s factor: 2 maxDuration: 3m - - # Ignore Deployment differences for CPU limits (set to null) + managedNamespaceMetadata: + labels: + goldilocks.fairwinds.com/enabled: 'true' ignoreDifferences: - - group: apps - kind: Deployment - jqPathExpressions: - - '.spec.template.spec.containers[].resources.limits.cpu' - + - group: apps + kind: Deployment + jqPathExpressions: + - .spec.template.spec.containers[].resources.limits.cpu revisionHistoryLimit: 10 diff --git a/goldilocks/kustomization.yaml b/goldilocks/kustomization.yaml index deb8fe0..bd43e8a 100644 --- a/goldilocks/kustomization.yaml +++ b/goldilocks/kustomization.yaml @@ -1,6 +1,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization - resources: - - namespace.yaml - - ingress.yaml +- ingress.yaml diff --git a/goldilocks/namespace.yaml b/goldilocks/namespace.yaml deleted file mode 100644 index 11bd273..0000000 --- a/goldilocks/namespace.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: goldilocks - labels: - goldilocks.fairwinds.com/enabled: "true" diff --git a/grafana/argocd.yaml b/grafana/argocd.yaml index aabfdc7..54cb582 100644 --- a/grafana/argocd.yaml +++ b/grafana/argocd.yaml @@ -4,47 +4,41 @@ metadata: name: grafana namespace: argocd finalizers: - - resources-finalizer.argocd.argoproj.io + - resources-finalizer.argocd.argoproj.io spec: project: default - sources: - # Helm chart from external repository - - repoURL: https://grafana.github.io/helm-charts - chart: grafana - targetRevision: 10.3.0 - helm: - valueFiles: - - $values/grafana/helm-values.yaml - # Values file from Git repository - - repoURL: https://gitea0213.kro.kr/bluemayne/monitoring.git - targetRevision: main - ref: values - # Additional resources (ExternalSecret, Ingress, etc.) - - repoURL: https://gitea0213.kro.kr/bluemayne/monitoring.git - targetRevision: main - path: grafana - + - repoURL: https://grafana.github.io/helm-charts + chart: grafana + targetRevision: 10.3.0 + helm: + valueFiles: + - $values/grafana/helm-values.yaml + - repoURL: https://gitea0213.kro.kr/bluemayne/monitoring.git + targetRevision: main + ref: values + - repoURL: https://gitea0213.kro.kr/bluemayne/monitoring.git + targetRevision: main + path: grafana destination: server: https://kubernetes.default.svc namespace: grafana - syncPolicy: automated: prune: true selfHeal: true allowEmpty: false - syncOptions: - - CreateNamespace=true - - 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/grafana/kustomization.yaml b/grafana/kustomization.yaml index ecdfdef..e48870e 100644 --- a/grafana/kustomization.yaml +++ b/grafana/kustomization.yaml @@ -1,7 +1,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization - resources: - - namespace.yaml - - vault/grafana-admin-password.yaml - - ingress.yaml +- vault/grafana-admin-password.yaml +- ingress.yaml diff --git a/grafana/namespace.yaml b/grafana/namespace.yaml deleted file mode 100644 index 1b82622..0000000 --- a/grafana/namespace.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: grafana - labels: - goldilocks.fairwinds.com/enabled: "true" diff --git a/kube-state-metrics/argocd.yaml b/kube-state-metrics/argocd.yaml index 8dbbe1f..0bdf758 100644 --- a/kube-state-metrics/argocd.yaml +++ b/kube-state-metrics/argocd.yaml @@ -4,43 +4,38 @@ metadata: name: kube-state-metrics namespace: argocd finalizers: - - resources-finalizer.argocd.argoproj.io + - resources-finalizer.argocd.argoproj.io spec: project: default - sources: - # Helm chart from external repository - - repoURL: https://prometheus-community.github.io/helm-charts - chart: kube-state-metrics - targetRevision: 5.25.1 - helm: - valueFiles: - - $values/kube-state-metrics/helm-values.yaml - # Values file from Git repository - - repoURL: https://gitea0213.kro.kr/bluemayne/monitoring.git - targetRevision: main - ref: values - + - repoURL: https://prometheus-community.github.io/helm-charts + chart: kube-state-metrics + targetRevision: 5.25.1 + helm: + valueFiles: + - $values/kube-state-metrics/helm-values.yaml + - repoURL: https://gitea0213.kro.kr/bluemayne/monitoring.git + targetRevision: main + ref: values destination: server: https://kubernetes.default.svc namespace: kube-state-metrics - syncPolicy: automated: prune: true selfHeal: true allowEmpty: false - syncOptions: - - CreateNamespace=true - - 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/kube-state-metrics/kustomization.yaml b/kube-state-metrics/kustomization.yaml index dca4a51..b83b23e 100644 --- a/kube-state-metrics/kustomization.yaml +++ b/kube-state-metrics/kustomization.yaml @@ -1,5 +1,3 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization - -resources: - - namespace.yaml +resources: [] diff --git a/kube-state-metrics/namespace.yaml b/kube-state-metrics/namespace.yaml deleted file mode 100644 index 0b90168..0000000 --- a/kube-state-metrics/namespace.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: kube-state-metrics - labels: - goldilocks.fairwinds.com/enabled: "true" diff --git a/loki/argocd.yaml b/loki/argocd.yaml index e9cd56b..a1a9049 100644 --- a/loki/argocd.yaml +++ b/loki/argocd.yaml @@ -6,15 +6,15 @@ metadata: spec: project: default sources: - - repoURL: https://grafana.github.io/helm-charts - chart: loki - targetRevision: 6.24.0 - helm: - valueFiles: - - $values/loki/helm-values.yaml - - repoURL: https://gitea0213.kro.kr/bluemayne/monitoring.git - targetRevision: HEAD - ref: values + - repoURL: https://grafana.github.io/helm-charts + chart: loki + targetRevision: 6.24.0 + helm: + valueFiles: + - $values/loki/helm-values.yaml + - repoURL: https://gitea0213.kro.kr/bluemayne/monitoring.git + targetRevision: HEAD + ref: values destination: server: https://kubernetes.default.svc namespace: loki @@ -23,4 +23,7 @@ spec: prune: true selfHeal: true syncOptions: - - CreateNamespace=true + - CreateNamespace=true + managedNamespaceMetadata: + labels: + goldilocks.fairwinds.com/enabled: 'true' diff --git a/loki/kustomization.yaml b/loki/kustomization.yaml index dca4a51..b83b23e 100644 --- a/loki/kustomization.yaml +++ b/loki/kustomization.yaml @@ -1,5 +1,3 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization - -resources: - - namespace.yaml +resources: [] diff --git a/loki/namespace.yaml b/loki/namespace.yaml deleted file mode 100644 index b5ed98c..0000000 --- a/loki/namespace.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: loki - labels: - goldilocks.fairwinds.com/enabled: "true" diff --git a/node-exporter/argocd.yaml b/node-exporter/argocd.yaml index 4df8259..6928940 100644 --- a/node-exporter/argocd.yaml +++ b/node-exporter/argocd.yaml @@ -4,43 +4,38 @@ metadata: name: node-exporter namespace: argocd finalizers: - - resources-finalizer.argocd.argoproj.io + - resources-finalizer.argocd.argoproj.io spec: project: default - sources: - # Helm chart from external repository - - repoURL: https://prometheus-community.github.io/helm-charts - chart: prometheus-node-exporter - targetRevision: 4.39.0 - helm: - valueFiles: - - $values/node-exporter/helm-values.yaml - # Values file from Git repository - - repoURL: https://gitea0213.kro.kr/bluemayne/monitoring.git - targetRevision: main - ref: values - + - repoURL: https://prometheus-community.github.io/helm-charts + chart: prometheus-node-exporter + targetRevision: 4.39.0 + helm: + valueFiles: + - $values/node-exporter/helm-values.yaml + - repoURL: https://gitea0213.kro.kr/bluemayne/monitoring.git + targetRevision: main + ref: values destination: server: https://kubernetes.default.svc namespace: node-exporter - syncPolicy: automated: prune: true selfHeal: true allowEmpty: false - syncOptions: - - CreateNamespace=true - - 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/node-exporter/kustomization.yaml b/node-exporter/kustomization.yaml index dca4a51..b83b23e 100644 --- a/node-exporter/kustomization.yaml +++ b/node-exporter/kustomization.yaml @@ -1,5 +1,3 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization - -resources: - - namespace.yaml +resources: [] diff --git a/node-exporter/namespace.yaml b/node-exporter/namespace.yaml deleted file mode 100644 index 5e11857..0000000 --- a/node-exporter/namespace.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: node-exporter - labels: - goldilocks.fairwinds.com/enabled: "true" diff --git a/prometheus/argocd.yaml b/prometheus/argocd.yaml index 82583bd..922b202 100644 --- a/prometheus/argocd.yaml +++ b/prometheus/argocd.yaml @@ -4,47 +4,41 @@ metadata: name: prometheus namespace: argocd finalizers: - - resources-finalizer.argocd.argoproj.io + - resources-finalizer.argocd.argoproj.io spec: project: default - sources: - # Helm chart from external repository - - repoURL: https://prometheus-community.github.io/helm-charts - chart: kube-prometheus-stack - targetRevision: 80.0.0 - helm: - valueFiles: - - $values/prometheus/helm-values.yaml - # Values file from Git repository - - repoURL: https://gitea0213.kro.kr/bluemayne/monitoring.git - targetRevision: main - ref: values - # Additional resources (ExternalSecret, etc.) - - repoURL: https://gitea0213.kro.kr/bluemayne/monitoring.git - targetRevision: main - path: prometheus - + - repoURL: https://prometheus-community.github.io/helm-charts + chart: kube-prometheus-stack + targetRevision: 80.0.0 + helm: + valueFiles: + - $values/prometheus/helm-values.yaml + - repoURL: https://gitea0213.kro.kr/bluemayne/monitoring.git + targetRevision: main + ref: values + - repoURL: https://gitea0213.kro.kr/bluemayne/monitoring.git + targetRevision: main + path: prometheus destination: server: https://kubernetes.default.svc namespace: prometheus - syncPolicy: automated: prune: true selfHeal: true allowEmpty: false - syncOptions: - - CreateNamespace=true - - 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/prometheus/kustomization.yaml b/prometheus/kustomization.yaml index b95fdeb..41e2f4e 100644 --- a/prometheus/kustomization.yaml +++ b/prometheus/kustomization.yaml @@ -1,6 +1,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization - resources: - - namespace.yaml - - vault/postgresql-password.yaml +- vault/postgresql-password.yaml diff --git a/prometheus/namespace.yaml b/prometheus/namespace.yaml deleted file mode 100644 index c82bc9c..0000000 --- a/prometheus/namespace.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: prometheus - labels: - goldilocks.fairwinds.com/enabled: "true" diff --git a/promtail/argocd.yaml b/promtail/argocd.yaml index 597c482..da8c045 100644 --- a/promtail/argocd.yaml +++ b/promtail/argocd.yaml @@ -6,15 +6,15 @@ metadata: spec: project: default sources: - - repoURL: https://grafana.github.io/helm-charts - chart: promtail - targetRevision: 6.16.6 - helm: - valueFiles: - - $values/promtail/helm-values.yaml - - repoURL: https://gitea0213.kro.kr/bluemayne/monitoring.git - targetRevision: HEAD - ref: values + - repoURL: https://grafana.github.io/helm-charts + chart: promtail + targetRevision: 6.16.6 + helm: + valueFiles: + - $values/promtail/helm-values.yaml + - repoURL: https://gitea0213.kro.kr/bluemayne/monitoring.git + targetRevision: HEAD + ref: values destination: server: https://kubernetes.default.svc namespace: promtail @@ -23,4 +23,7 @@ spec: prune: true selfHeal: true syncOptions: - - CreateNamespace=true + - CreateNamespace=true + managedNamespaceMetadata: + labels: + goldilocks.fairwinds.com/enabled: 'true' diff --git a/promtail/kustomization.yaml b/promtail/kustomization.yaml index dca4a51..b83b23e 100644 --- a/promtail/kustomization.yaml +++ b/promtail/kustomization.yaml @@ -1,5 +1,3 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization - -resources: - - namespace.yaml +resources: [] diff --git a/promtail/namespace.yaml b/promtail/namespace.yaml deleted file mode 100644 index a45542d..0000000 --- a/promtail/namespace.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: promtail - labels: - goldilocks.fairwinds.com/enabled: "true" diff --git a/vpa/argocd.yaml b/vpa/argocd.yaml index faedd74..560b515 100644 --- a/vpa/argocd.yaml +++ b/vpa/argocd.yaml @@ -4,51 +4,44 @@ metadata: name: vpa namespace: argocd finalizers: - - resources-finalizer.argocd.argoproj.io + - resources-finalizer.argocd.argoproj.io spec: project: default - sources: - # Helm chart from external repository - - repoURL: https://charts.fairwinds.com/stable - chart: vpa - targetRevision: 4.6.0 - helm: - valueFiles: - - $values/vpa/helm-values.yaml - # Values file from Git repository - - repoURL: https://gitea0213.kro.kr/bluemayne/cluster-infrastructure.git - targetRevision: main - ref: values - + - repoURL: https://charts.fairwinds.com/stable + chart: vpa + targetRevision: 4.6.0 + helm: + valueFiles: + - $values/vpa/helm-values.yaml + - repoURL: https://gitea0213.kro.kr/bluemayne/cluster-infrastructure.git + targetRevision: main + ref: values destination: server: https://kubernetes.default.svc namespace: vpa - syncPolicy: automated: prune: true selfHeal: true allowEmpty: false - syncOptions: - - CreateNamespace=true - - PrunePropagationPolicy=foreground - - PruneLast=true - - RespectIgnoreDifferences=true - + - CreateNamespace=true + - PrunePropagationPolicy=foreground + - PruneLast=true + - RespectIgnoreDifferences=true retry: limit: 5 backoff: duration: 5s factor: 2 maxDuration: 3m - - # Ignore Deployment differences for CPU limits (set to null) + managedNamespaceMetadata: + labels: + goldilocks.fairwinds.com/enabled: 'true' ignoreDifferences: - - group: apps - kind: Deployment - jqPathExpressions: - - '.spec.template.spec.containers[].resources.limits.cpu' - + - group: apps + kind: Deployment + jqPathExpressions: + - .spec.template.spec.containers[].resources.limits.cpu revisionHistoryLimit: 10 diff --git a/vpa/kustomization.yaml b/vpa/kustomization.yaml index dca4a51..b83b23e 100644 --- a/vpa/kustomization.yaml +++ b/vpa/kustomization.yaml @@ -1,5 +1,3 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization - -resources: - - namespace.yaml +resources: [] diff --git a/vpa/namespace.yaml b/vpa/namespace.yaml deleted file mode 100644 index 483f553..0000000 --- a/vpa/namespace.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: vpa - labels: - goldilocks.fairwinds.com/enabled: "true"