修改deployment.yml文件格式

.deploy/deployment.yml

@@ -0,0 +1,78 @@
+## 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: myk3s-test
+spec:
+  replicas: 2
+  revisionHistoryLimit: 3
+  selector:
+    matchLabels:
+      app: myk3s-test
+  template:
+    metadata:
+      labels:
+        app: myk3s-test
+    spec:
+      containers:
+        - image: ${env.REGISTRY}/${env.IMAGE_NAME}:${steps.datetime.outputs.datetime}
+          name: myk3s-test
+          imagePullPolicy: Always
+          readinessProbe:
+            httpGet:
+              path: /actuator/health
+              port: 9090
+            initialDelaySeconds: 1
+            successThreshold: 5
+          ports:
+            - containerPort: 9090
+      imagePullSecrets:
+        - name: dockerhub-id
+
+---
+
+apiVersion: v1
+kind: Service
+metadata:
+  name: myk3s-test
+spec:
+  type: NodePort
+  externalTrafficPolicy: Local
+  ports:
+    - name: http-8080
+      protocol: TCP
+      port: 9090
+      nodePort: 30099
+  selector:
+    app: myk3s-test

.gitea/workflows/build.yml

@@ -14,7 +14,7 @@ env:
   PATH: /opt/node/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
   REGISTRY: registry.cn-chengdu.aliyuncs.com
   IMAGE_NAME: bamanker/myk3stest
-  APP_NAME: myk3s-test
+  CONTAINER_NAME: myk3stest
 
 jobs:
   # 构建 Job
@@ -38,20 +38,10 @@ jobs:
         # 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: Set Env Var
-        env:
-          APP_TAG: ${{ steps.get_version.outputs.version }}
-        run: |
-          cat ./deployment.yml
-#                export APP_TAG=$env.TAG
-      #          echo APP_TAG=${{ env.TAG }} |
-      #          export APP_NAME=${{ env.APP_NAME }} |
-      #          echo APP_NAME=${{ env.APP_NAME }} |
-      - name: Inject Env Var
-        run: |
-          envsubst < ./deployment.yml
+      - name: Check java version
+        run: java -version
+      - name: Show now path
+        run: echo $(pwd);ls
       - name: Build with Maven
         # 设置Maven执行权限，使用maven绝对路径执行打包命令
         run: /usr/local/maven/bin/mvn clean package -DskipTests -Pprod
@@ -88,17 +78,11 @@ jobs:
         uses: http://139.9.216.111:3000/bamanker/steevchen-kubectl@master
         with:
           config: ${{ secrets.KUBE_CONFIG }}
-          command: apply -f http://139.9.216.111:3000/bamanker/myk3sTest/raw/branch/master/.deploy/deployment.yml
-      - name: k8s Check Pods Health
-        uses: http://139.9.216.111:3000/bamanker/steevchen-kubectl@master
-        with:
-          config: ${{ secrets.KUBE_CONFIG }}
-          command: get pod -n default -l app=${{ env.APP_NAME }}
-
-      - name: k8s Update Deployment
-        uses: http://139.9.216.111:3000/bamanker/steevchen-kubectl@master
-        env:
-          KUBE_CONFIG: ${{ secrets.KUBE_CONFIG }}
-        with:
-          command: rollout restart deployment ${{ env.APP_NAME }}-${{ gitea.ref_name }}
+          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 }}
 

deployment.yml

@@ -1,61 +0,0 @@
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    app: $APP_NAME
-    version: $APP_TAG
-  name: $APP_NAME
-  namespace: default
-spec:
-  progressDeadlineSeconds: 600
-  replicas: 1
-  revisionHistoryLimit: 2
-  selector:
-    matchLabels:
-      app: $APP_NAME
-  strategy:
-    rollingUpdate:
-      maxSurge: 50%
-      maxUnavailable: 50%
-    type: RollingUpdate
-  template:
-    metadata:
-      labels:
-        app: $APP_NAME
-        version: $APP_TAG
-    spec:
-      containers:
-        - image: registry.cn-chengdu.aliyuncs.com/bamanker/myk3stest:$APP_TAG #$REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME
-          name: $APP_NAME
-          imagePullPolicy: Always
-          readinessProbe:
-            httpGet:
-              path: /actuator/health
-              port: 9090
-            initialDelaySeconds: 1
-            timeoutSeconds: 10
-            failureThreshold: 30
-            successThreshold: 5
-          ports:
-            - containerPort: 9090
-      imagePullSecrets:
-        - name: dockerhub-id
----
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    app: $APP_NAME
-  name: $APP_NAME
-  namespace: default
-spec:
-  type: NodePort
-  externalTrafficPolicy: Local
-  ports:
-    - name: http
-      protocol: TCP
-      port: 9090
-      nodePort: 9090
-  selector:
-    app: $APP_NAME