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/ims
-  newTag: 0293a4219757ec4d0df248b581a08051f33a6cf2
+  newTag: 5299085b6d44d532d9038777fb7d31bc7cce9814

kustomization/overlays/prod/increase_replicas.yaml

@@ -6,5 +6,6 @@ spec:
   replicas: 1
   template:
     spec:
-      nodeSelector:
-        on-master: "true"
\ No newline at end of file
+      nodeName: master
+#      nodeSelector:
+#        on-master: "true"
\ No newline at end of file