feat(infra): rename infra-data resources and update dependencies for post-1 and post-2

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

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

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

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

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

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

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

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

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

flux/clusters/dev-cm/patches/infra-data-reflector.yaml

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