소스 검색

deploy pro/offline-process-charge-callback:r170260 去掉activemq相关配置和代码

datard 3 년 전
부모
커밋
93f7096eba
3개의 변경된 파일15개의 추가작업 그리고 15개의 파일을 삭제
  1. 6 6
      .drone.yml
  2. 1 1
      Dockerfile
  3. 8 8
      deploy-tmp.yaml

+ 6 - 6
.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-charge-callback
+    repo: hub.evbj.easou.com/pro/offline-process-charge-callback
     tag: r170260
 #    build_args:
-#      - JAR_FILE=offline-process-charge-callback-test.jar
+#      - JAR_FILE=offline-process-charge-callback-product.jar
 #      - SERVER_PORT=8080
 
 - name: deployment
@@ -33,7 +33,7 @@ steps:
   pull: always
   # privileged: true
   environment:
-    JNLP_ENV: qa
+    JNLP_ENV: pro
     JNLP_REPLICAS: 2
     JNLP_TAG: r170260
     JNLP_VERSION: v1  # default v1, v2 for canary
@@ -70,8 +70,8 @@ steps:
     corpid: ww419ee4063735e1c0
     corp_secret: zpiRBLETH9eLwIMQ4eJ_r_dcm3BPSGeLHvTcft8Ot-M
     agent_id: 1000004
-    title: "Pipeline qa/offline-process-charge-callback:r170260 Success"
-    description: "${DRONE_BUILD_LINK} qa/offline-process-charge-callback:r170260 部署完成 去掉activemq相关配置和代码"
+    title: "Pipeline pro/offline-process-charge-callback:r170260 Success"
+    description: "${DRONE_BUILD_LINK} pro/offline-process-charge-callback:r170260 部署完成 去掉activemq相关配置和代码"
     msg_url: ${DRONE_BUILD_LINK}
     btn_txt: "否"
   when:
@@ -84,7 +84,7 @@ steps:
     corpid: ww419ee4063735e1c0
     corp_secret: zpiRBLETH9eLwIMQ4eJ_r_dcm3BPSGeLHvTcft8Ot-M
     agent_id: 1000004
-    title: "Pipeline qa/offline-process-charge-callback:r170260 Failure"
+    title: "Pipeline pro/offline-process-charge-callback:r170260 Failure"
     description: "${DRONE_BUILD_LINK} 部署失败,请检查配置!去掉activemq相关配置和代码"
     msg_url: ${DRONE_BUILD_LINK}
     btn_txt: "否"

+ 1 - 1
Dockerfile

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

+ 8 - 8
deploy-tmp.yaml

@@ -3,7 +3,7 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: offline-process-charge-callback
-  namespace: qa
+  namespace: pro
   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/qa/offline-process-charge-callback:r170260
+          image: hub.evbj.easou.com/pro/offline-process-charge-callback:r170260
           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-charge-callback-svc
-  namespace: qa
+  namespace: pro
   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: qa
+  namespace: pro
   annotations:
     kubernetes.io/ingress.class: nginx
 spec:
   rules:
-    - host: qa-offline-process-charge-callback.ieasou.cn
+    - host: pro-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: qa
+  namespace: pro
 data:
   filebeat.yml: |
     filebeat.inputs:
@@ -178,7 +178,7 @@ data:
     output.kafka:
       version: 2.0.0
       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'
       required_acks: 1
       partition.round_robin: