Merge remote-tracking branch 'origin/develop' into develop

kustomization/base/deployment.yaml

@@ -18,7 +18,7 @@ spec:
           image: REGISTRY/NAMESPACE/IMAGE:TAG
           resources:
             limits:
-              memory: 4096Mi
+              memory: 8192Mi
               cpu: 100m
           ports:
             - containerPort: 35150

kustomization/overlays/dev/kustomization.yaml

@@ -17,4 +17,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/cms
-  newTag: 32252ec358a399d4ac8355ae9291b29cc22ae292
+  newTag: 9012f62e4a30901ebe2f13e120373c352af84f12

kustomization/overlays/prod/increase_replicas.yaml

+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: cms-deployment
+spec:
+  replicas: 2
\ No newline at end of file

kustomization/overlays/prod/kustomization.yaml

@@ -9,6 +9,7 @@ commonLabels:
 commonAnnotations:
   note: This is prod!
 patches:
+- path: increase_replicas.yaml
 - path: configMap.yaml
 - path: service-patch.yaml
   target: