From 3da588dd8672209fd31feeb086331fbc63234083 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E7=9A=93=E6=98=B1?= <wanghy3769@chinaunicom.cn>
Date: Thu, 27 May 2021 18:00:32 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=97=A5=E5=BF=97=E6=8C=82=E8=BD=BD=E8=B7=AF?=
 =?UTF-8?q?=E5=BE=84=E4=BF=AE=E6=94=B9=202.=E5=B0=B1=E7=BB=AA=E6=A3=80?=
 =?UTF-8?q?=E6=B5=8B=E4=B8=8E=E5=AD=98=E6=B4=BB=E6=A3=80=E6=B5=8B=E8=A7=84?=
 =?UTF-8?q?=E5=88=99=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 deployment-master.yaml | 55 ++++++++++++++++++++++++------------------
 1 file changed, 31 insertions(+), 24 deletions(-)

diff --git a/deployment-master.yaml b/deployment-master.yaml
index 110aee1..79e816c 100644
--- a/deployment-master.yaml
+++ b/deployment-master.yaml
@@ -36,10 +36,9 @@ spec:
     # 定义容器模板，该模板可以包含多个容器
     spec:
       volumes:
-        - name: log
-          persistentVolumeClaim:
-            claimName: log-pvc
-            readOnly: false
+      - name: log
+        hostPath:    
+          path: /var/lib/docker/log/349553515466-prod/default-group/30days
       affinity:
         podAntiAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
@@ -60,25 +59,25 @@ spec:
             mountPath: /log
         ports:
           - containerPort: 18018
-        #livenessProbe:
-        #  failureThreshold: 3
-        #  httpGet:
-        #    port: 18018            #[11] pod存活检测端口,修改为该微服务配置文件中server.port的端口号,与参数[5]相同
-        #    path: /actuator/prometheus  
-        #    scheme: HTTP
-        #  initialDelaySeconds: 300
-        #  periodSeconds: 60
-        #  successThreshold: 1
-        #  timeoutSeconds: 2
-        #readinessProbe:
-        #   failureThreshold: 1
-        #   httpGet:
-        #     port: 18018           #[12] pod就绪检测端口,修改为该微服务配置文件中server.port的端口号,与参数[5]相同
-        #     path: /actuator/prometheus
-        #     scheme: HTTP
-        #   periodSeconds: 5
-        #   successThreshold: 2
-        #  timeoutSeconds: 2
+        livenessProbe:
+         failureThreshold: 3
+         httpGet:
+            port: 18018            #[11] pod存活检测端口,修改为该微服务配置文件中server.port的端口号,与参数[5]相同
+            path: /actuator/health
+            scheme: HTTP
+         initialDelaySeconds: 300
+         periodSeconds: 60
+         successThreshold: 1
+         timeoutSeconds: 2
+        readinessProbe:
+          failureThreshold: 1
+          httpGet:
+            port: 18018           #[12] pod就绪检测端口,修改为该微服务配置文件中server.port的端口号,与参数[5]相同
+            path: /actuator/health
+            scheme: HTTP
+          periodSeconds: 5
+          successThreshold: 2
+         timeoutSeconds: 2
         resources:
           requests:
             cpu: 1000m
@@ -90,13 +89,21 @@ spec:
         - name: AGENT_LICENCE
           value: 527BFA7B28577578
         - name: APP_NAME
-          value: biz_service_ebtp_extend
+          value: biz_ebtp_extend  #24位长度限，制统一去掉service
         - name: APOLLO_CONFIGSERVICE
           value: http://apollo-configservice:8080
         - name: MY_POD_IP
           valueFrom:
             fieldRef:
               fieldPath: status.podIP
+        - name: JAVA_TOOL_OPTIONS
+          value: -XX:+UnlockExperimentalVMOptions
+            -XX:+UseContainerSupport
+            -XX:+UseCGroupMemoryLimitForHeap
+            -XX:InitialRAMPercentage=40.0
+            -XX:MinRAMPercentage=20.0
+            -XX:MaxRAMPercentage=80.0
+
 ---
 kind: Service
 apiVersion: v1