修改deployment.yml文件格式,防止json转换错误1

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

.deploy/deployment.yml

@@ -1,54 +1,22 @@
 ---
-## k8s默认是访问不了外部服务的，需要代理,以mysql和redis为例，代理myservice名称到192.168.0.100，配置文件中对应的ip修改为myservice
-#apiVersion: v1
-#kind: Endpoints
-#metadata:
-#  name: myservice
-#subsets:
-#  - addresses:
-#      - ip: 192.168.0.100
-#    ports:
-#      - port: 6379
-#        protocol: TCP
-#        name: redis
-#      - port: 3306
-#        protocol: TCP
-#        name: mysql
-#---
-#apiVersion: v1
-#kind: Service
-#metadata:
-#  name: myservice
-#spec:
-#  ports:
-#    - port: 6379
-#      targetPort: 6379
-#      protocol: TCP
-#      name: redis
-#    - port: 3306
-#      targetPort: 3306
-#      protocol: TCP
-#      name: mysql
-#
----
 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}
+        - image: registry.cn-chengdu.aliyuncs.com/bamanker/myk3stest:lastest
-          name: myk3sTest
+          name: myk3s-test
           imagePullPolicy: Always
           readinessProbe:
             httpGet:
@@ -60,13 +28,11 @@ spec:
             - containerPort: 9090
       imagePullSecrets:
         - name: dockerhub-id
-
 ---
-
 apiVersion: v1
 kind: Service
 metadata:
-  name: myk3sTest
+  name: myk3s-test
 spec:
   type: NodePort
   externalTrafficPolicy: Local
@@ -76,4 +42,4 @@ spec:
       port: 9090
       nodePort: 30099
   selector:
-    app: myk3sTest
+    app: myk3s-test

.gitea/workflows/build.yml

@@ -41,7 +41,7 @@ jobs:
       - 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
@@ -75,15 +75,14 @@ jobs:
 
 
       - name: k8s Check and Apply New Deployment
-        uses: http://139.9.216.111:3000/bamanker/kubectl@master
+        uses: http://139.9.216.111:3000/bamanker/steevchen-kubectl@master
-        env:
-          KUBE_CONFIG: ${{ secrets.KUBE_CONFIG }}
         with:
-          args: apply -f http://${{ secrets.DEVOPS_GITEA_TOKEN }}@/bamanker/myk3sTest/src/branch/master/.deploy/deployment.yml
+          config: ${{ secrets.KUBE_CONFIG }}
-      - name: k8s Update Deployment
+          command: apply -f http://139.9.216.111:3000/bamanker/myk3sTest/src/branch/master/.deploy/deployment.yml
-        uses: http://139.9.216.111:3000/bamanker/kubectl@master
+#      - name: k8s Update Deployment
-        env:
+#        uses: http://139.9.216.111:3000/bamanker/kubectl@master
-          KUBE_CONFIG: ${{ secrets.KUBE_CONFIG }}
+#        env:
-        with:
+#          KUBE_CONFIG: ${{ secrets.KUBE_CONFIG }}
-          args: rollout restart deployment ${{ env.CONTAINER_NAME }}-${{ gitea.ref_name }}
+#        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>