Merge branch 'develop'

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

kustomization/overlays/prod/kustomization.yaml

@@ -9,12 +9,10 @@ commonLabels:
 commonAnnotations:
   note: This is prod!
 patches:
-- path: increase_replicas.yaml
-- path: configMap.yaml
-  target:
-    kind: Service
-    name: web-svc
+  - path: ./increase_replicas.yaml
+  - path: ./configMap.yaml
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly/web
   newTag: 6bdf6a351dc375cfb34f3c27d508977a70382c37
+