diff --git a/deploy/cloud/charts/config/files/ALIPAY_APP_CERT_PUBLIC_KEY b/deploy/cloud/charts/config/files/ALIPAY_APP_CERT_PUBLIC_KEY new file mode 100644 index 000000000..e69de29bb diff --git a/deploy/cloud/charts/config/files/ALIPAY_CERT_PUBLIC_KEY b/deploy/cloud/charts/config/files/ALIPAY_CERT_PUBLIC_KEY new file mode 100644 index 000000000..e69de29bb diff --git a/deploy/cloud/charts/config/files/ALIPAY_PRIVATE_KEY b/deploy/cloud/charts/config/files/ALIPAY_PRIVATE_KEY new file mode 100644 index 000000000..e69de29bb diff --git a/deploy/cloud/charts/config/files/ALIPAY_ROOT_CERT b/deploy/cloud/charts/config/files/ALIPAY_ROOT_CERT new file mode 100644 index 000000000..e69de29bb diff --git a/deploy/cloud/charts/config/files/WechatPrivateKey b/deploy/cloud/charts/config/files/WechatPrivateKey new file mode 100644 index 000000000..e69de29bb diff --git a/deploy/cloud/charts/config/templates/account-secret.yaml b/deploy/cloud/charts/config/templates/account-secret.yaml index 87aac71c3..2d7cc2f0a 100644 --- a/deploy/cloud/charts/config/templates/account-secret.yaml +++ b/deploy/cloud/charts/config/templates/account-secret.yaml @@ -10,19 +10,14 @@ stringData: AppID: "{{ .Values.payment.wechat.AppID }}" MchAPIv3Key: "{{ .Values.payment.wechat.MchAPIv3Key }}" MchCertificateSerialNumber: "{{ .Values.payment.wechat.MchCertificateSerialNumber }}" - WechatPrivateKey: | - {{ .Values.payment.wechat.WechatPrivateKey | indent 4 }} + WechatPrivateKey: {{ .Files.Get "files/WechatPrivateKey" | b64enc | quote }} {{- end }} {{- if .Values.payment.alipay.enabled }} ALIPAY_APP_ID: "{{ .Values.payment.alipay.ALIPAY_APP_ID }}" - ALIPAY_ROOT_CERT: | - {{ .Values.payment.alipay.ALIPAY_ROOT_CERT | indent 4 }} - ALIPAY_PRIVATE_KEY: | - {{ .Values.payment.alipay.ALIPAY_PRIVATE_KEY | indent 4 }} - ALIPAY_CERT_PUBLIC_KEY: | - {{ .Values.payment.alipay.ALIPAY_CERT_PUBLIC_KEY | indent 4 }} - ALIPAY_APP_CERT_PUBLIC_KEY: | - {{ .Values.payment.alipay.ALIPAY_APP_CERT_PUBLIC_KEY | indent 4 }} + ALIPAY_ROOT_CERT: {{ .Files.Get "files/ALIPAY_ROOT_CERT" | b64enc | quote }} + ALIPAY_PRIVATE_KEY: {{ .Files.Get "files/ALIPAY_PRIVATE_KEY" | b64enc | quote }} + ALIPAY_CERT_PUBLIC_KEY: {{ .Files.Get "files/ALIPAY_CERT_PUBLIC_KEY" | b64enc | quote }} + ALIPAY_APP_CERT_PUBLIC_KEY: {{ .Files.Get "files/ALIPAY_APP_CERT_PUBLIC_KEY" | b64enc | quote }} {{- end }} {{- if .Values.payment.stripe.enabled }} STRIPE_API_KEY: "{{ .Values.payment.stripe.STRIPE_API_KEY }}" diff --git a/deploy/cloud/install.sh b/deploy/cloud/install.sh index 1c3ffb3ee..0ada3a186 100644 --- a/deploy/cloud/install.sh +++ b/deploy/cloud/install.sh @@ -4,6 +4,7 @@ HELM_OPTS="${HELM_OPTS:-}" SEALOS_CLOUD_DOMAIN="${SEALOS_CLOUD_DOMAIN:-"sealos.io"}" SEALOS_CLOUD_PORT="${SEALOS_CLOUD_PORT:-"443"}" +SEALOS_CLOUD_DIR="${SEALOS_CLOUD_DIR:-"/root/.sealos/cloud"}" kubectl create namespace sealos-system --dry-run=client -o yaml | kubectl apply -f - kubectl create namespace sealos --dry-run=client -o yaml | kubectl apply -f - @@ -20,6 +21,22 @@ setMongoVersion() { } { + if [ -f "${SEALOS_CLOUD_DIR}/pki/WechatPrivateKey" ]; then + cp ${SEALOS_CLOUD_DIR}/pki/WechatPrivateKey ./charts/config/files/WechatPrivateKey + fi + if [ -f "${SEALOS_CLOUD_DIR}/pki/ALIPAY_APP_CERT_PUBLIC_KEY" ]; then + cp ${SEALOS_CLOUD_DIR}/pki/ALIPAY_APP_CERT_PUBLIC_KEY ./charts/config/files/ALIPAY_APP_CERT_PUBLIC_KEY + fi + if [ -f "${SEALOS_CLOUD_DIR}/pki/ALIPAY_CERT_PUBLIC_KEY" ]; then + cp ${SEALOS_CLOUD_DIR}/pki/ALIPAY_CERT_PUBLIC_KEY ./charts/config/files/ALIPAY_CERT_PUBLIC_KEY + fi + if [ -f "${SEALOS_CLOUD_DIR}/pki/ALIPAY_PRIVATE_KEY" ]; then + cp ${SEALOS_CLOUD_DIR}/pki/ALIPAY_PRIVATE_KEY ./charts/config/files/ALIPAY_PRIVATE_KEY + fi + if [ -f "${SEALOS_CLOUD_DIR}/pki/ALIPAY_ROOT_CERT" ]; then + cp ${SEALOS_CLOUD_DIR}/pki/ALIPAY_ROOT_CERT ./charts/config/files/ALIPAY_ROOT_CERT + fi + setMongoVersion helm upgrade --install cloud-database -n sealos-system charts/database ${HELM_OPTS} --set mongodb.version=${mongodbVersion} gen_mongodbUri diff --git a/scripts/cloud/install-v2.sh b/scripts/cloud/install-v2.sh index ed5f7d6dc..42e7a3d75 100644 --- a/scripts/cloud/install-v2.sh +++ b/scripts/cloud/install-v2.sh @@ -342,7 +342,7 @@ execute_commands() { run_and_log "sealos run ${image_registry}/${image_repository}/kubeblocks:${kubeblocks_version}" print "[Step 4] Starting Sealos Cloud installation..." - run_and_log "sealos run ${image_registry}/${sealos_cloud_image_repository}/sealos-cloud:${sealos_cloud_version} --env SEALOS_CLOUD_DOMAIN=\"${sealos_cloud_domain}\" --env SEALOS_CLOUD_PORT=\"${sealos_cloud_port}\" " + run_and_log "sealos run ${image_registry}/${sealos_cloud_image_repository}/sealos-cloud:${sealos_cloud_version} --env SEALOS_CLOUD_DOMAIN=\"${sealos_cloud_domain}\" --env SEALOS_CLOUD_PORT=\"${sealos_cloud_port}\" --env SEALOS_CLOUD_DIR=${sealos_cloud_config_dir} " if [[ "${sealos_enable_acme,,}" == "true" ]]; then run_and_log "sealos run ${image_registry}/${image_repository}/sealos-certs:${sealos_cert_version} --env SEALOS_CLOUD_CERT_MODE=acmedns " elif [[ -n "${cert_path}" ]] || [[ -n "${key_path}" ]]; then