diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 96ecfa3..2c4a52a 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -19,13 +19,13 @@ jobs: echo "${{ secrets.K3S_PEM_KEY }}" > k3s.pem chmod 600 k3s.pem - # ========== 核心新增:上传仓库里的deploy.yml到K3s临时目录 ========== - # 说明:./deploy.yml 是你Gitea仓库根目录的./gitea/workflows/deploy.yml(需提前创建) - scp -i k3s.pem -o StrictHostKeyChecking=no ./gitea/workflows/deploy.yml root@${K3S_HOST}:/tmp/ + # ========== 修正1:上传「仓库根目录的deploy.yaml」(不是workflows里的deploy.yml) ========== + # 注意:路径是 ./deploy.yaml(仓库根目录),不是 .gitea/workflows/ 下的文件 + scp -i k3s.pem -o StrictHostKeyChecking=no ./deploy.yaml root@${K3S_HOST}:/tmp/ - # ========== 核心修改:kubectl指向临时目录的文件,补充命名空间 ========== + # ========== 修正2:kubectl指向临时目录的deploy.yaml,补充命名空间 ========== ssh -i k3s.pem -o StrictHostKeyChecking=no root@${K3S_HOST} << CMD - kubectl apply -f /tmp/deploy.yml # 替换原/k8s/deploy.yml + kubectl apply -f /tmp/deploy.yaml # 替换原/k8s/deploy.yaml kubectl rollout restart deployment ${APP_NAME} -n default # 加-n default避免找不到资源 - rm -f /tmp/deploy.yml # 可选:部署后删除临时文件 + rm -f /tmp/deploy.yaml # 可选:部署后删除临时文件 CMD \ No newline at end of file diff --git a/deploy.yaml b/deploy.yaml new file mode 100644 index 0000000..2f35ab8 --- /dev/null +++ b/deploy.yaml @@ -0,0 +1,44 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: ${APP_NAME} + namespace: default + labels: + app: ${APP_NAME} +spec: + replicas: 1 + selector: + matchLabels: + app: ${APP_NAME} + template: + metadata: + labels: + app: ${APP_NAME} + spec: + containers: + - name: ${APP_NAME} + image: ${REGISTRY}/${APP_NAME}:${gitea.sha} + imagePullPolicy: Always + ports: + - containerPort: 80 # 你的项目实际端口(比如前端80、后端8080) + resources: + requests: + cpu: 100m + memory: 128Mi + limits: + cpu: 500m + memory: 512Mi +--- +apiVersion: v1 +kind: Service +metadata: + name: ${APP_NAME}-service + namespace: default +spec: + type: NodePort + selector: + app: ${APP_NAME} + ports: + - port: 80 + targetPort: 80 + nodePort: 30001 # 必须在30000-32767之间 \ No newline at end of file