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

deployment-sim.yaml

@@ -24,10 +24,9 @@ spec:
         prometheus.io/jl-pod: 'true'
     spec:
       volumes:
-        - name: log
-          persistentVolumeClaim:
-            claimName: log-pvc
-            readOnly: false
+      - name: log
+        hostPath:
+          path: /var/lib/docker/log/349553515466-preprod/default-group/all
       affinity:
         podAntiAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
@@ -46,26 +45,26 @@ spec:
           - name: log
             mountPath: /log
         ports:            
-        - containerPort: 18012  #[8] 容器需要监听的端口号，与配置文件中的server.port参数相同，与参数[4]相同
-#        livenessProbe:
-#          failureThreshold: 3
-#          httpGet:
-#            port: 18012            #[11] pod存活检测端口,修改为该微服务配置文件中server.port的端口号,与参数[5]相同
-#            path: /actuator/prometheus
-#            scheme: HTTP
-#          initialDelaySeconds: 300
-#          periodSeconds: 60
-#          successThreshold: 1
-#          timeoutSeconds: 2
-#        readinessProbe:
-#           failureThreshold: 1
-#           httpGet:
-#             port: 18012           #[12] pod就绪检测端口,修改为该微服务配置文件中server.port的端口号,与参数[5]相同
-#             path: /actuator/prometheus
-#             scheme: HTTP
-#           periodSeconds: 5
-#           successThreshold: 2
-#           timeoutSeconds: 2
+        - containerPort: 18012
+        livenessProbe:
+          failureThreshold: 3
+          httpGet:
+            port: 18012
+            path: /actuator/health
+            scheme: HTTP
+          initialDelaySeconds: 300
+          periodSeconds: 60
+          successThreshold: 1
+          timeoutSeconds: 2
+        readinessProbe:
+          failureThreshold: 1
+          httpGet:
+            port: 18012
+            path: /actuator/health
+            scheme: HTTP
+          periodSeconds: 5
+          successThreshold: 2
+          timeoutSeconds: 2
         resources:
           requests:
             cpu: 1000m