From 65e017c6ee9af0f6fe00df6aaf357c7223845be8 Mon Sep 17 00:00:00 2001 From: rohow Date: Tue, 21 Apr 2026 18:20:37 +0800 Subject: [PATCH] feat(infra): rename infra-data resources and update dependencies for post-1 and post-2 --- flux/README.md | 6 ++++-- flux/clusters/base/apps.yaml | 2 +- flux/clusters/base/infra-data.yaml | 10 +++++----- flux/clusters/base/infra-gitops.yaml | 2 +- flux/clusters/base/infra-monitor.yaml | 2 +- .../cnpg17-cluster-hk.yaml | 0 .../cnpg17-cluster-sh.yaml | 0 .../databases.yaml | 0 .../kustomization.yaml | 2 +- .../loadbalancer-hk.yaml | 0 .../loadbalancer-sh.yaml | 0 .../patch.yaml} | 4 ++-- .../kustomization.yaml | 0 flux/clusters/dev-cm/infra-data-post-2/patch.yaml | 6 ++++++ .../reflector-secret-annotations.yaml | 0 .../{patches/infra-data.yaml => infra-data/patch.yaml} | 0 flux/clusters/dev-cm/kustomization.yaml | 10 +++++----- flux/clusters/dev-cm/patches/infra-data-reflector.yaml | 6 ------ .../infra-data/{post => post-1}/cnpg17-cluster.yaml | 0 .../{post => post-1}/cnpg17-objectstore-hw.yaml | 0 .../infra-data/{post => post-1}/databases.yaml | 0 .../infra-data/{post => post-1}/kustomization.yaml | 0 .../infra-data/{post => post-1}/loadbalancer.yaml | 0 .../{reflector => post-2}/kustomization.yaml | 0 .../reflector-secret-annotations.yaml | 0 25 files changed, 26 insertions(+), 24 deletions(-) rename flux/clusters/dev-cm/{infra-data-post => infra-data-post-1}/cnpg17-cluster-hk.yaml (100%) rename flux/clusters/dev-cm/{infra-data-post => infra-data-post-1}/cnpg17-cluster-sh.yaml (100%) rename flux/clusters/dev-cm/{infra-data-post => infra-data-post-1}/databases.yaml (100%) rename flux/clusters/dev-cm/{infra-data-post => infra-data-post-1}/kustomization.yaml (73%) rename flux/clusters/dev-cm/{infra-data-post => infra-data-post-1}/loadbalancer-hk.yaml (100%) rename flux/clusters/dev-cm/{infra-data-post => infra-data-post-1}/loadbalancer-sh.yaml (100%) rename flux/clusters/dev-cm/{patches/infra-data-post.yaml => infra-data-post-1/patch.yaml} (96%) rename flux/clusters/dev-cm/{infra-data-reflector => infra-data-post-2}/kustomization.yaml (100%) create mode 100644 flux/clusters/dev-cm/infra-data-post-2/patch.yaml rename flux/clusters/dev-cm/{infra-data-reflector => infra-data-post-2}/reflector-secret-annotations.yaml (100%) rename flux/clusters/dev-cm/{patches/infra-data.yaml => infra-data/patch.yaml} (100%) delete mode 100644 flux/clusters/dev-cm/patches/infra-data-reflector.yaml rename flux/infrastructure/infra-data/{post => post-1}/cnpg17-cluster.yaml (100%) rename flux/infrastructure/infra-data/{post => post-1}/cnpg17-objectstore-hw.yaml (100%) rename flux/infrastructure/infra-data/{post => post-1}/databases.yaml (100%) rename flux/infrastructure/infra-data/{post => post-1}/kustomization.yaml (100%) rename flux/infrastructure/infra-data/{post => post-1}/loadbalancer.yaml (100%) rename flux/infrastructure/infra-data/{reflector => post-2}/kustomization.yaml (100%) rename flux/infrastructure/infra-data/{reflector => post-2}/reflector-secret-annotations.yaml (100%) diff --git a/flux/README.md b/flux/README.md index 6e22a07..ca721d7 100644 --- a/flux/README.md +++ b/flux/README.md @@ -19,7 +19,9 @@ flux/ │ ├── sources/ # 所有 HelmRepository 定义 │ ├── kube-system/ # CoreDNS 自定义 + NodeLocalDNS │ ├── infra-devops/ # cert-manager, webhook-dnspod, reflector, velero -│ ├── infra-data/ # CNPG operator, Barman, PG集群, Valkey +│ ├── infra-data/ # CNPG operator, Barman, Valkey +│ │ ├── post-1/ # PG Cluster / ObjectStore / databases / LB +│ │ └── post-2/ # Reflector secret annotations │ ├── infra-net/ # ingress-nginx, CrowdSec, Tailscale DERP, 证书 │ │ └── post/ # CDN Ingress（依赖 apps，打破循环） │ ├── infra-monitor/ # Loki, Prometheus+Grafana @@ -32,7 +34,7 @@ flux/ ## 部署顺序 ``` -sources → secrets → kube-system → infra-devops → infra-data → infra-data-post +sources → secrets → kube-system → infra-devops → infra-data → infra-data-post-1 → infra-data-post-2 → infra-monitor → infra-net → infra-devops-post → infra-monitor-post (Promtail) → infra-gitops diff --git a/flux/clusters/base/apps.yaml b/flux/clusters/base/apps.yaml index aa579f0..e52f4bb 100644 --- a/flux/clusters/base/apps.yaml +++ b/flux/clusters/base/apps.yaml @@ -13,6 +13,6 @@ spec: path: ./flux/apps prune: true dependsOn: - - name: infra-data-reflector + - name: infra-data-post-2 - name: infra-net - name: infra-gitops diff --git a/flux/clusters/base/infra-data.yaml b/flux/clusters/base/infra-data.yaml index 439094a..126e335 100644 --- a/flux/clusters/base/infra-data.yaml +++ b/flux/clusters/base/infra-data.yaml @@ -21,7 +21,7 @@ spec: apiVersion: kustomize.toolkit.fluxcd.io/v1 kind: Kustomization metadata: - name: infra-data-post + name: infra-data-post-1 namespace: infra-gitops spec: interval: 30m @@ -30,7 +30,7 @@ spec: sourceRef: kind: GitRepository name: flux - path: ./flux/infrastructure/infra-data/post + path: ./flux/infrastructure/infra-data/post-1 prune: true force: true wait: true @@ -41,7 +41,7 @@ spec: apiVersion: kustomize.toolkit.fluxcd.io/v1 kind: Kustomization metadata: - name: infra-data-reflector + name: infra-data-post-2 namespace: infra-gitops spec: interval: 30m @@ -50,9 +50,9 @@ spec: sourceRef: kind: GitRepository name: flux - path: ./flux/infrastructure/infra-data/reflector + path: ./flux/infrastructure/infra-data/post-2 prune: true force: true wait: true dependsOn: - - name: infra-data-post + - name: infra-data-post-1 diff --git a/flux/clusters/base/infra-gitops.yaml b/flux/clusters/base/infra-gitops.yaml index 259d800..039e16e 100644 --- a/flux/clusters/base/infra-gitops.yaml +++ b/flux/clusters/base/infra-gitops.yaml @@ -14,7 +14,7 @@ spec: prune: true wait: true dependsOn: - - name: infra-data-reflector + - name: infra-data-post-2 - name: infra-monitor --- diff --git a/flux/clusters/base/infra-monitor.yaml b/flux/clusters/base/infra-monitor.yaml index 23a01e3..2fb82bb 100644 --- a/flux/clusters/base/infra-monitor.yaml +++ b/flux/clusters/base/infra-monitor.yaml @@ -15,7 +15,7 @@ spec: force: true wait: true dependsOn: - - name: infra-data-reflector + - name: infra-data-post-2 --- apiVersion: kustomize.toolkit.fluxcd.io/v1 diff --git a/flux/clusters/dev-cm/infra-data-post/cnpg17-cluster-hk.yaml b/flux/clusters/dev-cm/infra-data-post-1/cnpg17-cluster-hk.yaml similarity index 100% rename from flux/clusters/dev-cm/infra-data-post/cnpg17-cluster-hk.yaml rename to flux/clusters/dev-cm/infra-data-post-1/cnpg17-cluster-hk.yaml diff --git a/flux/clusters/dev-cm/infra-data-post/cnpg17-cluster-sh.yaml b/flux/clusters/dev-cm/infra-data-post-1/cnpg17-cluster-sh.yaml similarity index 100% rename from flux/clusters/dev-cm/infra-data-post/cnpg17-cluster-sh.yaml rename to flux/clusters/dev-cm/infra-data-post-1/cnpg17-cluster-sh.yaml diff --git a/flux/clusters/dev-cm/infra-data-post/databases.yaml b/flux/clusters/dev-cm/infra-data-post-1/databases.yaml similarity index 100% rename from flux/clusters/dev-cm/infra-data-post/databases.yaml rename to flux/clusters/dev-cm/infra-data-post-1/databases.yaml diff --git a/flux/clusters/dev-cm/infra-data-post/kustomization.yaml b/flux/clusters/dev-cm/infra-data-post-1/kustomization.yaml similarity index 73% rename from flux/clusters/dev-cm/infra-data-post/kustomization.yaml rename to flux/clusters/dev-cm/infra-data-post-1/kustomization.yaml index 7bdf31e..33cf75f 100644 --- a/flux/clusters/dev-cm/infra-data-post/kustomization.yaml +++ b/flux/clusters/dev-cm/infra-data-post-1/kustomization.yaml @@ -1,7 +1,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - ../../../infrastructure/infra-data/post/cnpg17-objectstore-hw.yaml + - ../../../infrastructure/infra-data/post-1/cnpg17-objectstore-hw.yaml - cnpg17-cluster-hk.yaml - cnpg17-cluster-sh.yaml - databases.yaml diff --git a/flux/clusters/dev-cm/infra-data-post/loadbalancer-hk.yaml b/flux/clusters/dev-cm/infra-data-post-1/loadbalancer-hk.yaml similarity index 100% rename from flux/clusters/dev-cm/infra-data-post/loadbalancer-hk.yaml rename to flux/clusters/dev-cm/infra-data-post-1/loadbalancer-hk.yaml diff --git a/flux/clusters/dev-cm/infra-data-post/loadbalancer-sh.yaml b/flux/clusters/dev-cm/infra-data-post-1/loadbalancer-sh.yaml similarity index 100% rename from flux/clusters/dev-cm/infra-data-post/loadbalancer-sh.yaml rename to flux/clusters/dev-cm/infra-data-post-1/loadbalancer-sh.yaml diff --git a/flux/clusters/dev-cm/patches/infra-data-post.yaml b/flux/clusters/dev-cm/infra-data-post-1/patch.yaml similarity index 96% rename from flux/clusters/dev-cm/patches/infra-data-post.yaml rename to flux/clusters/dev-cm/infra-data-post-1/patch.yaml index 9bdd2bd..22314ee 100644 --- a/flux/clusters/dev-cm/patches/infra-data-post.yaml +++ b/flux/clusters/dev-cm/infra-data-post-1/patch.yaml @@ -1,9 +1,9 @@ apiVersion: kustomize.toolkit.fluxcd.io/v1 kind: Kustomization metadata: - name: infra-data-post + name: infra-data-post-1 spec: - path: ./flux/clusters/dev-cm/infra-data-post + path: ./flux/clusters/dev-cm/infra-data-post-1 patches: - target: kind: Cluster diff --git a/flux/clusters/dev-cm/infra-data-reflector/kustomization.yaml b/flux/clusters/dev-cm/infra-data-post-2/kustomization.yaml similarity index 100% rename from flux/clusters/dev-cm/infra-data-reflector/kustomization.yaml rename to flux/clusters/dev-cm/infra-data-post-2/kustomization.yaml diff --git a/flux/clusters/dev-cm/infra-data-post-2/patch.yaml b/flux/clusters/dev-cm/infra-data-post-2/patch.yaml new file mode 100644 index 0000000..978c2dd --- /dev/null +++ b/flux/clusters/dev-cm/infra-data-post-2/patch.yaml @@ -0,0 +1,6 @@ +apiVersion: kustomize.toolkit.fluxcd.io/v1 +kind: Kustomization +metadata: + name: infra-data-post-2 +spec: + path: ./flux/clusters/dev-cm/infra-data-post-2 diff --git a/flux/clusters/dev-cm/infra-data-reflector/reflector-secret-annotations.yaml b/flux/clusters/dev-cm/infra-data-post-2/reflector-secret-annotations.yaml similarity index 100% rename from flux/clusters/dev-cm/infra-data-reflector/reflector-secret-annotations.yaml rename to flux/clusters/dev-cm/infra-data-post-2/reflector-secret-annotations.yaml diff --git a/flux/clusters/dev-cm/patches/infra-data.yaml b/flux/clusters/dev-cm/infra-data/patch.yaml similarity index 100% rename from flux/clusters/dev-cm/patches/infra-data.yaml rename to flux/clusters/dev-cm/infra-data/patch.yaml diff --git a/flux/clusters/dev-cm/kustomization.yaml b/flux/clusters/dev-cm/kustomization.yaml index 53ec328..8dc47ee 100644 --- a/flux/clusters/dev-cm/kustomization.yaml +++ b/flux/clusters/dev-cm/kustomization.yaml @@ -14,15 +14,15 @@ patches: - target: kind: Kustomization name: infra-data - path: patches/infra-data.yaml + path: infra-data/patch.yaml - target: kind: Kustomization - name: infra-data-post - path: patches/infra-data-post.yaml + name: infra-data-post-1 + path: infra-data-post-1/patch.yaml - target: kind: Kustomization - name: infra-data-reflector - path: patches/infra-data-reflector.yaml + name: infra-data-post-2 + path: infra-data-post-2/patch.yaml - target: kind: Kustomization name: infra-net diff --git a/flux/clusters/dev-cm/patches/infra-data-reflector.yaml b/flux/clusters/dev-cm/patches/infra-data-reflector.yaml deleted file mode 100644 index 3aa0869..0000000 --- a/flux/clusters/dev-cm/patches/infra-data-reflector.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: kustomize.toolkit.fluxcd.io/v1 -kind: Kustomization -metadata: - name: infra-data-reflector -spec: - path: ./flux/clusters/dev-cm/infra-data-reflector diff --git a/flux/infrastructure/infra-data/post/cnpg17-cluster.yaml b/flux/infrastructure/infra-data/post-1/cnpg17-cluster.yaml similarity index 100% rename from flux/infrastructure/infra-data/post/cnpg17-cluster.yaml rename to flux/infrastructure/infra-data/post-1/cnpg17-cluster.yaml diff --git a/flux/infrastructure/infra-data/post/cnpg17-objectstore-hw.yaml b/flux/infrastructure/infra-data/post-1/cnpg17-objectstore-hw.yaml similarity index 100% rename from flux/infrastructure/infra-data/post/cnpg17-objectstore-hw.yaml rename to flux/infrastructure/infra-data/post-1/cnpg17-objectstore-hw.yaml diff --git a/flux/infrastructure/infra-data/post/databases.yaml b/flux/infrastructure/infra-data/post-1/databases.yaml similarity index 100% rename from flux/infrastructure/infra-data/post/databases.yaml rename to flux/infrastructure/infra-data/post-1/databases.yaml diff --git a/flux/infrastructure/infra-data/post/kustomization.yaml b/flux/infrastructure/infra-data/post-1/kustomization.yaml similarity index 100% rename from flux/infrastructure/infra-data/post/kustomization.yaml rename to flux/infrastructure/infra-data/post-1/kustomization.yaml diff --git a/flux/infrastructure/infra-data/post/loadbalancer.yaml b/flux/infrastructure/infra-data/post-1/loadbalancer.yaml similarity index 100% rename from flux/infrastructure/infra-data/post/loadbalancer.yaml rename to flux/infrastructure/infra-data/post-1/loadbalancer.yaml diff --git a/flux/infrastructure/infra-data/reflector/kustomization.yaml b/flux/infrastructure/infra-data/post-2/kustomization.yaml similarity index 100% rename from flux/infrastructure/infra-data/reflector/kustomization.yaml rename to flux/infrastructure/infra-data/post-2/kustomization.yaml diff --git a/flux/infrastructure/infra-data/reflector/reflector-secret-annotations.yaml b/flux/infrastructure/infra-data/post-2/reflector-secret-annotations.yaml similarity index 100% rename from flux/infrastructure/infra-data/reflector/reflector-secret-annotations.yaml rename to flux/infrastructure/infra-data/post-2/reflector-secret-annotations.yaml