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

kustomization/base/deployment.yaml

@@ -4,7 +4,7 @@ metadata:
   name: admin-deployment
   namespace: default
 spec:
-  minReadySeconds: 120
+  #  minReadySeconds: 120
   revisionHistoryLimit: 2
   replicas: 1
   selector:
@@ -23,4 +23,4 @@ spec:
               memory: 512Mi
               cpu: 100m
           ports:
-            - containerPort: 80
+            - containerPort: 80
\ No newline at end of file

kustomization/overlays/dev/kustomization.yaml

@@ -14,4 +14,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/admin
-  newTag: 7c37c2dc042baa48954935694721e84e80b57cac
+  newTag: 3bff7965b990c05ebcc4298bd4aea6b4281b4495