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: 6eb314b37a7b237c29ac6a033a5e73286a63dff0
+  newTag: 2528536a2a0840adb161c2278d26ab9559f60e86

kustomization/overlays/prod/increase_replicas.yaml

@@ -3,4 +3,17 @@ kind: Deployment
 metadata:
   name: cms-deployment
 spec:
-  replicas: 2
\ No newline at end of file
+  replicas: 1
+  template:
+    spec:
+      nodeSelector:
+        on-master: "true"
+#      affinity:
+#        podAntiAffinity:
+#          requiredDuringSchedulingIgnoredDuringExecution:
+#            - labelSelector:
+#                matchExpressions:
+#                  - key: nodeName
+#                    operator: Eq
+#                    values:
+#                      - master
\ No newline at end of file