Merge branch 'develop'

kustomization/base/deployment.yaml

@@ -4,6 +4,8 @@ metadata:
   name: cms-deployment
   namespace: default
 spec:
+  minReadySeconds: 240
+  revisionHistoryLimit: 2
   replicas: 1
   selector:
     matchLabels:
@@ -18,7 +20,7 @@ spec:
           image: REGISTRY/NAMESPACE/IMAGE:TAG
           resources:
             limits:
-              memory: 4096Mi
+              memory: 1024Mi
               cpu: 100m
           ports:
             - containerPort: 35150

kustomization/overlays/dev/increase_replicas.yaml

+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: cms-deployment
+spec:
+  replicas: 2
+  strategy:
+    type: RollingUpdate
+    rollingUpdate:
+      maxSurge: 1
+      maxUnavailable: 1
\ No newline at end of file

kustomization/overlays/dev/kustomization.yaml

@@ -9,6 +9,7 @@ commonLabels:
 commonAnnotations:
   note: This is dev!
 patches:
+- path: ./increase_replicas.yaml
 - path: ./configMap.yaml
 - path: ./service-patch.yaml
   target:
@@ -17,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/cms
-  newTag: 1d021790d2877cb9cc492d3c6acdc68db0ed5ff2
+  newTag: b90d96ef7a2c68fe49e89e0462cba4d37baf7716

kustomization/overlays/prod/increase_replicas.yaml

@@ -3,7 +3,12 @@ kind: Deployment
 metadata:
   name: cms-deployment
 spec:
-  replicas: 1
+  replicas: 2
+  strategy:
+    type: RollingUpdate
+    rollingUpdate:
+      maxSurge: 1
+      maxUnavailable: 1
 #  template:
 #    spec:
 #      nodeName: master