From b1ba7f9e13abc0ca085203c0705abbdfc63b98c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=96=8C?= <259278618@qq.com>
Date: Fri, 22 May 2026 14:21:06 +0800
Subject: [PATCH] dockerfile

---
 .gitea/workflows/deploy.yml | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 98d1822..6a1a20e 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -7,18 +7,27 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     env:
-      K3S_HOST: 121.37.117.181
+      # 从组织级Secrets读取，不用在仓库重复配置
+      K3S_HOST: ${{ secrets.K3S_HOST }}
       APP_NAME: ${{ gitea.repo_name }}
     steps:
-      # 修正：使用正确的 checkout 动作
       - name: 拉取代码
         uses: actions/checkout@v4
 
       - name: SSH部署K3s
         run: |
           mkdir -p ~/.ssh
-          echo "${{ secrets.K3S_PEM_KEY }}" > k3s.pem
+          # 写入组织配置的SSH私钥
+          echo "${{ secrets.K3S_SSH_KEY }}" > k3s.pem
           chmod 600 k3s.pem
+          # 调试：验证私钥是否正确写入
+          echo "私钥文件权限："
+          ls -l k3s.pem
+          echo "私钥头部（仅前5行）："
+          head -5 k3s.pem
+          # 测试连接（会输出服务器主机名和kubectl版本）
+          ssh -i k3s.pem -o StrictHostKeyChecking=no -o ConnectTimeout=10 root@${K3S_HOST} "hostname && kubectl version --client"
+          # 正式执行部署命令
           ssh -i k3s.pem -o StrictHostKeyChecking=no root@${K3S_HOST} << CMD
             kubectl apply -f /k8s/deploy.yaml
             kubectl rollout restart deployment ${APP_NAME}