浏览代码

deploy qa/offline-process-promotion:r192265 优化ios支付

pmrd 1 年之前
父节点
当前提交
015c7bc9b6
共有 4 个文件被更改,包括 42 次插入53 次删除
  1. 6 8
      .drone.yml
  2. 1 1
      Dockerfile
  3. 33 40
      deploy-tmp.yaml
  4. 2 4
      drone.template.yml

+ 6 - 8
.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-230721
+  image: hub.evbj.easou.com/dev/drone-agent:v3.0.1-230506
   pull: always
   # privileged: true
   environment:
     JNLP_ENV: qa
     JNLP_REPLICAS: 1
-    JNLP_TAG: r192231
+    JNLP_TAG: r192265
     JNLP_VERSION: v1  # default v1, v2 for canary
-    DEPLOY_ENV: k8s-4 # 可以选择把应用部署到集群:k8s-1 or k8s-2
+    DEPLOY_ENV: k8s-1 # 可以选择把应用部署到集群:k8s-1 or k8s-2
     JNLP_REPO: hub.evbj.easou.com
     JNLP_CONTAINER_PORT: 80
     JNLP_INGRESS: nginx
@@ -45,8 +45,6 @@ steps:
     - python3 /root/tools.py -b
     # 部署服务到kubernetes上
     - python3 /root/tools.py -a
-    # 检查服务部署状态
-    - python3 /root/tools.py -c
     # 添加dns解析记录,生成访问域名
     - python3 /root/tools.py -d
 
@@ -56,8 +54,8 @@ steps:
     corpid: ww419ee4063735e1c0
     corp_secret: zpiRBLETH9eLwIMQ4eJ_r_dcm3BPSGeLHvTcft8Ot-M
     agent_id: 1000004
-    title: "Pipeline qa/offline-process-promotion:r192231 Success"
-    description: "${DRONE_BUILD_LINK} qa/offline-process-promotion:r192231 部署完成 优化ios支付"
+    title: "Pipeline qa/offline-process-promotion:r192265 Success"
+    description: "${DRONE_BUILD_LINK} qa/offline-process-promotion:r192265 部署完成 优化ios支付"
     msg_url: ${DRONE_BUILD_LINK}
     btn_txt: "否"
   when:
@@ -70,7 +68,7 @@ steps:
     corpid: ww419ee4063735e1c0
     corp_secret: zpiRBLETH9eLwIMQ4eJ_r_dcm3BPSGeLHvTcft8Ot-M
     agent_id: 1000004
-    title: "Pipeline qa/offline-process-promotion:r192231 Failure"
+    title: "Pipeline qa/offline-process-promotion:r192265 Failure"
     description: "${DRONE_BUILD_LINK} 部署失败,请检查配置!优化ios支付"
     msg_url: ${DRONE_BUILD_LINK}
     btn_txt: "否"

+ 1 - 1
Dockerfile

@@ -1 +1 @@
-FROM hub.evbj.easou.com/qa/offline-process-promotion:r192231
+FROM hub.evbj.easou.com/qa/offline-process-promotion:r192265

+ 33 - 40
deploy-tmp.yaml

@@ -17,20 +17,13 @@ spec:
       labels:
         app: offline-process-promotion
     spec:
-      terminationGracePeriodSeconds: 180
-      dnsPolicy: "None"
+      terminationGracePeriodSeconds: 30
+      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
@@ -41,21 +34,21 @@ spec:
               mountPath: /data
       #nodeSelector:
       #  app.touchrs: touchrs
-      affinity:
-        podAntiAffinity:
-          preferredDuringSchedulingIgnoredDuringExecution:
-          - weight: 100
-            podAffinityTerm:
-              labelSelector:
-                matchExpressions:
-                - key: app
-                  operator: In
-                  values:
-                  - offline-process-promotion
-              topologyKey: kubernetes.io/hostname
+#      affinity:
+#        podAntiAffinity:
+#          preferredDuringSchedulingIgnoredDuringExecution:
+#          - weight: 100
+#            podAffinityTerm:
+#              labelSelector:
+#                matchExpressions:
+#                - key: app
+#                  operator: In
+#                  values:
+#                  - offline-process-promotion
+#              topologyKey: kubernetes.io/hostname
       containers:
         - name: offline-process-promotion
-          image: hub.evbj.easou.com/qa/offline-process-promotion:r192231
+          image: hub.evbj.easou.com/qa/offline-process-promotion:r192265
           imagePullPolicy: IfNotPresent
           env:
             - name: MY_NODE_NAME
@@ -107,22 +100,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-promotion
-            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-promotion
+#            items:
+#              - key: filebeat.yml
+#                path: filebeat.yml
 
   volumeClaimTemplates:
     - metadata:
@@ -156,18 +149,18 @@ metadata:
   name: offline-process-promotion-ingress
   namespace: qa
 spec:
-  ingressClassName: nginx
   rules:
     - host: qa-offline-process-promotion.ieasou.cn
       http:
         paths:
           - path: /
-            pathType: ImplementationSpecific
+            pathType: Prefix
             backend:
               service:
                 name: offline-process-promotion-svc
                 port:
                   number: 8080
+  ingressClassName: nginx
 ---
 apiVersion: v1
 kind: ConfigMap

+ 2 - 4
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-230721
+  image: hub.evbj.easou.com/dev/drone-agent:v3.0.1-230506
   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-4 # 可以选择把应用部署到集群:k8s-1 or k8s-2
+    DEPLOY_ENV: k8s-1 # 可以选择把应用部署到集群:k8s-1 or k8s-2
     JNLP_REPO: hub.evbj.easou.com
     JNLP_CONTAINER_PORT: 80
     JNLP_INGRESS: nginx
@@ -45,8 +45,6 @@ steps:
     - python3 /root/tools.py -b
     # 部署服务到kubernetes上
     - python3 /root/tools.py -a
-    # 检查服务部署状态
-    - python3 /root/tools.py -c
     # 添加dns解析记录,生成访问域名
     - python3 /root/tools.py -d