Bläddra i källkod

deploy pro/offline-process-charge:r189021 重新推送25号以来的海外支付订单,用于给烟民校验数据

pmrd 1 år sedan
förälder
incheckning
4fb158ffbf
4 ändrade filer med 53 tillägg och 42 borttagningar
  1. 8 6
      .drone.yml
  2. 1 1
      Dockerfile
  3. 40 33
      deploy-tmp.yaml
  4. 4 2
      drone.template.yml

+ 8 - 6
.drone.yml

@@ -15,15 +15,15 @@ steps:
    - git clone $DRONE_GIT_HTTP_URL .
 
 - name: deployment
-  image: hub.evbj.easou.com/dev/drone-agent:v3.0.1-230506
+  image: hub.evbj.easou.com/dev/drone-agent:v3.0.1-230721
   pull: always
   # privileged: true
   environment:
     JNLP_ENV: pro
     JNLP_REPLICAS: 3
-    JNLP_TAG: r188552
+    JNLP_TAG: r189021
     JNLP_VERSION: v1  # default v1, v2 for canary
-    DEPLOY_ENV: k8s-1 # 可以选择把应用部署到集群:k8s-1 or k8s-2
+    DEPLOY_ENV: k8s-4 # 可以选择把应用部署到集群:k8s-1 or k8s-2
     JNLP_REPO: hub.evbj.easou.com
     JNLP_CONTAINER_PORT: 80
     JNLP_INGRESS: nginx
@@ -45,6 +45,8 @@ steps:
     - python3 /root/tools.py -b
     # 部署服务到kubernetes上
     - python3 /root/tools.py -a
+    # 检查服务部署状态
+    - python3 /root/tools.py -c
     # 添加dns解析记录,生成访问域名
     - python3 /root/tools.py -d
 
@@ -54,8 +56,8 @@ steps:
     corpid: ww419ee4063735e1c0
     corp_secret: zpiRBLETH9eLwIMQ4eJ_r_dcm3BPSGeLHvTcft8Ot-M
     agent_id: 1000004
-    title: "Pipeline pro/offline-process-charge:r188552 Success"
-    description: "${DRONE_BUILD_LINK} pro/offline-process-charge:r188552 部署完成 重新推送25号以来的海外支付订单,用于给烟民校验数据"
+    title: "Pipeline pro/offline-process-charge:r189021 Success"
+    description: "${DRONE_BUILD_LINK} pro/offline-process-charge:r189021 部署完成 重新推送25号以来的海外支付订单,用于给烟民校验数据"
     msg_url: ${DRONE_BUILD_LINK}
     btn_txt: "否"
   when:
@@ -68,7 +70,7 @@ steps:
     corpid: ww419ee4063735e1c0
     corp_secret: zpiRBLETH9eLwIMQ4eJ_r_dcm3BPSGeLHvTcft8Ot-M
     agent_id: 1000004
-    title: "Pipeline pro/offline-process-charge:r188552 Failure"
+    title: "Pipeline pro/offline-process-charge:r189021 Failure"
     description: "${DRONE_BUILD_LINK} 部署失败,请检查配置!重新推送25号以来的海外支付订单,用于给烟民校验数据"
     msg_url: ${DRONE_BUILD_LINK}
     btn_txt: "否"

+ 1 - 1
Dockerfile

@@ -1 +1 @@
-FROM hub.evbj.easou.com/pro/offline-process-charge:r188552
+FROM hub.evbj.easou.com/pro/offline-process-charge:r189021

+ 40 - 33
deploy-tmp.yaml

@@ -17,13 +17,20 @@ spec:
       labels:
         app: offline-process-charge
     spec:
-      terminationGracePeriodSeconds: 30
-      dnsPolicy: None
+      terminationGracePeriodSeconds: 180
+      dnsPolicy: "None"
       dnsConfig:
         nameservers:
           - 223.5.5.5
           - 10.108.30.101
           - 10.26.22.50
+        searches:
+          - pro.svc.cluster.local
+          - svc.cluster.local
+          - cluster.local
+        options:
+          - name: ndots
+            value: "5"
       initContainers:
         - name: init
           image: hub.evbj.easou.com/dev/busybox
@@ -34,21 +41,21 @@ spec:
               mountPath: /data
       #nodeSelector:
       #  app.touchrs: touchrs
-#      affinity:
-#        podAntiAffinity:
-#          preferredDuringSchedulingIgnoredDuringExecution:
-#          - weight: 100
-#            podAffinityTerm:
-#              labelSelector:
-#                matchExpressions:
-#                - key: app
-#                  operator: In
-#                  values:
-#                  - offline-process-charge
-#              topologyKey: kubernetes.io/hostname
+      affinity:
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+          - weight: 100
+            podAffinityTerm:
+              labelSelector:
+                matchExpressions:
+                - key: app
+                  operator: In
+                  values:
+                  - offline-process-charge
+              topologyKey: kubernetes.io/hostname
       containers:
         - name: offline-process-charge
-          image: hub.evbj.easou.com/pro/offline-process-charge:r188552
+          image: hub.evbj.easou.com/pro/offline-process-charge:r189021
           imagePullPolicy: IfNotPresent
           env:
             - name: MY_NODE_NAME
@@ -100,22 +107,22 @@ spec:
               port: 8080
             initialDelaySeconds: 40
             periodSeconds: 15
-#        - image: hub.evbj.easou.com/pro/filebeat:7.13.3
-#          imagePullPolicy: IfNotPresent
-#          name: filebeat
-#          volumeMounts:
-#            - name: volume #日志同时挂载在nginx和filebeat中
-#              mountPath: /data
-#            - name: filebeat-config
-#              mountPath: /usr/share/filebeat/filebeat.yml
-#              subPath: filebeat.yml
-#      volumes:
-#        - name: filebeat-config
-#          configMap:
-#            name: filebeat-config-offline-process-charge
-#            items:
-#              - key: filebeat.yml
-#                path: filebeat.yml
+        - image: hub.evbj.easou.com/pro/filebeat:7.13.3
+          imagePullPolicy: IfNotPresent
+          name: filebeat
+          volumeMounts:
+            - name: volume #日志同时挂载在nginx和filebeat中
+              mountPath: /data
+            - name: filebeat-config
+              mountPath: /usr/share/filebeat/filebeat.yml
+              subPath: filebeat.yml
+      volumes:
+        - name: filebeat-config
+          configMap:
+            name: filebeat-config-offline-process-charge
+            items:
+              - key: filebeat.yml
+                path: filebeat.yml
 
   volumeClaimTemplates:
     - metadata:
@@ -149,18 +156,18 @@ metadata:
   name: offline-process-charge-ingress
   namespace: pro
 spec:
+  ingressClassName: nginx
   rules:
     - host: pro-offline-process-charge.ieasou.cn
       http:
         paths:
           - path: /
-            pathType: Prefix
+            pathType: ImplementationSpecific
             backend:
               service:
                 name: offline-process-charge-svc
                 port:
                   number: 8080
-  ingressClassName: nginx
 ---
 apiVersion: v1
 kind: ConfigMap

+ 4 - 2
drone.template.yml

@@ -15,7 +15,7 @@ steps:
    - git clone $DRONE_GIT_HTTP_URL .
 
 - name: deployment
-  image: hub.evbj.easou.com/dev/drone-agent:v3.0.1-230506
+  image: hub.evbj.easou.com/dev/drone-agent:v3.0.1-230721
   pull: always
   # privileged: true
   environment:
@@ -23,7 +23,7 @@ steps:
     JNLP_REPLICAS: [REPLICA]
     JNLP_TAG: [TAG]
     JNLP_VERSION: v1  # default v1, v2 for canary
-    DEPLOY_ENV: k8s-1 # 可以选择把应用部署到集群:k8s-1 or k8s-2
+    DEPLOY_ENV: k8s-4 # 可以选择把应用部署到集群:k8s-1 or k8s-2
     JNLP_REPO: hub.evbj.easou.com
     JNLP_CONTAINER_PORT: 80
     JNLP_INGRESS: nginx
@@ -45,6 +45,8 @@ steps:
     - python3 /root/tools.py -b
     # 部署服务到kubernetes上
     - python3 /root/tools.py -a
+    # 检查服务部署状态
+    - python3 /root/tools.py -c
     # 添加dns解析记录,生成访问域名
     - python3 /root/tools.py -d