From e09555613a96dbee1e4a1a01773a5b5192547357 Mon Sep 17 00:00:00 2001
From: rohow <admin@dev.cm>
Date: Mon, 1 Sep 2025 19:04:21 +0800
Subject: [PATCH] =?UTF-8?q?feat(backup):=20=E9=9B=86=E7=BE=A4=E5=A4=87?=
 =?UTF-8?q?=E4=BB=BD=E7=9B=B8=E5=85=B3=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/infra/data/cloudnative-pg/cnpg17-cluster-hk.yaml | 2 +-
 apps/infra/data/cloudnative-pg/cnpg17-cluster-sh.yaml | 2 +-
 apps/infra/data/cloudnative-pg/helmchart.yaml         | 4 +++-
 apps/infra/devops/velero/helmchart.yaml               | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/apps/infra/data/cloudnative-pg/cnpg17-cluster-hk.yaml b/apps/infra/data/cloudnative-pg/cnpg17-cluster-hk.yaml
index 55a7033..1f97070 100644
--- a/apps/infra/data/cloudnative-pg/cnpg17-cluster-hk.yaml
+++ b/apps/infra/data/cloudnative-pg/cnpg17-cluster-hk.yaml
@@ -15,7 +15,7 @@ spec:
                   - cn-hk
           weight: 1
   instances: 1
-  imageName: ghcr.io/cloudnative-pg/postgresql:17-bookworm
+  imageName: ghcr.io/cloudnative-pg/postgresql:17.4
   enableSuperuserAccess: true
   storage:
     size: 10Gi
diff --git a/apps/infra/data/cloudnative-pg/cnpg17-cluster-sh.yaml b/apps/infra/data/cloudnative-pg/cnpg17-cluster-sh.yaml
index 5fa9ac2..a1ac1da 100644
--- a/apps/infra/data/cloudnative-pg/cnpg17-cluster-sh.yaml
+++ b/apps/infra/data/cloudnative-pg/cnpg17-cluster-sh.yaml
@@ -15,7 +15,7 @@ spec:
                   - cn-sh
           weight: 1
   instances: 1
-  imageName: ghcr.io/cloudnative-pg/postgresql:17-bookworm
+  imageName: ghcr.io/cloudnative-pg/postgresql:17.4
   enableSuperuserAccess: true
   storage:
     size: 10Gi
diff --git a/apps/infra/data/cloudnative-pg/helmchart.yaml b/apps/infra/data/cloudnative-pg/helmchart.yaml
index 1651ad8..cdf1865 100644
--- a/apps/infra/data/cloudnative-pg/helmchart.yaml
+++ b/apps/infra/data/cloudnative-pg/helmchart.yaml
@@ -7,7 +7,7 @@ spec:
   repo: https://cloudnative-pg.github.io/charts
   chart: cloudnative-pg
   targetNamespace: infra-data
-  version: 0.26.0
+  version: 0.25.0
   valuesContent: |-
     affinity:
       nodeAffinity:
@@ -22,4 +22,6 @@ spec:
       - key: "node-role.kubernetes.io/control-plane"
         operator: "Exists"
         effect: "NoSchedule"
+    image:
+      tag: "1.25.3"
 
diff --git a/apps/infra/devops/velero/helmchart.yaml b/apps/infra/devops/velero/helmchart.yaml
index b866a38..6db1f30 100644
--- a/apps/infra/devops/velero/helmchart.yaml
+++ b/apps/infra/devops/velero/helmchart.yaml
@@ -41,7 +41,7 @@ spec:
           prefix: velero
           config:
             region: cn-east-3
-            s3ForcePathStyle: true
+            s3ForcePathStyle: false
             s3Url: https://obs.cn-east-3.myhuaweicloud.com
             checksumAlgorithm: ""
     credentials: