Browse Source

deploy pro/offline-process-promotion:r169896 修改kafka模板

datard 3 years ago
parent
commit
572c1f0779
3 changed files with 18 additions and 18 deletions
  1. 9 9
      .drone.yml
  2. 1 1
      Dockerfile
  3. 8 8
      deploy-tmp.yaml

+ 9 - 9
.drone.yml

@@ -22,10 +22,10 @@ steps:
     insecure: true
     mirror: https://ci7pm4nx.mirror.aliyuncs.com
     registry: hub.evbj.easou.com
-    repo: hub.evbj.easou.com/qa/offline-process-promotion
-    tag: r169858
+    repo: hub.evbj.easou.com/pro/offline-process-promotion
+    tag: r169896
 #    build_args:
-#      - JAR_FILE=offline-process-promotion-test.jar
+#      - JAR_FILE=offline-process-promotion-product.jar
 #      - SERVER_PORT=8080
 
 - name: deployment
@@ -33,9 +33,9 @@ steps:
   pull: always
   # privileged: true
   environment:
-    JNLP_ENV: qa
+    JNLP_ENV: pro
     JNLP_REPLICAS: 4
-    JNLP_TAG: r169858
+    JNLP_TAG: r169896
     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 +70,8 @@ steps:
     corpid: ww419ee4063735e1c0
     corp_secret: zpiRBLETH9eLwIMQ4eJ_r_dcm3BPSGeLHvTcft8Ot-M
     agent_id: 1000004
-    title: "Pipeline qa/offline-process-promotion:r169858 Success"
-    description: "${DRONE_BUILD_LINK} qa/offline-process-promotion:r169858 部署完成 "
+    title: "Pipeline pro/offline-process-promotion:r169896 Success"
+    description: "${DRONE_BUILD_LINK} pro/offline-process-promotion:r169896 部署完成 修改kafka模板"
     msg_url: ${DRONE_BUILD_LINK}
     btn_txt: "否"
   when:
@@ -84,8 +84,8 @@ steps:
     corpid: ww419ee4063735e1c0
     corp_secret: zpiRBLETH9eLwIMQ4eJ_r_dcm3BPSGeLHvTcft8Ot-M
     agent_id: 1000004
-    title: "Pipeline qa/offline-process-promotion:r169858 Failure"
-    description: "${DRONE_BUILD_LINK} 部署失败,请检查配置!"
+    title: "Pipeline pro/offline-process-promotion:r169896 Failure"
+    description: "${DRONE_BUILD_LINK} 部署失败,请检查配置!修改kafka模板"
     msg_url: ${DRONE_BUILD_LINK}
     btn_txt: "否"
   when:

+ 1 - 1
Dockerfile

@@ -1 +1 @@
-FROM hub.evbj.easou.com/qa/offline-process-promotion:r169858
+FROM hub.evbj.easou.com/pro/offline-process-promotion:r169896

+ 8 - 8
deploy-tmp.yaml

@@ -3,7 +3,7 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: offline-process-promotion
-  namespace: qa
+  namespace: pro
   labels:
     app: offline-process-promotion
 spec:
@@ -42,7 +42,7 @@ spec:
               topologyKey: kubernetes.io/hostname
       containers:
         - name: offline-process-promotion
-          image: hub.evbj.easou.com/qa/offline-process-promotion:r169858
+          image: hub.evbj.easou.com/pro/offline-process-promotion:r169896
           imagePullPolicy: IfNotPresent
           env:
             - name: MY_NODE_NAME
@@ -62,7 +62,7 @@ spec:
                 fieldRef:
                   fieldPath: metadata.namespace
             - name: JAVA_OPTS
-              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"
+              value: "-server  -Xmx2g -Xms2g -Xss512k -Djava.awt.headless=true -Djava.security.egd=file:/dev/./urandom -Dspring.profiles.active=product"
           ports:
             - containerPort: 8080
               name: port
@@ -125,7 +125,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: offline-process-promotion-svc
-  namespace: qa
+  namespace: pro
   labels:
     app: offline-process-promotion-svc
 spec:
@@ -141,12 +141,12 @@ apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
   name: offline-process-promotion-ingress
-  namespace: qa
+  namespace: pro
   annotations:
     kubernetes.io/ingress.class: nginx
 spec:
   rules:
-    - host: qa-offline-process-promotion.ieasou.cn
+    - host: pro-offline-process-promotion.ieasou.cn
       http:
         paths:
           - path: /
@@ -158,7 +158,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: filebeat-config-offline-process-promotion
-  namespace: qa
+  namespace: pro
 data:
   filebeat.yml: |
     filebeat.inputs:
@@ -177,7 +177,7 @@ data:
         - "/data/logs/*.log"
     output.kafka:
       enable: true
-      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"]
+      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"]
       topic: 'offline-process-topic'
       partition.round_robin:
         reachable_only: false