From 19829baf0324dd033a4fea63c10960c7957ad502 Mon Sep 17 00:00:00 2001
From: xiaolipro <2357729423@qq.com>
Date: Thu, 3 Sep 2026 17:55:54 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.gitea/workflows/deplo?=
 =?UTF-8?q?y.yml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/deploy.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 228faa1..a675ca1 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -1,5 +1,3 @@
-# 复制到仓库: .gitea/workflows/deploy.yml
-# 前置: 42 上已 ./scripts/19-setup-act-runner.sh（runs-on: k3s-host）
 name: Build and Deploy
 
 on:

From 93224fdea294364fcc07f8afa61055eee64955b2 Mon Sep 17 00:00:00 2001
From: xiaolipro <2357729423@qq.com>
Date: Fri, 4 Sep 2026 09:14:24 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.gitea/workflows/deplo?=
 =?UTF-8?q?y.yml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/deploy.yml | 27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index a675ca1..4e085c6 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -1,3 +1,5 @@
+# 复制到仓库 .gitea/workflows/deploy.yml
+# 前置（仅一次）: RUNNER_TOKEN=xxx ./scripts/19-setup-act-runner.sh
 name: Build and Deploy
 
 on:
@@ -6,16 +8,12 @@ on:
   workflow_dispatch:
 
 env:
-  GITEA_REPO: gitea/itfx
   DOCKERFILE: src/InterfaceForward.Api/Dockerfile
   IMAGE_NAME: interfaceforward_api
   DEPLOY_NAME: interfaceforward-api
   CONTAINER_NAME: interfaceforward-api
   TCR_REGISTRY: ccr.ccs.tencentyun.com
   TCR_NAMESPACE: ideship
-  K3S_DIR: /data/k3s
-  KUBECONFIG: /etc/rancher/k3s/k3s.yaml
-  NAMESPACE: prod
 
 jobs:
   deploy:
@@ -24,19 +22,12 @@ jobs:
       - name: Build and deploy
         run: |
           set -euxo pipefail
-          export KUBECONFIG="${{ env.KUBECONFIG }}"
+          export KUBECONFIG=/etc/rancher/k3s/k3s.yaml
           TAG="${{ gitea.sha }}"
           IMG="${{ env.TCR_REGISTRY }}/${{ env.TCR_NAMESPACE }}/${{ env.IMAGE_NAME }}:${TAG}"
-          echo "image=${IMG}"
-          cd "${{ env.K3S_DIR }}"
-          chmod +x scripts/ci-kaniko-build.sh
-          ./scripts/ci-kaniko-build.sh \
-            "${{ env.GITEA_REPO }}" \
-            "${{ env.DOCKERFILE }}" \
-            "${{ env.IMAGE_NAME }}" \
-            "${TAG}" \
-            "${TAG}"
-          kubectl -n "${{ env.NAMESPACE }}" set image "deploy/${{ env.DEPLOY_NAME }}" \
-            "${{ env.CONTAINER_NAME }}=${IMG}"
-          kubectl -n "${{ env.NAMESPACE }}" rollout status "deploy/${{ env.DEPLOY_NAME }}" --timeout=180s
-          kubectl -n "${{ env.NAMESPACE }}" get pods -l "app=${{ env.DEPLOY_NAME }}" -o wide
+          REPO="${{ gitea.repository }}"
+          cd /data/k3s
+          ./scripts/ci-kaniko-build.sh "$REPO" "${{ env.DOCKERFILE }}" \
+            "${{ env.IMAGE_NAME }}" "$TAG" "$TAG"
+          ./scripts/ci-deploy-api.sh "${{ env.DEPLOY_NAME }}" \
+            "${{ env.CONTAINER_NAME }}" "$IMG"