diff --git a/.deploy/deployment.yml b/.deploy/deployment.yml index 5a09894..99df05d 100644 --- a/.deploy/deployment.yml +++ b/.deploy/deployment.yml @@ -2,27 +2,40 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: myk3s-test + labels: + app: $APP_NAME + version: $APP_TAG + name: $APP_NAME + namespace: default spec: - replicas: 2 - revisionHistoryLimit: 3 + progressDeadlineSeconds: 600 + replicas: 1 + revisionHistoryLimit: 2 selector: matchLabels: - app: myk3s-test + app: $APP_NAME + strategy: + rollingUpdate: + maxSurge: 50% + maxUnavailable: 50% + type: RollingUpdate template: metadata: labels: - app: myk3s-test + app: $APP_NAME + version: $APP_TAG spec: containers: - - image: registry.cn-chengdu.aliyuncs.com/bamanker/myk3stest - name: myk3s-test + - 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 @@ -32,14 +45,17 @@ spec: apiVersion: v1 kind: Service metadata: - name: myk3s-test + labels: + app: $APP_NAME + name: $APP_NAME + namespace: default spec: type: NodePort externalTrafficPolicy: Local ports: - - name: http-8080 + - name: http protocol: TCP port: 9090 - nodePort: 30099 + nodePort: 9090 selector: - app: myk3s-test + app: $APP_NAME diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index 0d57363..149def9 100644 --- a/.gitea/workflows/build.yml +++ b/.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 - CONTAINER_NAME: myk3s-test + APP_NAME: myk3s-test jobs: # 构建 Job @@ -40,8 +40,16 @@ jobs: 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: Set Env Var + env: + TAG: ${{ steps.get_version.outputs.version }} + run: 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 < .deploy/deployment.yml - name: Build with Maven # 设置Maven执行权限,使用maven绝对路径执行打包命令 run: /usr/local/maven/bin/mvn clean package -DskipTests -Pprod @@ -86,7 +94,7 @@ jobs: command: get pod -n default -l app=${{ env.CONTAINER_NAME }} - name: k8s Update 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: