From e7f63e046c6fe1d67dcc45252d48badfa38b17da Mon Sep 17 00:00:00 2001
From: ylzhangah <1194926515@qq.com>
Date: Fri, 25 Apr 2025 18:15:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9yaml=E5=92=8C=E5=AE=89?=
 =?UTF-8?q?=E8=A3=85=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 deploy/chart/databases/templates/opengauss/opengauss.yaml | 2 +-
 deploy/chart/databases/values.yaml                        | 6 +++---
 deploy/scripts/6-install-databases/install_databases.sh   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/deploy/chart/databases/templates/opengauss/opengauss.yaml b/deploy/chart/databases/templates/opengauss/opengauss.yaml
index af7b8bf5c..bff1c4f72 100644
--- a/deploy/chart/databases/templates/opengauss/opengauss.yaml
+++ b/deploy/chart/databases/templates/opengauss/opengauss.yaml
@@ -37,7 +37,7 @@ spec:
       automountServiceAccountToken: false
       containers:
         - name: opengauss
-          image: {{ default "hub.oepkgs.net/neocopilot/opengauss:latest-arm" .Values.databases.opengauss.image }}
+          image: image: {{ .Values.databases.opengauss.image | default (printf "%s/neocopilot/opengauss:latest-%s" (.Values.globals.imageRegistry | default "hub.oepkgs.net") (ternary "arm" "x86" (eq (.Values.globals.arch | default "x86") "arm"))) }}
           imagePullPolicy: {{ default "IfNotPresent" .Values.globals.imagePullPolicy }}
           ports:
             - containerPort: 5432
diff --git a/deploy/chart/databases/values.yaml b/deploy/chart/databases/values.yaml
index c87da3ffc..4a0973cda 100644
--- a/deploy/chart/databases/values.yaml
+++ b/deploy/chart/databases/values.yaml
@@ -78,8 +78,8 @@ databases:
   opengauss:
     # [必填] 是否部署PostgreSQL实例
     enabled: true
-    # 镜像设置，默认为hub.oepkgs.net/neocopilot/opengauss:7.0.0-rc1
-    # 镜像版本： ["7.0.0-rc1"]
+    # 镜像设置，默认为hub.oepkgs.net/neocopilot/opengauss:latest-x86
+    # 镜像版本： ["latest-x86", "latest-arm"]
     image:
     # 性能限制设置
     resourceLimits: {}
@@ -88,4 +88,4 @@ databases:
       # Service类型，如NodePort
       type:
       # 当类型为NodePort时，填写主机的端口号
-      nodePort:
\ No newline at end of file
+      nodePort:
diff --git a/deploy/scripts/6-install-databases/install_databases.sh b/deploy/scripts/6-install-databases/install_databases.sh
index 81435e410..5f9c4a2ef 100755
--- a/deploy/scripts/6-install-databases/install_databases.sh
+++ b/deploy/scripts/6-install-databases/install_databases.sh
@@ -72,7 +72,7 @@ uninstall_databases() {
     local pvc_list
     pvc_list=$(kubectl get pvc -n euler-copilot -o jsonpath='{.items[*].metadata.name}' 2>/dev/null \
         | tr ' ' '\n' \
-        | grep -E '^(pgsql-storage|mongo-storage|minio-storage)$' || true)  # 精确匹配三个指定名称
+        | grep -E '^(opengauss-storage|mongo-storage|minio-storage)$' || true)  # 精确匹配三个指定名称
 
     if [ -n "$pvc_list" ]; then
         echo -e "${YELLOW}找到以下PVC，开始清理...${NC}"
-- 
Gitee