Переглянути джерело

deploy pro/realtime-yuewen:r181346 阅文实时接口k8s日志收集

datard 2 роки тому
батько
коміт
a44de7fe7e
3 змінених файлів з 21 додано та 21 видалено
  1. 4 4
      .drone.yml
  2. 1 1
      Dockerfile
  3. 16 16
      deploy-tmp.yaml

+ 4 - 4
.drone.yml

@@ -21,7 +21,7 @@ steps:
   environment:
     JNLP_ENV: pro
     JNLP_REPLICAS: 2
-    JNLP_TAG: r181345
+    JNLP_TAG: r181346
     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:r181345 Success"
-    description: "${DRONE_BUILD_LINK} pro/realtime-yuewen:r181345 部署完成 阅文实时接口k8s日志收集"
+    title: "Pipeline pro/realtime-yuewen:r181346 Success"
+    description: "${DRONE_BUILD_LINK} pro/realtime-yuewen:r181346 部署完成 阅文实时接口k8s日志收集"
     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/realtime-yuewen:r181345 Failure"
+    title: "Pipeline pro/realtime-yuewen:r181346 Failure"
     description: "${DRONE_BUILD_LINK} 部署失败,请检查配置!阅文实时接口k8s日志收集"
     msg_url: ${DRONE_BUILD_LINK}
     btn_txt: "否"

+ 1 - 1
Dockerfile

@@ -1 +1 @@
-FROM hub.evbj.easou.com/pro/realtime-yuewen:r181345
+FROM hub.evbj.easou.com/pro/realtime-yuewen:r181346

+ 16 - 16
deploy-tmp.yaml

@@ -47,7 +47,7 @@ spec:
 #              topologyKey: kubernetes.io/hostname
       containers:
         - name: realtime-yuewen
-          image: hub.evbj.easou.com/pro/realtime-yuewen:r181345
+          image: hub.evbj.easou.com/pro/realtime-yuewen:r181346
           imagePullPolicy: IfNotPresent
           env:
             - name: MY_NODE_NAME
@@ -99,21 +99,21 @@ spec:
               port: 8080
             initialDelaySeconds: 40
             periodSeconds: 15
-#        - image: hub.evbj.easou.com/pro/fluent-bit
-#          imagePullPolicy: IfNotPresent
-#          name: fluent-bit
-#          ports:
-#            - containerPort: 2020
-#              name: metrics
-#              protocol: TCP
-#          terminationMessagePath: /dev/termination-log
-#          terminationMessagePolicy: File
-#          volumeMounts:
-#            - name: volume #日志同时挂载在nginx和filebeat中
-#              mountPath: /data
-#            - name: fluent-bit-config
-#              mountPath: /opt/bitnami/fluent-bit/conf/fluent-bit.conf
-#              subPath: fluent-bit.conf
+        - image: hub.evbj.easou.com/pro/fluent-bit
+          imagePullPolicy: IfNotPresent
+          name: fluent-bit
+          ports:
+            - containerPort: 2020
+              name: metrics
+              protocol: TCP
+          terminationMessagePath: /dev/termination-log
+          terminationMessagePolicy: File
+          volumeMounts:
+            - name: volume #日志同时挂载在nginx和filebeat中
+              mountPath: /data
+            - name: fluent-bit-config
+              mountPath: /opt/bitnami/fluent-bit/conf/fluent-bit.conf
+              subPath: fluent-bit.conf
       volumes:
         - name: fluent-bit-config
           configMap: