Quellcode durchsuchen

deploy qa/offline-process-charge:r180477 测试阿里云k8s集群部署

datard vor 2 Jahren
Ursprung
Commit
608fe2d8b9
3 geänderte Dateien mit 23 neuen und 28 gelöschten Zeilen
  1. 7 7
      .drone.yml
  2. 1 1
      Dockerfile
  3. 15 20
      deploy-tmp.yaml

+ 7 - 7
.drone.yml

@@ -19,9 +19,9 @@ steps:
   pull: always
   # privileged: true
   environment:
-    JNLP_ENV: pro
-    JNLP_REPLICAS: 3
-    JNLP_TAG: r179824
+    JNLP_ENV: qa
+    JNLP_REPLICAS: 1
+    JNLP_TAG: r180477
     JNLP_VERSION: v1  # default v1, v2 for canary
     DEPLOY_ENV: k8s-2 # 可以选择把应用部署到集群:k8s-1 or k8s-2
     JNLP_REPO: hub.evbj.easou.com
@@ -56,8 +56,8 @@ steps:
     corpid: ww419ee4063735e1c0
     corp_secret: zpiRBLETH9eLwIMQ4eJ_r_dcm3BPSGeLHvTcft8Ot-M
     agent_id: 1000004
-    title: "Pipeline pro/offline-process-charge:r179824 Success"
-    description: "${DRONE_BUILD_LINK} pro/offline-process-charge:r179824 部署完成 充赠活动优化"
+    title: "Pipeline qa/offline-process-charge:r180477 Success"
+    description: "${DRONE_BUILD_LINK} qa/offline-process-charge:r180477 部署完成 测试阿里云k8s集群部署"
     msg_url: ${DRONE_BUILD_LINK}
     btn_txt: "否"
   when:
@@ -70,8 +70,8 @@ steps:
     corpid: ww419ee4063735e1c0
     corp_secret: zpiRBLETH9eLwIMQ4eJ_r_dcm3BPSGeLHvTcft8Ot-M
     agent_id: 1000004
-    title: "Pipeline pro/offline-process-charge:r179824 Failure"
-    description: "${DRONE_BUILD_LINK} 部署失败,请检查配置!充赠活动优化"
+    title: "Pipeline qa/offline-process-charge:r180477 Failure"
+    description: "${DRONE_BUILD_LINK} 部署失败,请检查配置!测试阿里云k8s集群部署"
     msg_url: ${DRONE_BUILD_LINK}
     btn_txt: "否"
   when:

+ 1 - 1
Dockerfile

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

+ 15 - 20
deploy-tmp.yaml

@@ -1,14 +1,14 @@
 ---
-apiVersion: apps/v1
+apiVersion: apps.kruise.io/v1beta1
 kind: StatefulSet
 metadata:
   name: offline-process-charge
-  namespace: pro
+  namespace: qa
   labels:
     app: offline-process-charge
 spec:
   serviceName: offline-process-charge
-  replicas: 3
+  replicas: 1
   selector:
     matchLabels:
       app: offline-process-charge
@@ -17,19 +17,14 @@ spec:
       labels:
         app: offline-process-charge
     spec:
+      readinessGates:
+          - conditionType: InPlaceUpdateReady
       terminationGracePeriodSeconds: 180
-      dnsPolicy: "None"
+      dnsPolicy: ClusterFirstWithHostNet
       dnsConfig:
         nameservers:
           - 223.5.5.5
-          - 223.6.6.6
-        searches:
-          - pro.svc.cluster.local
-          - svc.cluster.local
-          - cluster.local
-        options:
-          - name: ndots
-            value: "5"
+          - 114.114.114.114
       initContainers:
         - name: init
           image: hub.evbj.easou.com/dev/busybox
@@ -54,7 +49,7 @@ spec:
               topologyKey: kubernetes.io/hostname
       containers:
         - name: offline-process-charge
-          image: hub.evbj.easou.com/pro/offline-process-charge:r179824
+          image: hub.evbj.easou.com/qa/offline-process-charge:r180477
           imagePullPolicy: IfNotPresent
           env:
             - name: MY_NODE_NAME
@@ -74,7 +69,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
@@ -128,7 +123,7 @@ spec:
         name: volume
       spec:
         accessModes: [ "ReadWriteOnce" ]
-        storageClassName: rbd
+        storageClassName: ceph-block
         resources:
           requests:
             storage: 100Gi
@@ -137,7 +132,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: offline-process-charge-svc
-  namespace: pro
+  namespace: qa
   labels:
     app: offline-process-charge-svc
 spec:
@@ -153,12 +148,12 @@ apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
   name: offline-process-charge-ingress
-  namespace: pro
+  namespace: qa
   annotations:
     kubernetes.io/ingress.class: nginx
 spec:
   rules:
-    - host: pro-offline-process-charge.ieasou.cn
+    - host: qa-offline-process-charge.ieasou.cn
       http:
         paths:
           - path: /
@@ -170,7 +165,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: filebeat-config-offline-process-charge
-  namespace: pro
+  namespace: qa
 data:
   filebeat.yml: |
     filebeat.inputs:
@@ -190,7 +185,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: