Selaa lähdekoodia

deploy qa/realtime-yuewen-v2:r190940 按小时同步日志

pmrd 1 vuosi sitten
vanhempi
commit
f6026507e2
3 muutettua tiedostoa jossa 20 lisäystä ja 49 poistoa
  1. 4 4
      .drone.yml
  2. 1 1
      Dockerfile
  3. 15 44
      deploy-tmp.yaml

+ 4 - 4
.drone.yml

@@ -21,7 +21,7 @@ steps:
   environment:
     JNLP_ENV: qa
     JNLP_REPLICAS: 1
-    JNLP_TAG: r190906
+    JNLP_TAG: r190940
     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 qa/realtime-yuewen-v2:r190906 Success"
-    description: "${DRONE_BUILD_LINK} qa/realtime-yuewen-v2:r190906 部署完成 按小时同步日志"
+    title: "Pipeline qa/realtime-yuewen-v2:r190940 Success"
+    description: "${DRONE_BUILD_LINK} qa/realtime-yuewen-v2:r190940 部署完成 按小时同步日志"
     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 qa/realtime-yuewen-v2:r190906 Failure"
+    title: "Pipeline qa/realtime-yuewen-v2:r190940 Failure"
     description: "${DRONE_BUILD_LINK} 部署失败,请检查配置!按小时同步日志"
     msg_url: ${DRONE_BUILD_LINK}
     btn_txt: "否"

+ 1 - 1
Dockerfile

@@ -1 +1 @@
-FROM hub.evbj.easou.com/qa/realtime-yuewen-v2:r190906
+FROM hub.evbj.easou.com/qa/realtime-yuewen-v2:r190940

+ 15 - 44
deploy-tmp.yaml

@@ -47,7 +47,7 @@ spec:
       #              topologyKey: kubernetes.io/hostname
       containers:
         - name: realtime-yuewen-v2
-          image: hub.evbj.easou.com/qa/realtime-yuewen-v2:r190906
+          image: hub.evbj.easou.com/qa/realtime-yuewen-v2:r190940
           imagePullPolicy: IfNotPresent
           env:
             - name: MY_NODE_NAME
@@ -80,20 +80,20 @@ spec:
             preStop:
               exec:
                 command: ["/bin/sh","-c","curl -H 'loginName:admin' -H 'password:ea1so2ua3dm4in5' -X POST 127.0.0.1:8080/actuator/shutdown"]
-          livenessProbe:
-            httpGet:
-              path: /actuator/health
-              port: 8080
-              httpHeaders:
-                - name: loginName
-                  value: admin
-                - name: password
-                  value: ea1so2ua3dm4in5
-            initialDelaySeconds: 10        #60s后启动第一次探测
-            periodSeconds: 10              # 每隔10s启动一次探测
-            timeoutSeconds: 3              # 超时时间3s
-            successThreshold: 1            # 成功1次即表示容器健康
-            failureThreshold: 2            # 连续5次失败,则判定容器不健康,默认3次
+#          livenessProbe:
+#            httpGet:
+#              path: /actuator/health
+#              port: 8080
+#              httpHeaders:
+#                - name: loginName
+#                  value: admin
+#                - name: password
+#                  value: ea1so2ua3dm4in5
+#            initialDelaySeconds: 10        #60s后启动第一次探测
+#            periodSeconds: 10              # 每隔10s启动一次探测
+#            timeoutSeconds: 3              # 超时时间3s
+#            successThreshold: 1            # 成功1次即表示容器健康
+#            failureThreshold: 2            # 连续5次失败,则判定容器不健康,默认3次
           readinessProbe:
             tcpSocket:
               port: 8080
@@ -142,35 +142,6 @@ spec:
   selector:
     app: realtime-yuewen-v2
 ---
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: realtime-yuewen-v2-ingress
-  namespace: qa
-spec:
-  rules:
-    - host: ywrealtimev2.appeasou.com
-      http:
-        paths:
-          - path: /
-            pathType: Prefix
-            backend:
-              service:
-                name: realtime-yuewen-v2-svc
-                port:
-                  number: 8080
-    - host: qa-realtime-yuewen-v2.ieasou.cn
-      http:
-        paths:
-            - path: /
-              pathType: Prefix
-              backend:
-                service:
-                  name: realtime-yuewen-v2-svc
-                  port:
-                    number: 8080
-  ingressClassName: nginx
----
 apiVersion: v1
 kind: ConfigMap
 metadata: