Merge branch 'master' into develop

kustomization/overlays/prod/increase_replicas.yaml

@@ -4,6 +4,6 @@ metadata:
   name: ims-deployment
 spec:
   replicas: 1
-  template:
-    spec:
-      nodeName: master
\ No newline at end of file
+#  template:
+#    spec:
+#      nodeName: master
\ No newline at end of file

kustomization/overlays/prod/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly/ims
-  newTag: 7541fcfb10ef9afea9da756866022d1ea588666a
+  newTag: 3d64022a854e176f6a04f5fb43b1fedbeefffcf4