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

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: 0c95bcafeeab633fc6dca4e693be6adb757627e5
+  newTag: df11775e8608abe924f6185c4cf0cf4c006f8362

kustomization/overlays/prod/increase_replicas.yaml

@@ -3,10 +3,10 @@ kind: Deployment
 metadata:
   name: cms-deployment
 spec:
-  replicas: 2
-#  template:
-#    spec:
-#      nodeName: master
+  replicas: 1
+  template:
+    spec:
+      nodeName: node-1
 #      nodeSelector:
 #        on-master: "true"
 #      affinity: