Merge branch 'dev' into test

# Conflicts:
#	deployment.yaml

deployment.yaml

@@ -44,7 +44,7 @@ spec:
               cpu: "500m"
               memory: "1024Mi"
             limits:
-              cpu: "700m"
+              cpu: "2048m"
               memory: "2048Mi"
       terminationGracePeriodSeconds: 30
 ---
@@ -111,7 +111,7 @@ spec:
               cpu: "500m"
               memory: "1024Mi"
             limits:
-              cpu: "700m"
+              cpu: "2048m"
               memory: "2048Mi"
       terminationGracePeriodSeconds: 30
   strategy:
@@ -183,7 +183,7 @@ spec:
               cpu: "500m"
               memory: "1024Mi"
             limits:
-              cpu: "700m"
+              cpu: "2048m"
               memory: "2048Mi"
       terminationGracePeriodSeconds: 30
   strategy:
@@ -207,6 +207,78 @@ spec:
       targetPort: 48081
       nodePort: 30091
 ---
+# zt-module-bpm
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  namespace: ns-d6a0e78ebd674c279614498e4c57b133
+  name: zt-module-bpm
+  labels:
+    app: zt-module-bpm
+  annotations:
+    version: "VERSION_PLACEHOLDER"
+    description: DESC_PLACEHOLDER
+    rollout.kubernetes.io/change-cause: "DESC_PLACEHOLDER:VERSION_PLACEHOLDER"
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: zt-module-bpm
+  template:
+    metadata:
+      labels:
+        app: zt-module-bpm
+    spec:
+      containers:
+        - name: zt-module-bpm
+          image: 172.16.46.66:10043/zt/zt-module-bpm:VERSION_PLACEHOLDER
+          imagePullPolicy: Always
+          env:
+            - name: TZ
+              value: Asia/Shanghai
+          readinessProbe:
+            httpGet:
+              path: /actuator/health
+              port: 48083
+            initialDelaySeconds: 10
+            periodSeconds: 5
+            failureThreshold: 3
+          livenessProbe:
+            httpGet:
+              path: /actuator/health
+              port: 48083
+            initialDelaySeconds: 30
+            periodSeconds: 10
+            failureThreshold: 5
+          resources:
+            requests:
+              cpu: "500m"
+              memory: "1024Mi"
+            limits:
+              cpu: "2048m"
+              memory: "2048Mi"
+      terminationGracePeriodSeconds: 30
+  strategy:
+    type: RollingUpdate
+    rollingUpdate:
+      maxSurge: 1
+      maxUnavailable: 0
+---
+apiVersion: v1
+kind: Service
+metadata:
+  namespace: ns-d6a0e78ebd674c279614498e4c57b133
+  name: zt-module-bpm
+spec:
+  type: NodePort
+  selector:
+    app: zt-module-bpm
+  ports:
+    - protocol: TCP
+      port: 48083
+      targetPort: 48083
+      nodePort: 30093
+---
 # zt-module-report
 apiVersion: apps/v1
 kind: Deployment
@@ -255,7 +327,7 @@ spec:
               cpu: "500m"
               memory: "1024Mi"
             limits:
-              cpu: "700m"
+              cpu: "2048m"
               memory: "2048Mi"
       terminationGracePeriodSeconds: 30
   strategy: