diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 0390a14..89a40ab 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -17,18 +17,17 @@ jobs: - name: SSH部署K3s run: | mkdir -p ~/.ssh - # 写入组织配置的SSH私钥 - echo "${{ secrets.K3S_SSH_KEY }}" > k3s.pem + echo "${{ secrets.K3S_PEM_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" - # 正式执行部署命令 + + # 关键1:上传当前仓库根目录的deploy.yaml到K3s服务器/tmp目录 + # 若deploy.yaml在仓库k8s子目录,改为 ./k8s/deploy.yaml + scp -i k3s.pem -o StrictHostKeyChecking=no ./deploy.yaml root@${K3S_HOST}:/tmp/ + + # 关键2:执行kubectl指向临时文件,补充命名空间避免找不到资源 ssh -i k3s.pem -o StrictHostKeyChecking=no root@${K3S_HOST} << CMD - kubectl apply -f /data/k3s-data/deploy.yaml - kubectl rollout restart deployment ${APP_NAME} + kubectl apply -f /tmp/deploy.yaml + kubectl rollout restart deployment ${APP_NAME} -n default + # 可选:部署完成后删除临时文件,清理服务器 + rm -f /tmp/deploy.yaml CMD \ No newline at end of file diff --git a/deploy.yaml b/deploy.yaml index df42b23..0bb7300 100644 --- a/deploy.yaml +++ b/deploy.yaml @@ -42,4 +42,4 @@ spec: ports: - port: 80 targetPort: 80 - nodePort: 80 # 该项目专属端口(如其他项目用30002) \ No newline at end of file + nodePort: 30000 # 该项目专属端口(如其他项目用30002) \ No newline at end of file