Merge branch '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: 276a574a6aa29c2d2fd600a6ead34bc7032aae4f
+  newTag: 2df3064ac9fa8f9c581b6bc6c7df63695693dee5

kustomization/overlays/prod/increase_replicas.yaml

@@ -4,9 +4,9 @@ metadata:
   name: cms-deployment
 spec:
   replicas: 1
-  template:
-    spec:
-      nodeName: master
+#  template:
+#    spec:
+#      nodeName: master
 #      nodeSelector:
 #        on-master: "true"
 #      affinity:
@@ -17,4 +17,4 @@ spec:
 #                  - key: nodeName
 #                    operator: Eq
 #                    values:
-#                      - master
\ No newline at end of file
+#                      - master