Преглед изворни кода

deploy qa/offline-process-charge-callback:r182596 连续畅读

pmrd пре 2 година
родитељ
комит
5c35fa4297
4 измењених фајлова са 67 додато и 58 уклоњено
  1. 11 9
      .drone.yml
  2. 1 1
      Dockerfile
  3. 51 46
      deploy-tmp.yaml
  4. 4 2
      drone.template.yml

+ 11 - 9
.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
+  image: hub.evbj.easou.com/dev/drone-agent:v2.0.0
   pull: always
   # privileged: true
   environment:
-    JNLP_ENV: pro
-    JNLP_REPLICAS: 2
-    JNLP_TAG: r182009
+    JNLP_ENV: qa
+    JNLP_REPLICAS: 1
+    JNLP_TAG: r182596
     JNLP_VERSION: v1  # default v1, v2 for canary
-    DEPLOY_ENV: k8s-1 # 可以选择把应用部署到集群:k8s-1 or k8s-2
+    DEPLOY_ENV: k8s-2 # 可以选择把应用部署到集群: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-callback:r182009 Success"
-    description: "${DRONE_BUILD_LINK} pro/offline-process-charge-callback:r182009 部署完成 kafka日志"
+    title: "Pipeline qa/offline-process-charge-callback:r182596 Success"
+    description: "${DRONE_BUILD_LINK} qa/offline-process-charge-callback:r182596 部署完成 连续畅读"
     msg_url: ${DRONE_BUILD_LINK}
     btn_txt: "否"
   when:
@@ -68,8 +70,8 @@ steps:
     corpid: ww419ee4063735e1c0
     corp_secret: zpiRBLETH9eLwIMQ4eJ_r_dcm3BPSGeLHvTcft8Ot-M
     agent_id: 1000004
-    title: "Pipeline pro/offline-process-charge-callback:r182009 Failure"
-    description: "${DRONE_BUILD_LINK} 部署失败,请检查配置!kafka日志"
+    title: "Pipeline qa/offline-process-charge-callback:r182596 Failure"
+    description: "${DRONE_BUILD_LINK} 部署失败,请检查配置!连续畅读"
     msg_url: ${DRONE_BUILD_LINK}
     btn_txt: "否"
   when:

+ 1 - 1
Dockerfile

@@ -1 +1 @@
-FROM hub.evbj.easou.com/pro/offline-process-charge-callback:r182009
+FROM hub.evbj.easou.com/qa/offline-process-charge-callback:r182596

+ 51 - 46
deploy-tmp.yaml

@@ -3,12 +3,12 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: offline-process-charge-callback
-  namespace: pro
+  namespace: qa
   labels:
     app: offline-process-charge-callback
 spec:
   serviceName: offline-process-charge-callback
-  replicas: 2
+  replicas: 1
   selector:
     matchLabels:
       app: offline-process-charge-callback
@@ -17,12 +17,19 @@ spec:
       labels:
         app: offline-process-charge-callback
     spec:
-      terminationGracePeriodSeconds: 30
-      dnsPolicy: None
+      terminationGracePeriodSeconds: 180
+      dnsPolicy: "None"
       dnsConfig:
         nameservers:
           - 223.5.5.5
           - 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
@@ -33,21 +40,21 @@ spec:
               mountPath: /data
       #nodeSelector:
       #  app.touchrs: touchrs
-#      affinity:
-#        podAntiAffinity:
-#          preferredDuringSchedulingIgnoredDuringExecution:
-#          - weight: 100
-#            podAffinityTerm:
-#              labelSelector:
-#                matchExpressions:
-#                - key: app
-#                  operator: In
-#                  values:
-#                  - offline-process-charge-callback
-#              topologyKey: kubernetes.io/hostname
+      affinity:
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+          - weight: 100
+            podAffinityTerm:
+              labelSelector:
+                matchExpressions:
+                - key: app
+                  operator: In
+                  values:
+                  - offline-process-charge-callback
+              topologyKey: kubernetes.io/hostname
       containers:
         - name: offline-process-charge-callback
-          image: hub.evbj.easou.com/pro/offline-process-charge-callback:r182009
+          image: hub.evbj.easou.com/qa/offline-process-charge-callback:r182596
           imagePullPolicy: IfNotPresent
           env:
             - name: MY_NODE_NAME
@@ -67,7 +74,7 @@ spec:
                 fieldRef:
                   fieldPath: metadata.namespace
             - name: JAVA_OPTS
-              value: "-server  -Xmx2g -Xms2g -Xss512k -Djava.awt.headless=true -Djava.security.egd=file:/dev/./urandom -Dspring.profiles.active=product"
+              value: "-server  -Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=8001,suspend=n  -Xmx2g -Xms2g -Xss512k -Djava.awt.headless=true -Djava.security.egd=file:/dev/./urandom -Dspring.profiles.active=test"
           ports:
             - containerPort: 8080
               name: port
@@ -99,22 +106,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-callback
-#            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-callback
+            items:
+              - key: filebeat.yml
+                path: filebeat.yml
 
   volumeClaimTemplates:
     - metadata:
@@ -130,7 +137,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: offline-process-charge-callback-svc
-  namespace: pro
+  namespace: qa
   labels:
     app: offline-process-charge-callback-svc
 spec:
@@ -142,30 +149,28 @@ spec:
   selector:
     app: offline-process-charge-callback
 ---
-apiVersion: networking.k8s.io/v1
+apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
   name: offline-process-charge-callback-ingress
-  namespace: pro
+  namespace: qa
+  annotations:
+    kubernetes.io/ingress.class: nginx
 spec:
   rules:
-    - host: pro-offline-process-charge-callback.ieasou.cn
+    - host: qa-offline-process-charge-callback.ieasou.cn
       http:
         paths:
           - path: /
-            pathType: Prefix
             backend:
-              service:
-                name: offline-process-charge-callback-svc
-                port:
-                  number: 8080
-  ingressClassName: nginx
+              serviceName: offline-process-charge-callback-svc
+              servicePort: 80
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name: filebeat-config-offline-process-charge-callback
-  namespace: pro
+  namespace: qa
 data:
   filebeat.yml: |
     filebeat.inputs:
@@ -185,7 +190,7 @@ data:
     output.kafka:
       version: 2.0.0
       enable: true
-      hosts: ["kafka-0.kafka-headless.pro.svc.cluster.local:9093", "kafka-1.kafka-headless.pro.svc.cluster.local:9093", "kafka-2.kafka-headless.pro.svc.cluster.local:9093"]
+      hosts: ["kafka-0.kafka-headless.qa.svc.cluster.local:9093", "kafka-1.kafka-headless.qa.svc.cluster.local:9093", "kafka-2.kafka-headless.qa.svc.cluster.local:9093"]
       topic: 'offline-process-topic'
       required_acks: 1
       partition.round_robin:

+ 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
+  image: hub.evbj.easou.com/dev/drone-agent:v2.0.0
   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-2 # 可以选择把应用部署到集群: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