Browse Source

deploy qa/realtime-yuewen-v2:r187056 阅文实时接口

pmrd 1 year ago
parent
commit
cadfb808f4
3 changed files with 32 additions and 32 deletions
  1. 8 8
      .drone.yml
  2. 1 1
      Dockerfile
  3. 23 23
      deploy-tmp.yaml

+ 8 - 8
.drone.yml

@@ -1,6 +1,6 @@
 kind: pipeline
 kind: pipeline
 type: kubernetes
 type: kubernetes
-name: realtime-yuewen
+name: realtime-yuewen-v2
 
 
 clone:
 clone:
   disable: true
   disable: true
@@ -19,9 +19,9 @@ steps:
   pull: always
   pull: always
   # privileged: true
   # privileged: true
   environment:
   environment:
-    JNLP_ENV: pro
-    JNLP_REPLICAS: 2
-    JNLP_TAG: r182005
+    JNLP_ENV: qa
+    JNLP_REPLICAS: 1
+    JNLP_TAG: r187056
     JNLP_VERSION: v1  # default v1, v2 for canary
     JNLP_VERSION: v1  # default v1, v2 for canary
     DEPLOY_ENV: k8s-1 # 可以选择把应用部署到集群:k8s-1 or k8s-2
     DEPLOY_ENV: k8s-1 # 可以选择把应用部署到集群:k8s-1 or k8s-2
     JNLP_REPO: hub.evbj.easou.com
     JNLP_REPO: hub.evbj.easou.com
@@ -54,8 +54,8 @@ steps:
     corpid: ww419ee4063735e1c0
     corpid: ww419ee4063735e1c0
     corp_secret: zpiRBLETH9eLwIMQ4eJ_r_dcm3BPSGeLHvTcft8Ot-M
     corp_secret: zpiRBLETH9eLwIMQ4eJ_r_dcm3BPSGeLHvTcft8Ot-M
     agent_id: 1000004
     agent_id: 1000004
-    title: "Pipeline pro/realtime-yuewen:r182005 Success"
-    description: "${DRONE_BUILD_LINK} pro/realtime-yuewen:r182005 部署完成 阅文实时接口k8s日志收集"
+    title: "Pipeline qa/realtime-yuewen-v2:r187056 Success"
+    description: "${DRONE_BUILD_LINK} qa/realtime-yuewen-v2:r187056 部署完成 阅文实时接口"
     msg_url: ${DRONE_BUILD_LINK}
     msg_url: ${DRONE_BUILD_LINK}
     btn_txt: "否"
     btn_txt: "否"
   when:
   when:
@@ -68,8 +68,8 @@ steps:
     corpid: ww419ee4063735e1c0
     corpid: ww419ee4063735e1c0
     corp_secret: zpiRBLETH9eLwIMQ4eJ_r_dcm3BPSGeLHvTcft8Ot-M
     corp_secret: zpiRBLETH9eLwIMQ4eJ_r_dcm3BPSGeLHvTcft8Ot-M
     agent_id: 1000004
     agent_id: 1000004
-    title: "Pipeline pro/realtime-yuewen:r182005 Failure"
-    description: "${DRONE_BUILD_LINK} 部署失败,请检查配置!阅文实时接口k8s日志收集"
+    title: "Pipeline qa/realtime-yuewen-v2:r187056 Failure"
+    description: "${DRONE_BUILD_LINK} 部署失败,请检查配置!阅文实时接口"
     msg_url: ${DRONE_BUILD_LINK}
     msg_url: ${DRONE_BUILD_LINK}
     btn_txt: "否"
     btn_txt: "否"
   when:
   when:

+ 1 - 1
Dockerfile

@@ -1 +1 @@
-FROM hub.evbj.easou.com/pro/realtime-yuewen:r182005
+FROM hub.evbj.easou.com/qa/realtime-yuewen-v2:r187056

+ 23 - 23
deploy-tmp.yaml

@@ -2,20 +2,20 @@
 apiVersion: apps/v1
 apiVersion: apps/v1
 kind: StatefulSet
 kind: StatefulSet
 metadata:
 metadata:
-  name: realtime-yuewen
-  namespace: pro
+  name: realtime-yuewen-v2
+  namespace: qa
   labels:
   labels:
-    app: realtime-yuewen
+    app: realtime-yuewen-v2
 spec:
 spec:
-  serviceName: realtime-yuewen
-  replicas: 2
+  serviceName: realtime-yuewen-v2
+  replicas: 1
   selector:
   selector:
     matchLabels:
     matchLabels:
-      app: realtime-yuewen
+      app: realtime-yuewen-v2
   template:
   template:
     metadata:
     metadata:
       labels:
       labels:
-        app: realtime-yuewen
+        app: realtime-yuewen-v2
     spec:
     spec:
       terminationGracePeriodSeconds: 180
       terminationGracePeriodSeconds: 180
       dnsPolicy: ClusterFirstWithHostNet
       dnsPolicy: ClusterFirstWithHostNet
@@ -43,11 +43,11 @@ spec:
       #                - key: app
       #                - key: app
       #                  operator: In
       #                  operator: In
       #                  values:
       #                  values:
-      #                  - realtime-yuewen
+      #                  - realtime-yuewen-v2
       #              topologyKey: kubernetes.io/hostname
       #              topologyKey: kubernetes.io/hostname
       containers:
       containers:
-        - name: realtime-yuewen
-          image: hub.evbj.easou.com/pro/realtime-yuewen:r182005
+        - name: realtime-yuewen-v2
+          image: hub.evbj.easou.com/qa/realtime-yuewen-v2:r187056
           imagePullPolicy: IfNotPresent
           imagePullPolicy: IfNotPresent
           env:
           env:
             - name: MY_NODE_NAME
             - name: MY_NODE_NAME
@@ -67,7 +67,7 @@ spec:
                 fieldRef:
                 fieldRef:
                   fieldPath: metadata.namespace
                   fieldPath: metadata.namespace
             - name: JAVA_OPTS
             - 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:
           ports:
             - containerPort: 8080
             - containerPort: 8080
               name: port
               name: port
@@ -111,7 +111,7 @@ spec:
       volumes:
       volumes:
         - name: flume-config
         - name: flume-config
           configMap:
           configMap:
-            name: flume-config-realtime-yuewen
+            name: flume-config-realtime-yuewen-v2
             items:
             items:
               - key: flume.conf
               - key: flume.conf
                 path: flume.conf
                 path: flume.conf
@@ -129,10 +129,10 @@ spec:
 apiVersion: v1
 apiVersion: v1
 kind: Service
 kind: Service
 metadata:
 metadata:
-  name: realtime-yuewen-svc
-  namespace: pro
+  name: realtime-yuewen-v2-svc
+  namespace: qa
   labels:
   labels:
-    app: realtime-yuewen-svc
+    app: realtime-yuewen-v2-svc
 spec:
 spec:
   type: NodePort
   type: NodePort
   ports:
   ports:
@@ -140,13 +140,13 @@ spec:
       targetPort: 8080
       targetPort: 8080
       name: "main"
       name: "main"
   selector:
   selector:
-    app: realtime-yuewen
+    app: realtime-yuewen-v2
 ---
 ---
 apiVersion: networking.k8s.io/v1
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 kind: Ingress
 metadata:
 metadata:
-  name: realtime-yuewen-ingress
-  namespace: pro
+  name: realtime-yuewen-v2-ingress
+  namespace: qa
 spec:
 spec:
   rules:
   rules:
     - host: ywrealtime.appeasou.com
     - host: ywrealtime.appeasou.com
@@ -156,17 +156,17 @@ spec:
             pathType: Prefix
             pathType: Prefix
             backend:
             backend:
               service:
               service:
-                name: realtime-yuewen-svc
+                name: realtime-yuewen-v2-svc
                 port:
                 port:
                   number: 8080
                   number: 8080
-    - host: pro-realtime-yuewen.ieasou.cn
+    - host: qa-realtime-yuewen-v2.ieasou.cn
       http:
       http:
         paths:
         paths:
             - path: /
             - path: /
               pathType: Prefix
               pathType: Prefix
               backend:
               backend:
                 service:
                 service:
-                  name: realtime-yuewen-svc
+                  name: realtime-yuewen-v2-svc
                   port:
                   port:
                     number: 8080
                     number: 8080
   ingressClassName: nginx
   ingressClassName: nginx
@@ -174,8 +174,8 @@ spec:
 apiVersion: v1
 apiVersion: v1
 kind: ConfigMap
 kind: ConfigMap
 metadata:
 metadata:
-  name: flume-config-realtime-yuewen
-  namespace: pro
+  name: flume-config-realtime-yuewen-v2
+  namespace: qa
 data:
 data:
   flume.conf: |
   flume.conf: |
     a1.channels.c1.type = org.apache.flume.channel.kafka.KafkaChannel
     a1.channels.c1.type = org.apache.flume.channel.kafka.KafkaChannel