Browse Source

deploy pro/offline-process-promotion:r180485 测试阿里云k8s集群部署

datard 2 years ago
parent
commit
87ff26b7d3
4 changed files with 23 additions and 30 deletions
  1. 7 9
      .drone.yml
  2. 1 1
      Dockerfile
  3. 13 16
      deploy-tmp.yaml
  4. 2 4
      drone.template.yml

+ 7 - 9
.drone.yml

@@ -15,15 +15,15 @@ steps:
    - git clone $DRONE_GIT_HTTP_URL .
 
 - name: deployment
-  image: hub.evbj.easou.com/dev/drone-agent:v2.0.0
+  image: hub.evbj.easou.com/dev/drone-agent:v3.0.1
   pull: always
   # privileged: true
   environment:
     JNLP_ENV: pro
     JNLP_REPLICAS: 4
-    JNLP_TAG: r180391
+    JNLP_TAG: r180485
     JNLP_VERSION: v1  # default v1, v2 for canary
-    DEPLOY_ENV: k8s-2 # 可以选择把应用部署到集群:k8s-1 or k8s-2
+    DEPLOY_ENV: k8s-1 # 可以选择把应用部署到集群:k8s-1 or k8s-2
     JNLP_REPO: hub.evbj.easou.com
     JNLP_CONTAINER_PORT: 80
     JNLP_INGRESS: nginx
@@ -45,8 +45,6 @@ steps:
     - python3 /root/tools.py -b
     # 部署服务到kubernetes上
     - python3 /root/tools.py -a
-    # 检查服务部署状态
-    - python3 /root/tools.py -c
     # 添加dns解析记录,生成访问域名
     - python3 /root/tools.py -d
 
@@ -56,8 +54,8 @@ steps:
     corpid: ww419ee4063735e1c0
     corp_secret: zpiRBLETH9eLwIMQ4eJ_r_dcm3BPSGeLHvTcft8Ot-M
     agent_id: 1000004
-    title: "Pipeline pro/offline-process-promotion:r180391 Success"
-    description: "${DRONE_BUILD_LINK} pro/offline-process-promotion:r180391 部署完成 修复开宝箱,用户用两个设备领的时候无法领取的问题"
+    title: "Pipeline pro/offline-process-promotion:r180485 Success"
+    description: "${DRONE_BUILD_LINK} pro/offline-process-promotion:r180485 部署完成 测试阿里云k8s集群部署"
     msg_url: ${DRONE_BUILD_LINK}
     btn_txt: "否"
   when:
@@ -70,8 +68,8 @@ steps:
     corpid: ww419ee4063735e1c0
     corp_secret: zpiRBLETH9eLwIMQ4eJ_r_dcm3BPSGeLHvTcft8Ot-M
     agent_id: 1000004
-    title: "Pipeline pro/offline-process-promotion:r180391 Failure"
-    description: "${DRONE_BUILD_LINK} 部署失败,请检查配置!修复开宝箱,用户用两个设备领的时候无法领取的问题"
+    title: "Pipeline pro/offline-process-promotion:r180485 Failure"
+    description: "${DRONE_BUILD_LINK} 部署失败,请检查配置!测试阿里云k8s集群部署"
     msg_url: ${DRONE_BUILD_LINK}
     btn_txt: "否"
   when:

+ 1 - 1
Dockerfile

@@ -1 +1 @@
-FROM hub.evbj.easou.com/pro/offline-process-promotion:r180391
+FROM hub.evbj.easou.com/pro/offline-process-promotion:r180485

+ 13 - 16
deploy-tmp.yaml

@@ -17,19 +17,14 @@ spec:
       labels:
         app: offline-process-promotion
     spec:
+      readinessGates:
+          - conditionType: InPlaceUpdateReady
       terminationGracePeriodSeconds: 180
-      dnsPolicy: "None"
+      dnsPolicy: ClusterFirstWithHostNet
       dnsConfig:
         nameservers:
           - 223.5.5.5
-          - 223.6.6.6
-        searches:
-          - pro.svc.cluster.local
-          - svc.cluster.local
-          - cluster.local
-        options:
-          - name: ndots
-            value: "5"
+          - 114.114.114.114
       initContainers:
         - name: init
           image: hub.evbj.easou.com/dev/busybox
@@ -54,7 +49,7 @@ spec:
               topologyKey: kubernetes.io/hostname
       containers:
         - name: offline-process-promotion
-          image: hub.evbj.easou.com/pro/offline-process-promotion:r180391
+          image: hub.evbj.easou.com/pro/offline-process-promotion:r180485
           imagePullPolicy: IfNotPresent
           env:
             - name: MY_NODE_NAME
@@ -128,7 +123,7 @@ spec:
         name: volume
       spec:
         accessModes: [ "ReadWriteOnce" ]
-        storageClassName: rbd
+        storageClassName: ceph-block
         resources:
           requests:
             storage: 100Gi
@@ -149,22 +144,24 @@ spec:
   selector:
     app: offline-process-promotion
 ---
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: offline-process-promotion-ingress
   namespace: pro
-  annotations:
-    kubernetes.io/ingress.class: nginx
 spec:
   rules:
     - host: pro-offline-process-promotion.ieasou.cn
       http:
         paths:
           - path: /
+            pathType: Prefix
             backend:
-              serviceName: offline-process-promotion-svc
-              servicePort: 80
+              service:
+                name: offline-process-promotion-svc
+                port:
+                  number: 8080
+  ingressClassName: nginx
 ---
 apiVersion: v1
 kind: ConfigMap

+ 2 - 4
drone.template.yml

@@ -15,7 +15,7 @@ steps:
    - git clone $DRONE_GIT_HTTP_URL .
 
 - name: deployment
-  image: hub.evbj.easou.com/dev/drone-agent:v2.0.0
+  image: hub.evbj.easou.com/dev/drone-agent:v3.0.1
   pull: always
   # privileged: true
   environment:
@@ -23,7 +23,7 @@ steps:
     JNLP_REPLICAS: [REPLICA]
     JNLP_TAG: [TAG]
     JNLP_VERSION: v1  # default v1, v2 for canary
-    DEPLOY_ENV: k8s-2 # 可以选择把应用部署到集群:k8s-1 or k8s-2
+    DEPLOY_ENV: k8s-1 # 可以选择把应用部署到集群:k8s-1 or k8s-2
     JNLP_REPO: hub.evbj.easou.com
     JNLP_CONTAINER_PORT: 80
     JNLP_INGRESS: nginx
@@ -45,8 +45,6 @@ steps:
     - python3 /root/tools.py -b
     # 部署服务到kubernetes上
     - python3 /root/tools.py -a
-    # 检查服务部署状态
-    - python3 /root/tools.py -c
     # 添加dns解析记录,生成访问域名
     - python3 /root/tools.py -d