Merge branch 'develop'

kustomization/overlays/dev/kustomization.yaml

 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - ../../base
+- ../../base
 #namePrefix: dev-
 namespace: dev
 commonLabels:
@@ -9,12 +9,12 @@ commonLabels:
 commonAnnotations:
   note: This is dev!
 patches:
-  - path: ./configMap.yaml
-  - path: ./service-patch.yaml
-    target:
-      kind: Service
-      name: ims-svc
+- path: ./configMap.yaml
+- path: ./service-patch.yaml
+  target:
+    kind: Service
+    name: ims-svc
 images:
-  - name: REGISTRY/NAMESPACE/IMAGE:TAG
-    newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/ims
-    newTag: ed527a3e3d9f8d74e29d9c10f4995b2090db167d
+- name: REGISTRY/NAMESPACE/IMAGE:TAG
+  newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/ims
+  newTag: b300157c115d3c4720ab7f987203f06300486e1d

kustomization/overlays/prod/configMap.yaml

@@ -3,4 +3,4 @@ kind: ConfigMap
 metadata:
   name: ims-map
 data:
-  SPRING_PROFILES_ACTIVE: prod
\ No newline at end of file
+  SPRING_PROFILES_ACTIVE: dev
\ No newline at end of file