From 5c4676ca9ae45f8b1cfd0451748dcb74a285ee56 Mon Sep 17 00:00:00 2001 From: Mayne0213 Date: Mon, 29 Dec 2025 00:49:04 +0900 Subject: [PATCH] REFACTOR(repo): restructure monitoring folder - and add namespace resou... - Remove argocd/, helm-values/, ingress/ subdirectories - Move files to parent directory (argocd.yaml, helm-values.yaml, ingress.yaml) - Update helm valueFiles paths in ArgoCD Applications - Add namespace.yaml to all applications with Goldilocks labels - Update destination namespaces to match folder names - Update kustomization.yaml files to reference new structure --- alertmanager/{argocd/alertmanager.yaml => argocd.yaml} | 4 ++-- .../{helm-values/alertmanager.yaml => helm-values.yaml} | 0 alertmanager/kustomization.yaml | 6 ++++-- alertmanager/namespace.yaml | 6 ++++++ goldilocks/{argocd/goldilocks.yaml => argocd.yaml} | 2 +- .../{helm-values/goldilocks.yaml => helm-values.yaml} | 0 .../goldilocks-dashboard-ingress.yaml => ingress.yaml} | 0 goldilocks/kustomization.yaml | 6 +++--- goldilocks/namespace.yaml | 6 ++++++ grafana/{argocd/grafana.yaml => argocd.yaml} | 4 ++-- grafana/{helm-values/grafana.yaml => helm-values.yaml} | 0 grafana/kustomization.yaml | 6 ++++-- grafana/namespace.yaml | 6 ++++++ .../{argocd/kube-state-metrics.yaml => argocd.yaml} | 4 ++-- .../kube-state-metrics.yaml => helm-values.yaml} | 0 kube-state-metrics/kustomization.yaml | 6 ++++-- kube-state-metrics/namespace.yaml | 6 ++++++ loki/{argocd/loki.yaml => argocd.yaml} | 4 ++-- loki/{helm-values/loki.yaml => helm-values.yaml} | 0 loki/kustomization.yaml | 6 ++++-- loki/namespace.yaml | 6 ++++++ node-exporter/{argocd/node-exporter.yaml => argocd.yaml} | 4 ++-- .../{helm-values/node-exporter.yaml => helm-values.yaml} | 0 node-exporter/kustomization.yaml | 6 ++++-- node-exporter/namespace.yaml | 6 ++++++ prometheus/{argocd/prometheus.yaml => argocd.yaml} | 4 ++-- .../kube-prometheus-stack.yaml => helm-values.yaml} | 0 prometheus/kustomization.yaml | 6 ++++-- prometheus/namespace.yaml | 6 ++++++ promtail/{argocd/promtail.yaml => argocd.yaml} | 4 ++-- promtail/{helm-values/promtail.yaml => helm-values.yaml} | 0 promtail/kustomization.yaml | 6 ++++-- promtail/namespace.yaml | 6 ++++++ 33 files changed, 94 insertions(+), 32 deletions(-) rename alertmanager/{argocd/alertmanager.yaml => argocd.yaml} (91%) rename alertmanager/{helm-values/alertmanager.yaml => helm-values.yaml} (100%) create mode 100644 alertmanager/namespace.yaml rename goldilocks/{argocd/goldilocks.yaml => argocd.yaml} (95%) rename goldilocks/{helm-values/goldilocks.yaml => helm-values.yaml} (100%) rename goldilocks/{ingress/goldilocks-dashboard-ingress.yaml => ingress.yaml} (100%) create mode 100644 goldilocks/namespace.yaml rename grafana/{argocd/grafana.yaml => argocd.yaml} (93%) rename grafana/{helm-values/grafana.yaml => helm-values.yaml} (100%) create mode 100644 grafana/namespace.yaml rename kube-state-metrics/{argocd/kube-state-metrics.yaml => argocd.yaml} (90%) rename kube-state-metrics/{helm-values/kube-state-metrics.yaml => helm-values.yaml} (100%) create mode 100644 kube-state-metrics/namespace.yaml rename loki/{argocd/loki.yaml => argocd.yaml} (88%) rename loki/{helm-values/loki.yaml => helm-values.yaml} (100%) create mode 100644 loki/namespace.yaml rename node-exporter/{argocd/node-exporter.yaml => argocd.yaml} (91%) rename node-exporter/{helm-values/node-exporter.yaml => helm-values.yaml} (100%) create mode 100644 node-exporter/namespace.yaml rename prometheus/{argocd/prometheus.yaml => argocd.yaml} (91%) rename prometheus/{helm-values/kube-prometheus-stack.yaml => helm-values.yaml} (100%) create mode 100644 prometheus/namespace.yaml rename promtail/{argocd/promtail.yaml => argocd.yaml} (87%) rename promtail/{helm-values/promtail.yaml => helm-values.yaml} (100%) create mode 100644 promtail/namespace.yaml diff --git a/alertmanager/argocd/alertmanager.yaml b/alertmanager/argocd.yaml similarity index 91% rename from alertmanager/argocd/alertmanager.yaml rename to alertmanager/argocd.yaml index 85da27a..6eb1b96 100644 --- a/alertmanager/argocd/alertmanager.yaml +++ b/alertmanager/argocd.yaml @@ -15,7 +15,7 @@ spec: targetRevision: 1.29.0 helm: valueFiles: - - $values/alertmanager/helm-values/alertmanager.yaml + - $values/alertmanager/helm-values.yaml # Values file from Git repository - repoURL: https://gitea0213.kro.kr/bluemayne/monitoring.git targetRevision: main @@ -23,7 +23,7 @@ spec: destination: server: https://kubernetes.default.svc - namespace: monitoring + namespace: alertmanager syncPolicy: automated: diff --git a/alertmanager/helm-values/alertmanager.yaml b/alertmanager/helm-values.yaml similarity index 100% rename from alertmanager/helm-values/alertmanager.yaml rename to alertmanager/helm-values.yaml diff --git a/alertmanager/kustomization.yaml b/alertmanager/kustomization.yaml index 2dfb0c4..4ee9d9a 100644 --- a/alertmanager/kustomization.yaml +++ b/alertmanager/kustomization.yaml @@ -2,5 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - # ArgoCD Application 리소스는 infrastructure/kustomization.yaml에서 관리 - # - argocd/alertmanager.yaml + # ArgoCD Application 리소스는 monitoring/kustomization.yaml에서 관리 + # - argocd.yaml + + - namespace.yaml diff --git a/alertmanager/namespace.yaml b/alertmanager/namespace.yaml new file mode 100644 index 0000000..66c4c06 --- /dev/null +++ b/alertmanager/namespace.yaml @@ -0,0 +1,6 @@ +apiVersion: v1 +kind: Namespace +metadata: + name: alertmanager + labels: + goldilocks.fairwinds.com/enabled: "true" diff --git a/goldilocks/argocd/goldilocks.yaml b/goldilocks/argocd.yaml similarity index 95% rename from goldilocks/argocd/goldilocks.yaml rename to goldilocks/argocd.yaml index 323fb43..6e04302 100644 --- a/goldilocks/argocd/goldilocks.yaml +++ b/goldilocks/argocd.yaml @@ -15,7 +15,7 @@ spec: targetRevision: 8.0.2 helm: valueFiles: - - $values/goldilocks/helm-values/goldilocks.yaml + - $values/goldilocks/helm-values.yaml # Values file from Git repository - repoURL: https://gitea0213.kro.kr/bluemayne/monitoring.git targetRevision: main diff --git a/goldilocks/helm-values/goldilocks.yaml b/goldilocks/helm-values.yaml similarity index 100% rename from goldilocks/helm-values/goldilocks.yaml rename to goldilocks/helm-values.yaml diff --git a/goldilocks/ingress/goldilocks-dashboard-ingress.yaml b/goldilocks/ingress.yaml similarity index 100% rename from goldilocks/ingress/goldilocks-dashboard-ingress.yaml rename to goldilocks/ingress.yaml diff --git a/goldilocks/kustomization.yaml b/goldilocks/kustomization.yaml index 483c029..1861cd9 100644 --- a/goldilocks/kustomization.yaml +++ b/goldilocks/kustomization.yaml @@ -3,7 +3,7 @@ kind: Kustomization resources: # ArgoCD Application 리소스는 monitoring/kustomization.yaml에서 관리 - # - argocd/goldilocks.yaml + # - argocd.yaml - # Goldilocks Dashboard Ingress - - ingress/goldilocks-dashboard-ingress.yaml + - namespace.yaml + - ingress.yaml diff --git a/goldilocks/namespace.yaml b/goldilocks/namespace.yaml new file mode 100644 index 0000000..11bd273 --- /dev/null +++ b/goldilocks/namespace.yaml @@ -0,0 +1,6 @@ +apiVersion: v1 +kind: Namespace +metadata: + name: goldilocks + labels: + goldilocks.fairwinds.com/enabled: "true" diff --git a/grafana/argocd/grafana.yaml b/grafana/argocd.yaml similarity index 93% rename from grafana/argocd/grafana.yaml rename to grafana/argocd.yaml index 5e83c41..16e6f25 100644 --- a/grafana/argocd/grafana.yaml +++ b/grafana/argocd.yaml @@ -15,7 +15,7 @@ spec: targetRevision: 10.3.0 helm: valueFiles: - - $values/grafana/helm-values/grafana.yaml + - $values/grafana/helm-values.yaml # Values file from Git repository - repoURL: https://gitea0213.kro.kr/bluemayne/monitoring.git targetRevision: main @@ -27,7 +27,7 @@ spec: destination: server: https://kubernetes.default.svc - namespace: monitoring + namespace: grafana syncPolicy: automated: diff --git a/grafana/helm-values/grafana.yaml b/grafana/helm-values.yaml similarity index 100% rename from grafana/helm-values/grafana.yaml rename to grafana/helm-values.yaml diff --git a/grafana/kustomization.yaml b/grafana/kustomization.yaml index 9314a86..b417ff1 100644 --- a/grafana/kustomization.yaml +++ b/grafana/kustomization.yaml @@ -2,7 +2,9 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - # ArgoCD Application 리소스는 infrastructure/kustomization.yaml에서 관리 - # - argocd/grafana.yaml + # ArgoCD Application 리소스는 monitoring/kustomization.yaml에서 관리 + # - argocd.yaml + + - namespace.yaml - vault/grafana-admin-password.yaml - ingress.yaml diff --git a/grafana/namespace.yaml b/grafana/namespace.yaml new file mode 100644 index 0000000..1b82622 --- /dev/null +++ b/grafana/namespace.yaml @@ -0,0 +1,6 @@ +apiVersion: v1 +kind: Namespace +metadata: + name: grafana + labels: + goldilocks.fairwinds.com/enabled: "true" diff --git a/kube-state-metrics/argocd/kube-state-metrics.yaml b/kube-state-metrics/argocd.yaml similarity index 90% rename from kube-state-metrics/argocd/kube-state-metrics.yaml rename to kube-state-metrics/argocd.yaml index cc77cbd..8dbbe1f 100644 --- a/kube-state-metrics/argocd/kube-state-metrics.yaml +++ b/kube-state-metrics/argocd.yaml @@ -15,7 +15,7 @@ spec: targetRevision: 5.25.1 helm: valueFiles: - - $values/kube-state-metrics/helm-values/kube-state-metrics.yaml + - $values/kube-state-metrics/helm-values.yaml # Values file from Git repository - repoURL: https://gitea0213.kro.kr/bluemayne/monitoring.git targetRevision: main @@ -23,7 +23,7 @@ spec: destination: server: https://kubernetes.default.svc - namespace: monitoring + namespace: kube-state-metrics syncPolicy: automated: diff --git a/kube-state-metrics/helm-values/kube-state-metrics.yaml b/kube-state-metrics/helm-values.yaml similarity index 100% rename from kube-state-metrics/helm-values/kube-state-metrics.yaml rename to kube-state-metrics/helm-values.yaml diff --git a/kube-state-metrics/kustomization.yaml b/kube-state-metrics/kustomization.yaml index 491ceaa..4ee9d9a 100644 --- a/kube-state-metrics/kustomization.yaml +++ b/kube-state-metrics/kustomization.yaml @@ -2,5 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - # ArgoCD Application 리소스는 infrastructure/kustomization.yaml에서 관리 - # - argocd/kube-state-metrics.yaml + # ArgoCD Application 리소스는 monitoring/kustomization.yaml에서 관리 + # - argocd.yaml + + - namespace.yaml diff --git a/kube-state-metrics/namespace.yaml b/kube-state-metrics/namespace.yaml new file mode 100644 index 0000000..0b90168 --- /dev/null +++ b/kube-state-metrics/namespace.yaml @@ -0,0 +1,6 @@ +apiVersion: v1 +kind: Namespace +metadata: + name: kube-state-metrics + labels: + goldilocks.fairwinds.com/enabled: "true" diff --git a/loki/argocd/loki.yaml b/loki/argocd.yaml similarity index 88% rename from loki/argocd/loki.yaml rename to loki/argocd.yaml index 38f2473..e9cd56b 100644 --- a/loki/argocd/loki.yaml +++ b/loki/argocd.yaml @@ -11,13 +11,13 @@ spec: targetRevision: 6.24.0 helm: valueFiles: - - $values/loki/helm-values/loki.yaml + - $values/loki/helm-values.yaml - repoURL: https://gitea0213.kro.kr/bluemayne/monitoring.git targetRevision: HEAD ref: values destination: server: https://kubernetes.default.svc - namespace: logging + namespace: loki syncPolicy: automated: prune: true diff --git a/loki/helm-values/loki.yaml b/loki/helm-values.yaml similarity index 100% rename from loki/helm-values/loki.yaml rename to loki/helm-values.yaml diff --git a/loki/kustomization.yaml b/loki/kustomization.yaml index 28abfdd..4ee9d9a 100644 --- a/loki/kustomization.yaml +++ b/loki/kustomization.yaml @@ -2,5 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - # ArgoCD Application 리소스는 infrastructure/kustomization.yaml에서 관리 - # - argocd/loki.yaml + # ArgoCD Application 리소스는 monitoring/kustomization.yaml에서 관리 + # - argocd.yaml + + - namespace.yaml diff --git a/loki/namespace.yaml b/loki/namespace.yaml new file mode 100644 index 0000000..b5ed98c --- /dev/null +++ b/loki/namespace.yaml @@ -0,0 +1,6 @@ +apiVersion: v1 +kind: Namespace +metadata: + name: loki + labels: + goldilocks.fairwinds.com/enabled: "true" diff --git a/node-exporter/argocd/node-exporter.yaml b/node-exporter/argocd.yaml similarity index 91% rename from node-exporter/argocd/node-exporter.yaml rename to node-exporter/argocd.yaml index 9adb95e..4df8259 100644 --- a/node-exporter/argocd/node-exporter.yaml +++ b/node-exporter/argocd.yaml @@ -15,7 +15,7 @@ spec: targetRevision: 4.39.0 helm: valueFiles: - - $values/node-exporter/helm-values/node-exporter.yaml + - $values/node-exporter/helm-values.yaml # Values file from Git repository - repoURL: https://gitea0213.kro.kr/bluemayne/monitoring.git targetRevision: main @@ -23,7 +23,7 @@ spec: destination: server: https://kubernetes.default.svc - namespace: monitoring + namespace: node-exporter syncPolicy: automated: diff --git a/node-exporter/helm-values/node-exporter.yaml b/node-exporter/helm-values.yaml similarity index 100% rename from node-exporter/helm-values/node-exporter.yaml rename to node-exporter/helm-values.yaml diff --git a/node-exporter/kustomization.yaml b/node-exporter/kustomization.yaml index 9e0f18d..4ee9d9a 100644 --- a/node-exporter/kustomization.yaml +++ b/node-exporter/kustomization.yaml @@ -2,5 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - # ArgoCD Application 리소스는 infrastructure/kustomization.yaml에서 관리 - # - argocd/node-exporter.yaml + # ArgoCD Application 리소스는 monitoring/kustomization.yaml에서 관리 + # - argocd.yaml + + - namespace.yaml diff --git a/node-exporter/namespace.yaml b/node-exporter/namespace.yaml new file mode 100644 index 0000000..5e11857 --- /dev/null +++ b/node-exporter/namespace.yaml @@ -0,0 +1,6 @@ +apiVersion: v1 +kind: Namespace +metadata: + name: node-exporter + labels: + goldilocks.fairwinds.com/enabled: "true" diff --git a/prometheus/argocd/prometheus.yaml b/prometheus/argocd.yaml similarity index 91% rename from prometheus/argocd/prometheus.yaml rename to prometheus/argocd.yaml index 9b8bab2..fb87b2b 100644 --- a/prometheus/argocd/prometheus.yaml +++ b/prometheus/argocd.yaml @@ -15,7 +15,7 @@ spec: targetRevision: 80.0.0 helm: valueFiles: - - $values/prometheus/helm-values/kube-prometheus-stack.yaml + - $values/prometheus/helm-values.yaml # Values file from Git repository - repoURL: https://gitea0213.kro.kr/bluemayne/monitoring.git targetRevision: main @@ -27,7 +27,7 @@ spec: destination: server: https://kubernetes.default.svc - namespace: monitoring + namespace: prometheus syncPolicy: automated: diff --git a/prometheus/helm-values/kube-prometheus-stack.yaml b/prometheus/helm-values.yaml similarity index 100% rename from prometheus/helm-values/kube-prometheus-stack.yaml rename to prometheus/helm-values.yaml diff --git a/prometheus/kustomization.yaml b/prometheus/kustomization.yaml index 6deef9e..aae4fac 100644 --- a/prometheus/kustomization.yaml +++ b/prometheus/kustomization.yaml @@ -2,6 +2,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - # ArgoCD Application 리소스는 infrastructure/kustomization.yaml에서 관리 - # - argocd/prometheus.yaml + # ArgoCD Application 리소스는 monitoring/kustomization.yaml에서 관리 + # - argocd.yaml + + - namespace.yaml - vault/postgresql-password.yaml diff --git a/prometheus/namespace.yaml b/prometheus/namespace.yaml new file mode 100644 index 0000000..c82bc9c --- /dev/null +++ b/prometheus/namespace.yaml @@ -0,0 +1,6 @@ +apiVersion: v1 +kind: Namespace +metadata: + name: prometheus + labels: + goldilocks.fairwinds.com/enabled: "true" diff --git a/promtail/argocd/promtail.yaml b/promtail/argocd.yaml similarity index 87% rename from promtail/argocd/promtail.yaml rename to promtail/argocd.yaml index 927f53c..597c482 100644 --- a/promtail/argocd/promtail.yaml +++ b/promtail/argocd.yaml @@ -11,13 +11,13 @@ spec: targetRevision: 6.16.6 helm: valueFiles: - - $values/promtail/helm-values/promtail.yaml + - $values/promtail/helm-values.yaml - repoURL: https://gitea0213.kro.kr/bluemayne/monitoring.git targetRevision: HEAD ref: values destination: server: https://kubernetes.default.svc - namespace: logging + namespace: promtail syncPolicy: automated: prune: true diff --git a/promtail/helm-values/promtail.yaml b/promtail/helm-values.yaml similarity index 100% rename from promtail/helm-values/promtail.yaml rename to promtail/helm-values.yaml diff --git a/promtail/kustomization.yaml b/promtail/kustomization.yaml index 611ba0a..4ee9d9a 100644 --- a/promtail/kustomization.yaml +++ b/promtail/kustomization.yaml @@ -2,5 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - # ArgoCD Application 리소스는 infrastructure/kustomization.yaml에서 관리 - # - argocd/promtail.yaml + # ArgoCD Application 리소스는 monitoring/kustomization.yaml에서 관리 + # - argocd.yaml + + - namespace.yaml diff --git a/promtail/namespace.yaml b/promtail/namespace.yaml new file mode 100644 index 0000000..a45542d --- /dev/null +++ b/promtail/namespace.yaml @@ -0,0 +1,6 @@ +apiVersion: v1 +kind: Namespace +metadata: + name: promtail + labels: + goldilocks.fairwinds.com/enabled: "true"