From 8b6dc47a41d32d5795219a3c73d118eabb49384c Mon Sep 17 00:00:00 2001
From: zyc <1439655764@qq.com>
Date: Tue, 7 Apr 2026 15:43:37 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=AD=A3CI=20workflow=20secret?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=EF=BC=8C=E4=B8=8Ejimeng-clone=E4=BF=9D?=
 =?UTF-8?q?=E6=8C=81=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- prod环境硬编码CR server/username/org
- dev环境CR_ORG硬编码为dev
- kubeconfig使用VOLCANO_TEST/PROD_KUBE_CONFIG

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 .gitea/workflows/deploy-backend.yaml | 12 ++++++------
 .gitea/workflows/deploy-web.yaml     | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.gitea/workflows/deploy-backend.yaml b/.gitea/workflows/deploy-backend.yaml
index e58a826..c084c09 100644
--- a/.gitea/workflows/deploy-backend.yaml
+++ b/.gitea/workflows/deploy-backend.yaml
@@ -21,17 +21,17 @@ jobs:
 
           if [[ "${{ github.ref_name }}" == "master" ]]; then
             echo "IMAGE_TAG=prod-${BUILD_DATE}-${SHORT_SHA}" >> $GITHUB_ENV
-            echo "CR_SERVER_ACTIVE=${{ secrets.CR_PROD_SERVER }}" >> $GITHUB_ENV
-            echo "CR_USERNAME_ACTIVE=${{ secrets.CR_PROD_USERNAME }}" >> $GITHUB_ENV
+            echo "CR_SERVER_ACTIVE=gitea-prod-cn-shanghai.cr.volces.com" >> $GITHUB_ENV
+            echo "CR_USERNAME_ACTIVE=seaislee@76339115" >> $GITHUB_ENV
             echo "CR_PASSWORD_ACTIVE=${{ secrets.CR_PROD_PASSWORD }}" >> $GITHUB_ENV
-            echo "CR_ORG=${{ secrets.CR_PROD_ORG }}" >> $GITHUB_ENV
+            echo "CR_ORG=prod" >> $GITHUB_ENV
             echo "DEPLOY_ENV=production" >> $GITHUB_ENV
           elif [[ "${{ github.ref_name }}" == "dev" ]]; then
             echo "IMAGE_TAG=dev-${BUILD_DATE}-${SHORT_SHA}" >> $GITHUB_ENV
             echo "CR_SERVER_ACTIVE=${{ secrets.CR_SERVER }}" >> $GITHUB_ENV
             echo "CR_USERNAME_ACTIVE=${{ secrets.CR_USERNAME }}" >> $GITHUB_ENV
             echo "CR_PASSWORD_ACTIVE=${{ secrets.CR_PASSWORD }}" >> $GITHUB_ENV
-            echo "CR_ORG=${{ secrets.CR_ORG }}" >> $GITHUB_ENV
+            echo "CR_ORG=dev" >> $GITHUB_ENV
             echo "DEPLOY_ENV=development" >> $GITHUB_ENV
           fi
 
@@ -72,9 +72,9 @@ jobs:
         run: |
           mkdir -p $HOME/.kube
           if [[ "${{ github.ref_name }}" == "master" ]]; then
-            printf '%s\n' '${{ secrets.KUBE_CONFIG_PROD }}' > $HOME/.kube/config
+            printf '%s\n' '${{ secrets.VOLCANO_PROD_KUBE_CONFIG }}' > $HOME/.kube/config
           elif [[ "${{ github.ref_name }}" == "dev" ]]; then
-            printf '%s\n' '${{ secrets.KUBE_CONFIG }}' > $HOME/.kube/config
+            printf '%s\n' '${{ secrets.VOLCANO_TEST_KUBE_CONFIG }}' > $HOME/.kube/config
           fi
           chmod 600 $HOME/.kube/config
           echo "kubeconfig lines: $(wc -l < $HOME/.kube/config)"
diff --git a/.gitea/workflows/deploy-web.yaml b/.gitea/workflows/deploy-web.yaml
index f95cdb2..ad10ee0 100644
--- a/.gitea/workflows/deploy-web.yaml
+++ b/.gitea/workflows/deploy-web.yaml
@@ -21,17 +21,17 @@ jobs:
 
           if [[ "${{ github.ref_name }}" == "master" ]]; then
             echo "IMAGE_TAG=prod-${BUILD_DATE}-${SHORT_SHA}" >> $GITHUB_ENV
-            echo "CR_SERVER_ACTIVE=${{ secrets.CR_PROD_SERVER }}" >> $GITHUB_ENV
-            echo "CR_USERNAME_ACTIVE=${{ secrets.CR_PROD_USERNAME }}" >> $GITHUB_ENV
+            echo "CR_SERVER_ACTIVE=gitea-prod-cn-shanghai.cr.volces.com" >> $GITHUB_ENV
+            echo "CR_USERNAME_ACTIVE=seaislee@76339115" >> $GITHUB_ENV
             echo "CR_PASSWORD_ACTIVE=${{ secrets.CR_PROD_PASSWORD }}" >> $GITHUB_ENV
-            echo "CR_ORG=${{ secrets.CR_PROD_ORG }}" >> $GITHUB_ENV
+            echo "CR_ORG=prod" >> $GITHUB_ENV
             echo "DEPLOY_ENV=production" >> $GITHUB_ENV
           elif [[ "${{ github.ref_name }}" == "dev" ]]; then
             echo "IMAGE_TAG=dev-${BUILD_DATE}-${SHORT_SHA}" >> $GITHUB_ENV
             echo "CR_SERVER_ACTIVE=${{ secrets.CR_SERVER }}" >> $GITHUB_ENV
             echo "CR_USERNAME_ACTIVE=${{ secrets.CR_USERNAME }}" >> $GITHUB_ENV
             echo "CR_PASSWORD_ACTIVE=${{ secrets.CR_PASSWORD }}" >> $GITHUB_ENV
-            echo "CR_ORG=${{ secrets.CR_ORG }}" >> $GITHUB_ENV
+            echo "CR_ORG=dev" >> $GITHUB_ENV
             echo "DEPLOY_ENV=development" >> $GITHUB_ENV
           fi
 
@@ -72,9 +72,9 @@ jobs:
         run: |
           mkdir -p $HOME/.kube
           if [[ "${{ github.ref_name }}" == "master" ]]; then
-            printf '%s\n' '${{ secrets.KUBE_CONFIG_PROD }}' > $HOME/.kube/config
+            printf '%s\n' '${{ secrets.VOLCANO_PROD_KUBE_CONFIG }}' > $HOME/.kube/config
           elif [[ "${{ github.ref_name }}" == "dev" ]]; then
-            printf '%s\n' '${{ secrets.KUBE_CONFIG }}' > $HOME/.kube/config
+            printf '%s\n' '${{ secrets.VOLCANO_TEST_KUBE_CONFIG }}' > $HOME/.kube/config
           fi
           chmod 600 $HOME/.kube/config
           echo "kubeconfig lines: $(wc -l < $HOME/.kube/config)"