Pārlūkot izejas kodu

deploy qa/offline-process-eavideo-charge-callback:r194383 eashort

pmrd 1 gadu atpakaļ
vecāks
revīzija
b3109112bd
3 mainītis faili ar 20 papildinājumiem un 16 dzēšanām
  1. 6 6
      .drone.yml
  2. 1 1
      Dockerfile
  3. 13 9
      deploy-tmp.yaml

+ 6 - 6
.drone.yml

@@ -19,9 +19,9 @@ steps:
   pull: always
   # privileged: true
   environment:
-    JNLP_ENV: pro
-    JNLP_REPLICAS: 2
-    JNLP_TAG: r194231
+    JNLP_ENV: qa
+    JNLP_REPLICAS: 1
+    JNLP_TAG: r194383
     JNLP_VERSION: v1  # default v1, v2 for canary
     DEPLOY_ENV: k8s-1 # 可以选择把应用部署到集群:k8s-1 or k8s-2
     JNLP_REPO: hub.evbj.easou.com
@@ -54,8 +54,8 @@ steps:
     corpid: ww419ee4063735e1c0
     corp_secret: zpiRBLETH9eLwIMQ4eJ_r_dcm3BPSGeLHvTcft8Ot-M
     agent_id: 1000004
-    title: "Pipeline pro/offline-process-eavideo-charge-callback:r194231 Success"
-    description: "${DRONE_BUILD_LINK} pro/offline-process-eavideo-charge-callback:r194231 部署完成 eashort"
+    title: "Pipeline qa/offline-process-eavideo-charge-callback:r194383 Success"
+    description: "${DRONE_BUILD_LINK} qa/offline-process-eavideo-charge-callback:r194383 部署完成 eashort"
     msg_url: ${DRONE_BUILD_LINK}
     btn_txt: "否"
   when:
@@ -68,7 +68,7 @@ steps:
     corpid: ww419ee4063735e1c0
     corp_secret: zpiRBLETH9eLwIMQ4eJ_r_dcm3BPSGeLHvTcft8Ot-M
     agent_id: 1000004
-    title: "Pipeline pro/offline-process-eavideo-charge-callback:r194231 Failure"
+    title: "Pipeline qa/offline-process-eavideo-charge-callback:r194383 Failure"
     description: "${DRONE_BUILD_LINK} 部署失败,请检查配置!eashort"
     msg_url: ${DRONE_BUILD_LINK}
     btn_txt: "否"

+ 1 - 1
Dockerfile

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

+ 13 - 9
deploy-tmp.yaml

@@ -3,12 +3,12 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: offline-process-eavideo-charge-callback
-  namespace: pro
+  namespace: qa
   labels:
     app: offline-process-eavideo-charge-callback
 spec:
   serviceName: offline-process-eavideo-charge-callback
-  replicas: 2
+  replicas: 1
   selector:
     matchLabels:
       app: offline-process-eavideo-charge-callback
@@ -24,6 +24,10 @@ spec:
           - 223.5.5.5
           - 10.108.30.101
           - 10.26.22.50
+      hostAliases:
+        - ip: 10.40.23.25
+          hostnames:
+            - smtp.easou.cn
       initContainers:
         - name: init
           image: hub.evbj.easou.com/dev/busybox
@@ -48,7 +52,7 @@ spec:
 #              topologyKey: kubernetes.io/hostname
       containers:
         - name: offline-process-eavideo-charge-callback
-          image: hub.evbj.easou.com/pro/offline-process-eavideo-charge-callback:r194231
+          image: hub.evbj.easou.com/qa/offline-process-eavideo-charge-callback:r194383
           imagePullPolicy: IfNotPresent
           env:
             - name: MY_NODE_NAME
@@ -68,7 +72,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
@@ -131,7 +135,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: offline-process-eavideo-charge-callback-svc
-  namespace: pro
+  namespace: qa
   labels:
     app: offline-process-eavideo-charge-callback-svc
 spec:
@@ -147,10 +151,10 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: offline-process-eavideo-charge-callback-ingress
-  namespace: pro
+  namespace: qa
 spec:
   rules:
-    - host: zfapp-eashort.appeasou.com
+    - host: qa-offline-process-eavideo-charge-callback.ieasou.cn
       http:
         paths:
           - path: /
@@ -166,7 +170,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: filebeat-config-offline-process-eavideo-charge-callback
-  namespace: pro
+  namespace: qa
 data:
   filebeat.yml: |
     filebeat.inputs:
@@ -186,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-eavideo-topic'
       required_acks: 1
       partition.round_robin: