Преглед изворни кода

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

pmrd пре 1 година
родитељ
комит
151c6544e9
4 измењених фајлова са 6 додато и 13 уклоњено
  1. 4 6
      .drone.yml
  2. 1 1
      Dockerfile
  3. 1 4
      deploy-tmp.yaml
  4. 0 2
      drone.template.yml

+ 4 - 6
.drone.yml

@@ -21,7 +21,7 @@ steps:
   environment:
     JNLP_ENV: pro
     JNLP_REPLICAS: 1
-    JNLP_TAG: r188753
+    JNLP_TAG: r188755
     JNLP_VERSION: v1  # default v1, v2 for canary
     DEPLOY_ENV: k8s-1 # 可以选择把应用部署到集群:k8s-1 or k8s-2
     JNLP_REPO: hub.evbj.easou.com
@@ -41,8 +41,6 @@ steps:
   commands:
     # 切换目标集群
     - kubecm s $DEPLOY_ENV
-    # 生成配置YAML文件
-    - python3 /root/tools.py -b
     # 部署服务到kubernetes上
     - python3 /root/tools.py -a
     # 添加dns解析记录,生成访问域名
@@ -54,8 +52,8 @@ steps:
     corpid: ww419ee4063735e1c0
     corp_secret: zpiRBLETH9eLwIMQ4eJ_r_dcm3BPSGeLHvTcft8Ot-M
     agent_id: 1000004
-    title: "Pipeline pro/realtime-yuewen-v2:r188753 Success"
-    description: "${DRONE_BUILD_LINK} pro/realtime-yuewen-v2:r188753 部署完成 测试是否能提交"
+    title: "Pipeline pro/realtime-yuewen-v2:r188755 Success"
+    description: "${DRONE_BUILD_LINK} pro/realtime-yuewen-v2:r188755 部署完成 测试是否能提交"
     msg_url: ${DRONE_BUILD_LINK}
     btn_txt: "否"
   when:
@@ -68,7 +66,7 @@ steps:
     corpid: ww419ee4063735e1c0
     corp_secret: zpiRBLETH9eLwIMQ4eJ_r_dcm3BPSGeLHvTcft8Ot-M
     agent_id: 1000004
-    title: "Pipeline pro/realtime-yuewen-v2:r188753 Failure"
+    title: "Pipeline pro/realtime-yuewen-v2:r188755 Failure"
     description: "${DRONE_BUILD_LINK} 部署失败,请检查配置!测试是否能提交"
     msg_url: ${DRONE_BUILD_LINK}
     btn_txt: "否"

+ 1 - 1
Dockerfile

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

+ 1 - 4
deploy-tmp.yaml

@@ -47,7 +47,7 @@ spec:
       #              topologyKey: kubernetes.io/hostname
       containers:
         - name: realtime-yuewen-v2
-          image: hub.evbj.easou.com/pro/realtime-yuewen-v2:r188753
+          image: hub.evbj.easou.com/pro/realtime-yuewen-v2:r188755
           imagePullPolicy: IfNotPresent
           env:
             - name: MY_NODE_NAME
@@ -105,9 +105,6 @@ spec:
           volumeMounts:
             - name: volume #日志同时挂载在nginx和filebeat中
               mountPath: /data
-            - name: flume-config
-              mountPath: /app/soft/flume-1.7.0/conf/flume.conf
-              subPath: flume.conf
       volumes:
         - name: flume-config
           configMap:

+ 0 - 2
drone.template.yml

@@ -41,8 +41,6 @@ steps:
   commands:
     # 切换目标集群
     - kubecm s $DEPLOY_ENV
-    # 生成配置YAML文件
-    - python3 /root/tools.py -b
     # 部署服务到kubernetes上
     - python3 /root/tools.py -a
     # 添加dns解析记录,生成访问域名