Merge branch 'develop'

kustomization/base/deployment.yaml

@@ -4,6 +4,8 @@ metadata:
   name: pms-deployment
   namespace: default
 spec:
+  minReadySeconds: 250
+  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: 8099

kustomization/overlays/dev/increase_replicas.yaml

+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: pms-deployment
+spec:
+  replicas: 2
+  strategy:
+    type: RollingUpdate
+    rollingUpdate:
+      maxSurge: 1
+      maxUnavailable: 1

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/pms
-  newTag: a0064fe04129bb080ca9c03a9da60fc911c852d0
+  newTag: 4e0d17cc7a55f85a01edacf741e04cf2d303e9b1

kustomization/overlays/prod/increase_replicas.yaml

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