修改deployment.yml文件格式

2025-12-25 16:38:58 +08:00 · 2025-12-25 16:37:47 +08:00 · 2025-12-25 16:36:37 +08:00
5 changed files with 126 additions and 193 deletions
--- a/.deploy/deployment.yml
+++ b/.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
--- a/.gitea/workflows/build.yml
+++ b/.gitea/workflows/build.yml
@@ -10,73 +10,41 @@ 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: ubuntu-node24 # 如果host构建 ：linux_amd64
+    runs-on: host
+    outputs: # 声明作业的输出变量，方便在其他 Job 引用
+      datetime: ${{ steps.datetime.outputs.datetime }}
    steps:
-      - name: Print system info 1
-        run: echo " The job was automatically triggered by a ${{ gitea.event_name }} event."
-      - name: Print system info 2
-        run: echo " This job is now running on a ${{ runner.os }} server hosted by Gitea!"
-      - name: Print system info 3
-        run: echo " The name of your branch is ${{ gitea.ref }} and your repository is ${{ gitea.repository }}."
-      - name: Print env
-        run: env
-      - name: Install dependencies
-        run: apt-get update && apt-get install -y gettext
-
-#      - uses: http://localhost:3000/bamanker/setup-node@v6
-#        with:
-#          node-version: 24
-#          cache: 'npm'
-#      - run: node -v
-      # 下载仓库源码，依赖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项目
-      - name: Set up Java
-        uses: http://139.9.216.111:3000/bamanker/setup-java@v5
-        with:
-          distribution: 'graalvm'
-          java-version: '25.0.1'
-          cache: 'maven'
-
+          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绝对路径执行打包命令
-        run: mvn clean native:compile -DskipTests -Pnative
+        # 设置Maven执行权限，使用maven绝对路径执行打包命令
+        run: /usr/local/maven/bin/mvn clean package -DskipTests -Pprod

      # 登录镜像仓库，方便后续上传镜像
      - name: Login to Docker Registry
@@ -87,37 +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
-        uses: http://139.9.216.111:3000/bamanker/kubectl-action@v1.4.0
+
+      - name: k8s Check and Apply New Deployment
+        uses: http://139.9.216.111:3000/bamanker/steevchen-kubectl@master
        with:
-          base64-kube-config: ${{ secrets.KUBE_CONFIG }}
-      - name: Deploy k8s
-        run: 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
-        run: kubectl get pod -n default -l app=${{ env.APP_NAME }}
-
-      - name: k8s Update Deployment
-        run: kubectl rollout restart deployment ${{ env.APP_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 }}

--- a/6
+++ b/6
@@ -1,7 +1,7 @@
 # 基于 java25 构建
-FROM ubuntu:jammy
+FROM swr.cn-north-4.myhuaweicloud.com/ddn-k8s/docker.io/openjdk:25-jdk-slim
 # 基于构建上下文 . 进行COPY 文件到 /root目录下
-COPY target/myk3sTest /root/myk3sTest/
+COPY target/myk3sTest.jar /root/myk3sTest/
 EXPOSE 9090
 # 容器启动执行的命令
-CMD /root/myk3sTest/myk3sTest -XX:StartFlightRecording='filename=recording.jfr,dumponexit=true,duration=10s'
+CMD java -jar -Xms20m -Xmx20m -Dspring.profiles.active=test /root/myk3sTest/myk3sTest.jar
--- a/deployment-temp.yml
+++ b/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: /test
-              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: 30909
-  selector:
-    app: $APP_NAME
--- a/pom.xml
+++ b/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>v3.1.0-native</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,56 +59,7 @@

    <build>
        <finalName>myk3sTest</finalName>
-        <!--指定filtering=true.maven的占位符解析表达式就可以用于它里面的文件-->
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
        <plugins>
-            <plugin>
-                <groupId>org.graalvm.buildtools</groupId>
-                <artifactId>native-maven-plugin</artifactId>
-                <configuration>
-                    <mainClass>com.bamanker.myk3stest.Myk3sTestApplication</mainClass>
-                    <buildArgs>
-                        <!--开启dashboard-->
-                        <!--                        <arg>-H:DashboardDump=dailylove -H:+DashboardAll</arg>-->
-                        <arg->-H:+ReportExceptionStackTraces</arg->
-                        <!--开启JFR-->
-                        <arg>--enable-monitoring=jfr</arg>
-<!--                        <arg>&#45;&#45;gc=G1</arg>-->
-                        <!--                        <arg>&#45;&#45;pgo</arg>-->
-                        <arg>-Ob</arg>
-                        <!--                        <arg>-march=native</arg>-->
-<!--                        <arg>-H:+BuildReport</arg>-->
-                    </buildArgs>
-                    <!--启动详细输出-->
-                    <verbose>true</verbose>
-                    <!--配置jvm参数-->
-                    <!--  <jvmArgs>
-                      </jvmArgs>-->
-                    <!--<agent>
-                        <enabled>true</enabled>
-                        <options>
-                            <option>experimental-class-loader-support</option>
-                        </options>
-                    </agent>-->
-                </configuration>
-            </plugin>
-            <plugin>
-                <!--支持yaml读取pom的参数-->
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-                <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>
@@ -129,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>
@@ -144,4 +94,5 @@
            </plugin>
        </plugins>
    </build>
+
 </project>
Author	SHA1	Message	Date
bamanker	e7e274241d	修改deployment.yml文件格式 Some checks failed Build Push and Deploy Image / build (push) Failing after 1m29s Details	2025-12-25 16:38:58 +08:00
bamanker	60be5bda29	修改deployment.yml文件格式	2025-12-25 16:37:47 +08:00
bamanker	dad481d5f6	修改deployment.yml文件格式	2025-12-25 16:36:37 +08:00