Browse Source

deploy pro/realtime-yuewen-v2:r188270 测试是否能提交

pmrd 1 year ago
parent
commit
29763affd6
3 changed files with 26 additions and 25 deletions
  1. 6 6
      .drone.yml
  2. 1 1
      Dockerfile
  3. 19 18
      deploy-tmp.yaml

+ 6 - 6
.drone.yml

@@ -1,6 +1,6 @@
 kind: pipeline
 type: kubernetes
-name: realtime-yuewen
+name: realtime-yuewen-v2
 
 clone:
   disable: true
@@ -21,7 +21,7 @@ steps:
   environment:
     JNLP_ENV: pro
     JNLP_REPLICAS: 2
-    JNLP_TAG: r187967
+    JNLP_TAG: r188270
     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/realtime-yuewen:r187967 Success"
-    description: "${DRONE_BUILD_LINK} pro/realtime-yuewen:r187967 部署完成 sdfasfasdssdf"
+    title: "Pipeline pro/realtime-yuewen-v2:r188270 Success"
+    description: "${DRONE_BUILD_LINK} pro/realtime-yuewen-v2:r188270 部署完成 测试是否能提交"
     msg_url: ${DRONE_BUILD_LINK}
     btn_txt: "否"
   when:
@@ -68,8 +68,8 @@ steps:
     corpid: ww419ee4063735e1c0
     corp_secret: zpiRBLETH9eLwIMQ4eJ_r_dcm3BPSGeLHvTcft8Ot-M
     agent_id: 1000004
-    title: "Pipeline pro/realtime-yuewen:r187967 Failure"
-    description: "${DRONE_BUILD_LINK} 部署失败,请检查配置!sdfasfasdssdf"
+    title: "Pipeline pro/realtime-yuewen-v2:r188270 Failure"
+    description: "${DRONE_BUILD_LINK} 部署失败,请检查配置!测试是否能提交"
     msg_url: ${DRONE_BUILD_LINK}
     btn_txt: "否"
   when:

+ 1 - 1
Dockerfile

@@ -1 +1 @@
-FROM hub.evbj.easou.com/pro/realtime-yuewen:r187967
+FROM hub.evbj.easou.com/pro/realtime-yuewen-v2:r188270

+ 19 - 18
deploy-tmp.yaml

@@ -2,26 +2,27 @@
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
-  name: realtime-yuewen
+  name: realtime-yuewen-v2
   namespace: pro
   labels:
-    app: realtime-yuewen
+    app: realtime-yuewen-v2
 spec:
-  serviceName: realtime-yuewen
+  serviceName: realtime-yuewen-v2
   replicas: 2
   selector:
     matchLabels:
-      app: realtime-yuewen
+      app: realtime-yuewen-v2
   template:
     metadata:
       labels:
-        app: realtime-yuewen
+        app: realtime-yuewen-v2
     spec:
       terminationGracePeriodSeconds: 180
       dnsPolicy: ClusterFirstWithHostNet
       dnsConfig:
         nameservers:
           - 223.5.5.5
+          - 10.108.30.101
           - 10.26.22.50
       initContainers:
         - name: init
@@ -43,11 +44,11 @@ spec:
       #                - key: app
       #                  operator: In
       #                  values:
-      #                  - realtime-yuewen
+      #                  - realtime-yuewen-v2
       #              topologyKey: kubernetes.io/hostname
       containers:
-        - name: realtime-yuewen
-          image: hub.evbj.easou.com/pro/realtime-yuewen:r187967
+        - name: realtime-yuewen-v2
+          image: hub.evbj.easou.com/pro/realtime-yuewen-v2:r188270
           imagePullPolicy: IfNotPresent
           env:
             - name: MY_NODE_NAME
@@ -111,7 +112,7 @@ spec:
       volumes:
         - name: flume-config
           configMap:
-            name: flume-config-realtime-yuewen
+            name: flume-config-realtime-yuewen-v2
             items:
               - key: flume.conf
                 path: flume.conf
@@ -129,10 +130,10 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  name: realtime-yuewen-svc
+  name: realtime-yuewen-v2-svc
   namespace: pro
   labels:
-    app: realtime-yuewen-svc
+    app: realtime-yuewen-v2-svc
 spec:
   type: NodePort
   ports:
@@ -140,33 +141,33 @@ spec:
       targetPort: 8080
       name: "main"
   selector:
-    app: realtime-yuewen
+    app: realtime-yuewen-v2
 ---
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: realtime-yuewen-ingress
+  name: realtime-yuewen-v2-ingress
   namespace: pro
 spec:
   rules:
-    - host: ywrealtime.appeasou.com
+    - host: ywrealtimev2.appeasou.com
       http:
         paths:
           - path: /
             pathType: Prefix
             backend:
               service:
-                name: realtime-yuewen-svc
+                name: realtime-yuewen-v2-svc
                 port:
                   number: 8080
-    - host: pro-realtime-yuewen.ieasou.cn
+    - host: pro-realtime-yuewen-v2.ieasou.cn
       http:
         paths:
             - path: /
               pathType: Prefix
               backend:
                 service:
-                  name: realtime-yuewen-svc
+                  name: realtime-yuewen-v2-svc
                   port:
                     number: 8080
   ingressClassName: nginx
@@ -174,7 +175,7 @@ spec:
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: flume-config-realtime-yuewen
+  name: flume-config-realtime-yuewen-v2
   namespace: pro
 data:
   flume.conf: |