Merge branch 'zone' into 'master'

基础服务部署到3区



See merge request !29

yamls/index.js

 const fs = require('fs')
 
 const mysql = fs.readFileSync('yamls/mysql.pvc.yaml', 'utf8')
-const redis = fs.readFileSync('yamls/redis.pvc.yaml', 'utf8')
+const redis = fs.readFileSync('yamls/redis.yaml', 'utf8')
 const rabbitmq = fs.readFileSync('yamls/rabbitmq.pvc.yaml', 'utf8')
 const mongodb = fs.readFileSync('yamls/mongo.pvc.yaml', 'utf8')
 const zookeeper = fs.readFileSync('yamls/zookeeper.pvc.yaml', 'utf8')

yamls/mysql.pvc.yaml

@@ -21,7 +21,7 @@ metadata:
   name: {{serviceName}}-{{namespace}}
   namespace: {{namespace}}
 spec:
-  storageClassName: cbs
+  storageClassName: cbs-3
   accessModes:
     - ReadWriteOnce
   resources:
@@ -75,6 +75,8 @@ spec:
         volumeMounts:
           - mountPath: "/var/lib/mysql"
             name: {{serviceName}}
+      nodeSelector:
+        zone: "3"
       volumes:
         - name: {{serviceName}}
           persistentVolumeClaim:

yamls/rabbitmq.pvc.yaml

@@ -4,7 +4,7 @@ metadata:
   name: {{serviceName}}-{{namespace}}
   namespace: {{namespace}}
 spec:
-  storageClassName: cbs
+  storageClassName: cbs-3
   accessModes:
     - ReadWriteOnce
   resources:
@@ -37,6 +37,8 @@ spec:
     spec:
       # hostname固定，容器重置后数据持久化才能正常
       hostname: {{serviceName}}-{{namespace}}
+      nodeSelector:
+        zone: "3"
       containers:
       - image: ccr.ccs.tencentyun.com/{{image}}
         imagePullPolicy: IfNotPresent

yamls/redis.yaml

-apiVersion: extensions/v1beta1
+apiVersion: apps/v1beta1
 kind: Deployment
 metadata:
   labels:
-    qcloud-app: redis
-  name: redis
+    type: base
+    qcloud-app: {{serviceName}}
+  name: {{serviceName}}
   namespace: {{namespace}}
 spec:
   replicas: 1
   revisionHistoryLimit: 1
   selector:
     matchLabels:
-      qcloud-app: redis
+      qcloud-app: {{serviceName}}
   strategy:
     type: Recreate
   template:
     metadata:
       labels:
-        qcloud-app: redis
+        type: base
+        qcloud-app: {{serviceName}}
     spec:
+      nodeSelector:
+        zone: "3"
       containers:
       - image: ccr.ccs.tencentyun.com/{{image}}
         imagePullPolicy: Always
-        name: redis
+        name: {{serviceName}}
         resources:
           requests:
-            memory: 40Mi
-            cpu: 100m
+            cpu: {{resources.cpu.request}}m
+            memory: {{resources.memory.request}}Mi
           limits:
-            memory: 128Mi
-            cpu: 500m
-        securityContext:
-          privileged: false
-        terminationMessagePath: /dev/termination-log
-      dnsPolicy: ClusterFirst
+            cpu: {{resources.cpu.limit}}m
+            memory: {{resources.memory.limit}}Mi
       imagePullSecrets:
       - name: qcloudregistrykey
       - name: tencenthubkey
@@ -46,37 +46,21 @@ kind: Service
 metadata:
   labels:
     type: base
-    qcloud-app: redis
-  name: redis
+    qcloud-app: {{serviceName}}
+  name: {{serviceName}}
   namespace: {{namespace}}
 spec:
   type: NodePort
   ports:
-  - name: tcp-6379-6379
-    nodePort: 0
+  - name: '6379'
     port: 6379
-    protocol: TCP
-    targetPort: 6379
-  - name: tcp-6380-6380
-    nodePort: 0
+  - name: '6380'
     port: 6380
-    protocol: TCP
-    targetPort: 6380
-  - name: tcp-6381-6381
-    nodePort: 0
+  - name: '6381'
     port: 6381
-    protocol: TCP
-    targetPort: 6381
-  - name: tcp-6382-6382
-    nodePort: 0
+  - name: '6382'
     port: 6382
-    protocol: TCP
-    targetPort: 6382
-  - name: tcp-6383-6383
-    nodePort: 0
+  - name: '6383'
     port: 6383
-    protocol: TCP
-    targetPort: 6383
   selector:
-    qcloud-app: redis
-  
+    qcloud-app: {{serviceName}}

yamls/zookeeper.pvc.yaml

@@ -4,7 +4,7 @@ metadata:
   name: {{serviceName}}-{{namespace}}
   namespace: {{namespace}}
 spec:
-  storageClassName: cbs
+  storageClassName: cbs-3
   accessModes:
     - ReadWriteOnce
   resources:
@@ -35,6 +35,8 @@ spec:
         qcloud-app: {{serviceName}}
         type: base
     spec:
+      nodeSelector:
+        zone: "3"
       containers:
       - image: ccr.ccs.tencentyun.com/{{image}}
         imagePullPolicy: Always