Merge branch 'develop'

kustomization/base/kustomization.yaml

@@ -5,5 +5,4 @@ commonLabels:
 resources:
   - ./deployment.yaml
   - ./service.yaml
-  - ./configMap.yaml
-  - ./mysql-external.yaml
+  - ./configMap.yaml
\ No newline at end of file
\ No newline at end of file

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: 615d84d4eb79bb008d85237fa12644176dbb3849
+  newTag: e028e3924fbead3f9be74578adba5a423c06f1b2