修改deployment.yml文件格式

# Conflicts:
#	.gitea/workflows/build.yml

.deploy/deployment.yml

@@ -1,4 +1,3 @@
----
 ## k8s默认是访问不了外部服务的，需要代理,以mysql和redis为例，代理myservice名称到192.168.0.100，配置文件中对应的ip修改为myservice
 #apiVersion: v1
 #kind: Endpoints
@@ -34,21 +33,21 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: myk3sTest
+  name: myk3s-test
 spec:
   replicas: 2
   revisionHistoryLimit: 3
   selector:
     matchLabels:
-      app: myk3sTest
+      app: myk3s-test
   template:
     metadata:
       labels:
-        app: myk3sTest
+        app: myk3s-test
     spec:
       containers:
         - image: ${env.REGISTRY}/${env.IMAGE_NAME}:${steps.datetime.outputs.datetime}
-          name: myk3sTest
+          name: myk3s-test
           imagePullPolicy: Always
           readinessProbe:
             httpGet:
@@ -66,7 +65,7 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  name: myk3sTest
+  name: myk3s-test
 spec:
   type: NodePort
   externalTrafficPolicy: Local
@@ -76,4 +75,4 @@ spec:
       port: 9090
       nodePort: 30099
   selector:
-    app: myk3sTest
+    app: myk3s-test

.gitea/workflows/build.yml

@@ -35,11 +35,13 @@ jobs:
       #检查java版本
       - name: Get version
         id: get_version
-        run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
+        # e.g. refs/tags/v1.0.0
+        run: |
+          echo "version=${GITHUB_REF/refs\/tags\/v}" >> $GITHUB_OUTPUT
       - name: Check java version
         run: java -version
       - name: Show now path
-        run: echo $(pwd)
+        run: echo $(pwd);ls
       - name: Build with Maven
         # 设置Maven执行权限，使用maven绝对路径执行打包命令
         run: /usr/local/maven/bin/mvn clean package -DskipTests -Pprod
@@ -61,25 +63,26 @@ jobs:
 
       # 构建并上传镜像
       - name: Build and push Docker image
-        uses: http://139.9.216.111:3000/bamanker/build-push-action@v6
+        uses: http://139.9.216.111:3000/bamanker/build-push-action@v6 # 获取上一步截取到的版本号，既 1.0.0
+        env:
+          TAG: ${{ steps.get_version.outputs.version }}
         with:
           context: .
           platforms: linux/amd64
           file: Dockerfile
           push: true
-          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:{{ steps.get_version.outputs.VERSION }}
+          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.TAG }}
 
 
       - name: k8s Check and Apply New Deployment
-        uses: http://139.9.216.111:3000/bamanker/kubectl@master
-        env:
-          KUBE_CONFIG: ${{ secrets.KUBE_CONFIG }}
+        uses: http://139.9.216.111:3000/bamanker/steevchen-kubectl@master
         with:
-          args: apply -f http://${{ secrets.DEVOPS_GITEA_TOKEN }}@/bamanker/myk3sTest/src/branch/master/.deploy/deployment.yml
-      - name: k8s Update Deployment
-        uses: http://139.9.216.111:3000/bamanker/kubectl@master
-        env:
-          KUBE_CONFIG: ${{ secrets.KUBE_CONFIG }}
-        with:
-          args: rollout restart deployment ${{ env.CONTAINER_NAME }}-${{ gitea.ref_name }}
+          config: ${{ secrets.KUBE_CONFIG }}
+          command: apply -f http://139.9.216.111:3000/bamanker/myk3sTest/src/branch/master/.deploy/deployment.yml
+#      - name: k8s Update Deployment
+#        uses: http://139.9.216.111:3000/bamanker/kubectl@master
+#        env:
+#          KUBE_CONFIG: ${{ secrets.KUBE_CONFIG }}
+#        with:
+#          args: rollout restart deployment ${{ env.CONTAINER_NAME }}-${{ gitea.ref_name }}
 

pom.xml

@@ -66,8 +66,6 @@
                 <configuration>
                     <source>25</source>
                     <target>25</target>
-
-
                     <annotationProcessorPaths>
                         <path>
                             <groupId>org.springframework.boot</groupId>