Merge branch 'develop'

kustomization/base/deployment.yaml

@@ -18,7 +18,7 @@ spec:
           image: REGISTRY/NAMESPACE/IMAGE:TAG
           resources:
             limits:
-              memory: 1024Mi
+              memory: 4096Mi
               cpu: 100m
           ports:
             - containerPort: 35150

kustomization/overlays/dev/kustomization.yaml

@@ -10,8 +10,11 @@ commonAnnotations:
   note: This is dev!
 patches:
 - path: ./configMap.yaml
-- path: ./service.yaml
+- path: ./service-patch.yaml
+  target:
+    kind: Service
+    name: cms-svc
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
-  newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly/cms
-  newTag: 6617a5fdc17cf0eee90cc3fdf9e26636aad39d97
+  newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/cms
+  newTag: 66b49a71dffb90bd5d6c1e5f898749d69ad51378

kustomization/overlays/dev/service-patch.yaml

+- op: replace
+  path: /spec/ports/0/nodePort
+  value: 30151
\ No newline at end of file

kustomization/overlays/dev/service.yaml

-apiVersion: v1
-kind: Service
-metadata:
-  name: cms-svc
-  namespace: dev
-spec:
-  selector:
-    app: cms
-  type: NodePort
-  ports:
-    - protocol: TCP
-      port: 35150
-      nodePort: 30151
\ No newline at end of file