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

kustomization/overlays/dev/kustomization.yaml

@@ -14,4 +14,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/web
-  newTag: 70856c3287da75bdeecddf885d46aed261425a6d
+  newTag: 47448a5a4e2a5cfeb6522567049914d396cd2f4d

kustomization/overlays/prod/increase_replicas.yaml

@@ -3,9 +3,9 @@ kind: Deployment
 metadata:
   name: web-deployment
 spec:
-  replicas: 2
+  replicas: 1
   strategy:
     type: RollingUpdate
     rollingUpdate:
       maxSurge: 1
-      maxUnavailable: 1
+      maxUnavailable: 0
\ No newline at end of file