Преглед на файлове

deploy qa/offline-process-charge:r180696 测试阿里云k8s集群部署

datard преди 2 години
родител
ревизия
302dc57985
променени са 4 файла, в които са добавени 51 реда и са изтрити 59 реда
  1. 7 9
      .drone.yml
  2. 1 1
      Dockerfile
  3. 40 44
      deploy-tmp.yaml
  4. 3 5
      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: qa
     JNLP_REPLICAS: 1
-    JNLP_TAG: r180693
+    JNLP_TAG: r180696
     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,10 +45,8 @@ steps:
     - python3 /root/tools.py -b
     # 部署服务到kubernetes上
     - python3 /root/tools.py -a
-    # 检查服务部署状态
-    - python3 /root/tools.py -c
     # 添加dns解析记录,生成访问域名
-    - python3 /root/tools.py -d
+#    - python3 /root/tools.py -d
 
 - name: success
   image: hub.evbj.easou.com/dev/drone-wechat:20200622
@@ -56,8 +54,8 @@ steps:
     corpid: ww419ee4063735e1c0
     corp_secret: zpiRBLETH9eLwIMQ4eJ_r_dcm3BPSGeLHvTcft8Ot-M
     agent_id: 1000004
-    title: "Pipeline qa/offline-process-charge:r180693 Success"
-    description: "${DRONE_BUILD_LINK} qa/offline-process-charge:r180693 部署完成 测试阿里云k8s集群部署"
+    title: "Pipeline qa/offline-process-charge:r180696 Success"
+    description: "${DRONE_BUILD_LINK} qa/offline-process-charge:r180696 部署完成 测试阿里云k8s集群部署"
     msg_url: ${DRONE_BUILD_LINK}
     btn_txt: "否"
   when:
@@ -70,7 +68,7 @@ steps:
     corpid: ww419ee4063735e1c0
     corp_secret: zpiRBLETH9eLwIMQ4eJ_r_dcm3BPSGeLHvTcft8Ot-M
     agent_id: 1000004
-    title: "Pipeline qa/offline-process-charge:r180693 Failure"
+    title: "Pipeline qa/offline-process-charge:r180696 Failure"
     description: "${DRONE_BUILD_LINK} 部署失败,请检查配置!测试阿里云k8s集群部署"
     msg_url: ${DRONE_BUILD_LINK}
     btn_txt: "否"

+ 1 - 1
Dockerfile

@@ -1 +1 @@
-FROM hub.evbj.easou.com/qa/offline-process-charge:r180693
+FROM hub.evbj.easou.com/qa/offline-process-charge:r180696

+ 40 - 44
deploy-tmp.yaml

@@ -18,18 +18,12 @@ spec:
         app: offline-process-charge
     spec:
       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"
+          - 10.26.22.50
+          - 10.26.22.150
       initContainers:
         - name: init
           image: hub.evbj.easou.com/dev/busybox
@@ -40,21 +34,21 @@ spec:
               mountPath: /data
       #nodeSelector:
       #  app.touchrs: touchrs
-      affinity:
-        podAntiAffinity:
-          preferredDuringSchedulingIgnoredDuringExecution:
-          - weight: 100
-            podAffinityTerm:
-              labelSelector:
-                matchExpressions:
-                - key: app
-                  operator: In
-                  values:
-                  - offline-process-charge
-              topologyKey: kubernetes.io/hostname
+#      affinity:
+#        podAntiAffinity:
+#          preferredDuringSchedulingIgnoredDuringExecution:
+#          - weight: 100
+#            podAffinityTerm:
+#              labelSelector:
+#                matchExpressions:
+#                - key: app
+#                  operator: In
+#                  values:
+#                  - offline-process-charge
+#              topologyKey: kubernetes.io/hostname
       containers:
         - name: offline-process-charge
-          image: hub.evbj.easou.com/qa/offline-process-charge:r180693
+          image: hub.evbj.easou.com/qa/offline-process-charge:r180696
           imagePullPolicy: IfNotPresent
           env:
             - name: MY_NODE_NAME
@@ -106,29 +100,29 @@ spec:
               port: 8080
             initialDelaySeconds: 40
             periodSeconds: 15
-        - image: hub.evbj.easou.com/pro/filebeat:7.13.3
-          imagePullPolicy: IfNotPresent
-          name: filebeat
-          volumeMounts:
-            - name: volume #日志同时挂载在nginx和filebeat中
-              mountPath: /data
-            - name: filebeat-config
-              mountPath: /usr/share/filebeat/filebeat.yml
-              subPath: filebeat.yml
-      volumes:
-        - name: filebeat-config
-          configMap:
-            name: filebeat-config-offline-process-charge
-            items:
-              - key: filebeat.yml
-                path: filebeat.yml
+#        - image: hub.evbj.easou.com/pro/filebeat:7.13.3
+#          imagePullPolicy: IfNotPresent
+#          name: filebeat
+#          volumeMounts:
+#            - name: volume #日志同时挂载在nginx和filebeat中
+#              mountPath: /data
+#            - name: filebeat-config
+#              mountPath: /usr/share/filebeat/filebeat.yml
+#              subPath: filebeat.yml
+#      volumes:
+#        - name: filebeat-config
+#          configMap:
+#            name: filebeat-config-offline-process-charge
+#            items:
+#              - key: filebeat.yml
+#                path: filebeat.yml
 
   volumeClaimTemplates:
     - metadata:
         name: volume
       spec:
         accessModes: [ "ReadWriteOnce" ]
-        storageClassName: rbd
+        storageClassName: ceph-block
         resources:
           requests:
             storage: 100Gi
@@ -149,22 +143,24 @@ spec:
   selector:
     app: offline-process-charge
 ---
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: offline-process-charge-ingress
   namespace: qa
-  annotations:
-    kubernetes.io/ingress.class: nginx
 spec:
   rules:
     - host: qa-offline-process-charge.ieasou.cn
       http:
         paths:
           - path: /
+            pathType: Prefix
             backend:
-              serviceName: offline-process-charge-svc
-              servicePort: 80
+              service:
+                name: offline-process-charge-svc
+                port:
+                  number: 8080
+  ingressClassName: nginx
 ---
 apiVersion: v1
 kind: ConfigMap

+ 3 - 5
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,10 +45,8 @@ steps:
     - python3 /root/tools.py -b
     # 部署服务到kubernetes上
     - python3 /root/tools.py -a
-    # 检查服务部署状态
-    - python3 /root/tools.py -c
     # 添加dns解析记录,生成访问域名
-    - python3 /root/tools.py -d
+#    - python3 /root/tools.py -d
 
 - name: success
   image: hub.evbj.easou.com/dev/drone-wechat:20200622