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

# Conflicts:
#	kustomization/overlays/dev/kustomization.yaml

kustomization/overlays/dev/kustomization.yaml

 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- ../../base
+  - ../../base
 #namePrefix: dev-
 namespace: dev
 commonLabels:
@@ -9,9 +9,9 @@ commonLabels:
 commonAnnotations:
   note: This is dev!
 patches:
-- path: ./increase_replicas.yaml
-- path: ./configMap.yaml
+  - path: ./increase_replicas.yaml
+  - path: ./configMap.yaml
 images:
-- name: REGISTRY/NAMESPACE/IMAGE:TAG
+  - name: REGISTRY/NAMESPACE/IMAGE:TAG
     newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/admin
-  newTag: fae494cbfb2bf8aa695b294eaf8033b82463aae2
+    newTag: 555a2cf5fdf0e37e5c054be3cd3070c2f963be2d

kustomization/overlays/prod/kustomization.yaml

@@ -11,3 +11,7 @@ commonAnnotations:
 patches:
 - path: increase_replicas.yaml
 - path: configMap.yaml
+images:
+- name: REGISTRY/NAMESPACE/IMAGE:TAG
+  newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly/admin
+  newTag: 7075ed8a992197acf49f443b0694ae9b9bd8ad5b