修改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

@@ -10,48 +10,40 @@ on:
   #      - main
   workflow_dispatch: #手动构建h
 
-#设置全局环境变量
 env:
   PATH: /opt/node/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-  REGISTRY: ${{ secrets.DOCKER_REGISTRY }}
-  IMAGE_NAMESPACE: bamanker  # todo 可以通过读取pom文件获取下面这些属性值
-  IMAGE_NAME: myk3stest
-  APP_NAME: myk3s-test
+  REGISTRY: registry.cn-chengdu.aliyuncs.com
+  IMAGE_NAME: bamanker/myk3stest
+  CONTAINER_NAME: myk3stest
 
-# 构建 Job
 jobs:
+  # 构建 Job
   build:
     runs-on: host
+    outputs: # 声明作业的输出变量，方便在其他 Job 引用
+      datetime: ${{ steps.datetime.outputs.datetime }}
     steps:
-      # 下载仓库源码，依赖node环境，因此构建服务器本地需要下载安装node并设置环境变量
+      # 下载仓库源码，依赖java环境，因此构建服务器本地需要下载安装java并设置环境变量
       - name: Checkout repository code
-        #使用自定义仓库action
         uses: http://139.9.216.111:3000/bamanker/checkout@v6
-
-      # 获取 TAG 并设置为环境变量
+      #      - name: Set up Java
+      #        uses: https://gitee.com/bamanker/setup-java@v5
+      #        with:
+      #            java-version: '25.0.1'
+      #            distribution: 'openjdk'
+      #            cache: 'maven'
+      #检查java版本
       - name: Get version
         id: get_version
         # e.g. refs/tags/v1.0.0
         run: |
-          echo "APP_TAG=${GITHUB_REF/refs\/tags\/v}" >> $GITHUB_ENV 
-
-      # 检查 TAG 并传参
-      - name: Set envVar
-        id: set_envar
-        run: |
-          echo "The app version is $APP_TAG" && echo "tag=$APP_TAG" >> $GITHUB_OUTPUT  && 
-          echo "now workspace: ${{ github.workspace }}" &&
-          pwd
-
-      # 为其他配置文件注入环境变量
-      - name: Inject envVar
-        run: |
-          envsubst < ./deployment-temp.yml > ./deployment.yml &&
-          cat ./deployment.yml
-
-      # 构建java项目
+          echo "version=${GITHUB_REF/refs\/tags\/v}" >> $GITHUB_OUTPUT
+      - name: Check java version
+        run: java -version
+      - name: Show now path
+        run: echo $(pwd);ls
       - name: Build with Maven
-        #使用maven绝对路径执行打包命令
+        # 设置Maven执行权限，使用maven绝对路径执行打包命令
         run: /usr/local/maven/bin/mvn clean package -DskipTests -Pprod
 
       # 登录镜像仓库，方便后续上传镜像
@@ -63,46 +55,34 @@ jobs:
           # 这里也可以通过 secrets 传入，后面再介绍
           password: ${{ secrets.DOCKERHUB_PASSWORD }}
 
-      #      # 获取时间戳
-      #      - name: Get datetime
-      #        id: datetime
-      #        run: |
-      #          echo "datetime=$(date '+%Y-%m-%d-%H-%M-%S')" >> $GITHUB_OUTPUT
+      # 获取时间戳
+      - name: Get datetime
+        id: datetime
+        run: |
+          echo "datetime=$(date '+%Y-%m-%d-%H-%M-%S')" >> $GITHUB_OUTPUT
 
       # 构建并上传镜像
       - name: Build and push Docker image
         uses: http://139.9.216.111:3000/bamanker/build-push-action@v6 # 获取上一步截取到的版本号，既 1.0.0
-        #只能这样接收
         env:
-          TAG: ${{ steps.set_envar.outputs.tag }}
+          TAG: ${{ steps.get_version.outputs.version }}
         with:
           context: .
           platforms: linux/amd64
           file: Dockerfile
           push: true
-          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }}:${{ env.TAG }}
+          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.TAG }}
 
-      #发布到 k8s
-      - name: Generate kubeconfig and deploy
-        uses: http://139.9.216.111:3000/bamanker/kubectl-helm-action@master
-        env:
-          KUBE_CONFIG_DATA: ${{ secrets.KUBE_CONFIG }}
+
+      - name: k8s Check and Apply New Deployment
+        uses: http://139.9.216.111:3000/bamanker/steevchen-kubectl@master
         with:
-          args: kubectl apply -f ./deployment.yml
-
-      #          command: apply -f http://139.9.216.111:3000/bamanker/myk3sTest/raw/branch/master/.deploy/deployment-temp.yml
-      - name: k8s Check Pods Health
-        uses: http://139.9.216.111:3000/bamanker/kubectl-helm-action@master
-        env:
-          KUBE_CONFIG_DATA: ${{ secrets.KUBE_CONFIG }}
-        with:
-          args: kubectl get pod -n default -l app=${{ env.APP_NAME }}
-
-      - name: k8s Update Deployment
-        uses: http://139.9.216.111:3000/bamanker/kubectl-helm-action@master
-        env:
-          KUBE_CONFIG_DATA: ${{ secrets.KUBE_CONFIG }}
-        with:
-          args: kubectl rollout restart deployment ${{ env.APP_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 }}
 

deployment-temp.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/$IMAGE_NAMESPACE/$IMAGE_NAME:$APP_TAG
-          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

pom.xml

@@ -8,10 +8,9 @@
         <version>4.0.1</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
-
     <groupId>com.bamanker</groupId>
     <artifactId>myk3sTest</artifactId>
-    <version>v1.1.9</version>
+    <version>0.0.1</version>
     <name>myk3sTest</name>
     <description>myk3sTest</description>
     <url/>
@@ -29,13 +28,11 @@
     </scm>
     <properties>
         <java.version>25</java.version>
-        <app.version>${version}</app.version>
-        <app.name>${artifactId}</app.name>
+
         <maven.compiler.source>25</maven.compiler.source>
         <maven.compiler.target>25</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -62,27 +59,7 @@
 
     <build>
         <finalName>myk3sTest</finalName>
-        <!--指定filtering=true.maven的占位符解析表达式就可以用于它里面的文件-->
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
         <plugins>
-            <plugin>
-                <!--支持yaml读取pom的参数-->
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-                <version>3.2.0</version>
-                <configuration>
-                    <encoding>UTF-8</encoding>
-                    <delimiters>
-                        <delimiter>@</delimiter>
-                    </delimiters>
-                    <useDefaultDelimiters>false</useDefaultDelimiters>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -100,11 +77,13 @@
                         </path>
                     </annotationProcessorPaths>
                 </configuration>
+
             </plugin>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
                 <configuration>
+
                     <excludes>
                         <exclude>
                             <groupId>org.projectlombok</groupId>
@@ -115,4 +94,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>