Prechádzať zdrojové kódy

deploy qa/offline-process-charge-callback:r170452 增加脚本注释

datard 3 rokov pred
rodič
commit
c9189a1e88
4 zmenil súbory, kde vykonal 18 pridanie a 45 odobranie
  1. 6 20
      .drone.yml
  2. 1 1
      Dockerfile
  3. 8 8
      deploy-tmp.yaml
  4. 3 16
      drone.template.yml

+ 6 - 20
.drone.yml

@@ -14,28 +14,14 @@ steps:
   commands:
    - git clone $DRONE_GIT_HTTP_URL .
 
-- name: build
-  image: plugins/docker
-  settings:
-    username: admin
-    password: Easou2)1*
-    insecure: true
-    mirror: https://ci7pm4nx.mirror.aliyuncs.com
-    registry: hub.evbj.easou.com
-    repo: hub.evbj.easou.com/pro/offline-process-charge-callback
-    tag: r170272
-#    build_args:
-#      - JAR_FILE=offline-process-charge-callback-product.jar
-#      - SERVER_PORT=8080
-
 - name: deployment
   image: hub.evbj.easou.com/dev/drone-agent:v2.0.0
   pull: always
   # privileged: true
   environment:
-    JNLP_ENV: pro
+    JNLP_ENV: qa
     JNLP_REPLICAS: 2
-    JNLP_TAG: r170272
+    JNLP_TAG: r170452
     JNLP_VERSION: v1  # default v1, v2 for canary
     DEPLOY_ENV: k8s-2 # 可以选择把应用部署到集群:k8s-1 or k8s-2
     JNLP_REPO: hub.evbj.easou.com
@@ -70,8 +56,8 @@ steps:
     corpid: ww419ee4063735e1c0
     corp_secret: zpiRBLETH9eLwIMQ4eJ_r_dcm3BPSGeLHvTcft8Ot-M
     agent_id: 1000004
-    title: "Pipeline pro/offline-process-charge-callback:r170272 Success"
-    description: "${DRONE_BUILD_LINK} pro/offline-process-charge-callback:r170272 部署完成 去掉activemq相关配置和代码"
+    title: "Pipeline qa/offline-process-charge-callback:r170452 Success"
+    description: "${DRONE_BUILD_LINK} qa/offline-process-charge-callback:r170452 部署完成 增加脚本注释"
     msg_url: ${DRONE_BUILD_LINK}
     btn_txt: "否"
   when:
@@ -84,8 +70,8 @@ steps:
     corpid: ww419ee4063735e1c0
     corp_secret: zpiRBLETH9eLwIMQ4eJ_r_dcm3BPSGeLHvTcft8Ot-M
     agent_id: 1000004
-    title: "Pipeline pro/offline-process-charge-callback:r170272 Failure"
-    description: "${DRONE_BUILD_LINK} 部署失败,请检查配置!去掉activemq相关配置和代码"
+    title: "Pipeline qa/offline-process-charge-callback:r170452 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:r170272
+FROM hub.evbj.easou.com/qa/offline-process-charge-callback:r170452

+ 8 - 8
deploy-tmp.yaml

@@ -3,7 +3,7 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: offline-process-charge-callback
-  namespace: pro
+  namespace: qa
   labels:
     app: offline-process-charge-callback
 spec:
@@ -42,7 +42,7 @@ spec:
               topologyKey: kubernetes.io/hostname
       containers:
         - name: offline-process-charge-callback
-          image: hub.evbj.easou.com/pro/offline-process-charge-callback:r170272
+          image: hub.evbj.easou.com/qa/offline-process-charge-callback:r170452
           imagePullPolicy: IfNotPresent
           env:
             - name: MY_NODE_NAME
@@ -62,7 +62,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
@@ -125,7 +125,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: offline-process-charge-callback-svc
-  namespace: pro
+  namespace: qa
   labels:
     app: offline-process-charge-callback-svc
 spec:
@@ -141,12 +141,12 @@ 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: /
@@ -158,7 +158,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: filebeat-config-offline-process-charge-callback
-  namespace: pro
+  namespace: qa
 data:
   filebeat.yml: |
     filebeat.inputs:
@@ -178,7 +178,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:

+ 3 - 16
drone.template.yml

@@ -14,20 +14,6 @@ steps:
   commands:
    - git clone $DRONE_GIT_HTTP_URL .
 
-- name: build
-  image: plugins/docker
-  settings:
-    username: admin
-    password: Easou2)1*
-    insecure: true
-    mirror: https://ci7pm4nx.mirror.aliyuncs.com
-    registry: hub.evbj.easou.com
-    repo: hub.evbj.easou.com/[ENV]/[APP]
-    tag: [TAG]
-#    build_args:
-#      - JAR_FILE=[JAR_FILE]
-#      - SERVER_PORT=8080
-
 - name: deployment
   image: hub.evbj.easou.com/dev/drone-agent:v2.0.0
   pull: always
@@ -51,6 +37,7 @@ steps:
     JNLP_LIVENESS_PER: 15
     JNLP_READINESS_INIT: 30
     JNLP_READINESS_PER: 15
+    JNLP_INGRESS_PUB: [EXPOSE]
   commands:
     # 切换目标集群
     - kubecm s $DEPLOY_ENV
@@ -70,7 +57,7 @@ steps:
     corp_secret: zpiRBLETH9eLwIMQ4eJ_r_dcm3BPSGeLHvTcft8Ot-M
     agent_id: 1000004
     title: "Pipeline [ENV]/[APP]:[TAG] Success"
-    description: "${DRONE_BUILD_LINK} [ENV]/[APP]:[TAG] 部署完成"
+    description: "${DRONE_BUILD_LINK} [ENV]/[APP]:[TAG] 部署完成 [DEPLOY_MSG]"
     msg_url: ${DRONE_BUILD_LINK}
     btn_txt: "否"
   when:
@@ -84,7 +71,7 @@ steps:
     corp_secret: zpiRBLETH9eLwIMQ4eJ_r_dcm3BPSGeLHvTcft8Ot-M
     agent_id: 1000004
     title: "Pipeline [ENV]/[APP]:[TAG] Failure"
-    description: "${DRONE_BUILD_LINK} 部署失败,请检查配置!"
+    description: "${DRONE_BUILD_LINK} 部署失败,请检查配置![DEPLOY_MSG]"
     msg_url: ${DRONE_BUILD_LINK}
     btn_txt: "否"
   when: