diff --git a/deploy/chart/databases/templates/opengauss/opengauss.yaml b/deploy/chart/databases/templates/opengauss/opengauss.yaml index af7b8bf5ce3a6cec841d65b8078139da3e376a41..bff1c4f722428d76ec6526453497b4d3f1f3bcc0 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 c87da3ffc6ba28c4584f09c58d654ee9ef120429..4a0973cdae19a32151d3d77611db5a3d9633c264 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 81435e4100a044c66b551851a0d32d0f4a93354d..5f9c4a2efc76d59bbf462d94e436d555f0b295e9 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}"