feat(helm): clusters update

2026-04-20 12:30:10 +08:00
@@ -5,6 +5,7 @@ metadata:
  namespace: infra-data
 spec:
  interval: 30m
+  timeout: 15m
  dependsOn:
    - name: cloudnative-pg
  chart:
@@ -5,6 +5,7 @@ metadata:
  namespace: infra-data
 spec:
  interval: 30m
+  timeout: 15m
  chart:
    spec:
      chart: cloudnative-pg
@@ -5,6 +5,7 @@ metadata:
  namespace: infra-data
 spec:
  interval: 30m
+  timeout: 15m
  chart:
    spec:
      chart: valkey-cluster
@@ -1,42 +0,0 @@
-apiVersion: postgresql.cnpg.io/v1
-kind: Cluster
-metadata:
-  name: cnpg17-cluster-sh
-  namespace: infra-data
-spec:
-  imageName: ghcr.io/cloudnative-pg/postgresql:17.4
-  enableSuperuserAccess: true
-  enablePDB: false
-  instances: 1
-  storage:
-    size: 10Gi
-  postgresql:
-    parameters:
-      archive_timeout: 30min
-  env:
-    - name: AWS_REQUEST_CHECKSUM_CALCULATION
-      value: when_required
-    - name: AWS_RESPONSE_CHECKSUM_VALIDATION
-      value: when_required
-  plugins:
-    - name: barman-cloud.cloudnative-pg.io
-      isWALArchiver: true
-      parameters:
-        barmanObjectName: cnpg17-objectstore-hw
-        serverName: cnpg17-cluster-sh
-
---
-apiVersion: postgresql.cnpg.io/v1
-kind: ScheduledBackup
-metadata:
-  name: cnpg17-cluster-sh-backups
-  namespace: infra-data
-spec:
-  schedule: "0 0 0 * * *"
-  immediate: true
-  backupOwnerReference: self
-  method: plugin
-  pluginConfiguration:
-    name: barman-cloud.cloudnative-pg.io
-  cluster:
-    name: cnpg17-cluster-sh
@@ -1,7 +1,7 @@
 apiVersion: postgresql.cnpg.io/v1
 kind: Cluster
 metadata:
-  name: cnpg17-cluster-hk
+  name: cnpg17-cluster
  namespace: infra-data
 spec:
  imageName: ghcr.io/cloudnative-pg/postgresql:17.4
@@ -23,13 +23,13 @@ spec:
      isWALArchiver: true
      parameters:
        barmanObjectName: cnpg17-objectstore-hw
-        serverName: cnpg17-cluster-hk
+        serverName: cnpg17-cluster

 ---
 apiVersion: postgresql.cnpg.io/v1
 kind: ScheduledBackup
 metadata:
-  name: cnpg17-cluster-hk-backups
+  name: cnpg17-cluster-backups
  namespace: infra-data
 spec:
  schedule: "0 0 0 * * *"
@@ -39,4 +39,4 @@ spec:
  pluginConfiguration:
    name: barman-cloud.cloudnative-pg.io
  cluster:
-    name: cnpg17-cluster-hk
+    name: cnpg17-cluster
@@ -1,43 +1,43 @@
 apiVersion: postgresql.cnpg.io/v1
 kind: Database
 metadata:
-  name: cnpg17-cluster-sh-gitea
+  name: cnpg17-cluster-gitea
  namespace: infra-data
 spec:
  name: gitea
  owner: app
  cluster:
-    name: cnpg17-cluster-sh
+    name: cnpg17-cluster
 ---
 apiVersion: postgresql.cnpg.io/v1
 kind: Database
 metadata:
-  name: cnpg17-cluster-sh-grafana
+  name: cnpg17-cluster-grafana
  namespace: infra-data
 spec:
  name: grafana
  owner: app
  cluster:
-    name: cnpg17-cluster-sh
+    name: cnpg17-cluster
 ---
 apiVersion: postgresql.cnpg.io/v1
 kind: Database
 metadata:
-  name: cnpg17-cluster-hk-halo
+  name: cnpg17-cluster-halo
  namespace: infra-data
 spec:
  name: halo
  owner: app
  cluster:
-    name: cnpg17-cluster-hk
+    name: cnpg17-cluster
 ---
 apiVersion: postgresql.cnpg.io/v1
 kind: Database
 metadata:
-  name: cnpg17-cluster-hk-crowdsec
+  name: cnpg17-cluster-crowdsec
  namespace: infra-data
 spec:
  name: crowdsec
  owner: app
  cluster:
-    name: cnpg17-cluster-hk
+    name: cnpg17-cluster
@@ -2,9 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
  - cnpg17-objectstore-hw.yaml
-  - cnpg17-cluster-hk.yaml
-  - cnpg17-cluster-sh.yaml
+  - cnpg17-cluster.yaml
  - databases.yaml
-  - loadbalancer-hk.yaml
-  - loadbalancer-sh.yaml
+  - loadbalancer.yaml
  - reflector-secret-annotations.yaml
@@ -1,14 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: cnpg17-cluster-sh-lb
-  namespace: infra-data
-spec:
-  selector:
-    cnpg.io/cluster: cnpg17-cluster-sh
-    role: primary
-  ports:
-    - protocol: TCP
-      port: 65431
-      targetPort: 5432
-  type: LoadBalancer
@@ -1,14 +1,14 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: cnpg17-cluster-hk-lb
+  name: cnpg17-cluster-lb
  namespace: infra-data
 spec:
  selector:
-    cnpg.io/cluster: cnpg17-cluster-hk
+    cnpg.io/cluster: cnpg17-cluster
    role: primary
  ports:
    - protocol: TCP
-      port: 65432
+      port: 5432
      targetPort: 5432
  type: LoadBalancer
@@ -1,32 +1,19 @@
 # 给CNPG和Valkey自动生成的secrets添加Reflector注解
 # 通过SSA force合并注解到已有secrets 使其自动复制到消费方命名空间
 #
-# cnpg17-cluster-hk-app → apps (halo), infra-net (crowdsec)
-# cnpg17-cluster-sh-app → infra-gitops (gitea), infra-monitor (grafana)
+# cnpg17-cluster-app → apps (halo), infra-net (crowdsec), infra-gitops (gitea), infra-monitor (grafana)
 # valkey-cluster-sh → infra-gitops (gitea)
 apiVersion: v1
 kind: Secret
 metadata:
-  name: cnpg17-cluster-hk-app
+  name: cnpg17-cluster-app
  namespace: infra-data
  annotations:
    kustomize.toolkit.fluxcd.io/prune: disabled
    reflector.v1.k8s.emberstack.com/reflection-allowed: "true"
-    reflector.v1.k8s.emberstack.com/reflection-allowed-namespaces: "apps,infra-net"
+    reflector.v1.k8s.emberstack.com/reflection-allowed-namespaces: "apps,infra-net,infra-gitops,infra-monitor"
    reflector.v1.k8s.emberstack.com/reflection-auto-enabled: "true"
-    reflector.v1.k8s.emberstack.com/reflection-auto-namespaces: "apps,infra-net"
---
-apiVersion: v1
-kind: Secret
-metadata:
-  name: cnpg17-cluster-sh-app
-  namespace: infra-data
-  annotations:
-    kustomize.toolkit.fluxcd.io/prune: disabled
-    reflector.v1.k8s.emberstack.com/reflection-allowed: "true"
-    reflector.v1.k8s.emberstack.com/reflection-allowed-namespaces: "infra-gitops,infra-monitor"
-    reflector.v1.k8s.emberstack.com/reflection-auto-enabled: "true"
-    reflector.v1.k8s.emberstack.com/reflection-auto-namespaces: "infra-gitops,infra-monitor"
+    reflector.v1.k8s.emberstack.com/reflection-auto-namespaces: "apps,infra-net,infra-gitops,infra-monitor"
 ---
 apiVersion: v1
 kind: Secret