fixed logback.xml -> logback-spring.xml (#3717)

* fixed logback.xml -> logback-spring.xml * modify livenessProbe & readinessProbe use httpGet modify volumeMounts streampark-default-config-volume mountPath /usr/local/service/streampark/conf > /streampark/conf * fixed readinessProbe Values.spec.livenessProbe.containerPort > Values.spec.readinessProbe.containerPort --------- Co-authored-by: zhangmz <soulmz@dingtalk.com>
apache · May 19, 2024 · ed46fd0 · ed46fd0
1 parent 7d0d1e6
commit ed46fd0
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 7 deletions.
diff --git a/...onf/streampark-console-config/logback.xml → ...eampark-console-config/logback-spring.xml b/...onf/streampark-console-config/logback.xml → ...eampark-console-config/logback-spring.xml
diff --git a/helm/streampark/templates/streampark.yml b/helm/streampark/templates/streampark.yml
@@ -63,8 +63,13 @@ spec:
           command: ["bash","-c","bash ./bin/streampark.sh start_docker"]
           {{- if .Values.spec.livenessProbe.enabled }}
           livenessProbe:
-            exec:
-              command: [ "curl", "-s", "http://localhost:10000/actuator/health/liveness" ]
+            httpGet:
+            {{- if .Values.spec.livenessProbe.containerPort }}
+              port: {{ .Values.spec.livenessProbe.containerPort }}
+            {{- else  }}
+              port: {{ .Values.spec.containerPort }}
+            {{- end }}
+              path: {{ .Values.spec.livenessProbe.livenessPath }}
             initialDelaySeconds: {{ .Values.spec.livenessProbe.initialDelaySeconds }}
             periodSeconds: {{ .Values.spec.livenessProbe.periodSeconds }}
             timeoutSeconds: {{ .Values.spec.livenessProbe.timeoutSeconds }}
@@ -73,8 +78,13 @@ spec:
           {{- end }}
           {{- if .Values.spec.readinessProbe.enabled }}
           readinessProbe:
-            exec:
-              command: [ "curl", "-s", "http://localhost:10000/actuator/health/readiness" ]
+            httpGet:
+            {{- if .Values.spec.readinessProbe.containerPort }}
+              port: {{ .Values.spec.readinessProbe.containerPort }}
+            {{- else  }}
+              port: {{ .Values.spec.containerPort }}
+            {{- end }}
+              path: {{ .Values.spec.readinessProbe.readinessPath }}
             initialDelaySeconds: {{ .Values.spec.readinessProbe.initialDelaySeconds }}
             periodSeconds: {{ .Values.spec.readinessProbe.periodSeconds }}
             timeoutSeconds: {{ .Values.spec.readinessProbe.timeoutSeconds }}
@@ -83,7 +93,7 @@ spec:
           {{- end }}
           volumeMounts:
             - name: streampark-default-config-volume
-              mountPath: /usr/local/service/streampark/conf
+              mountPath: /streampark/conf
           resources:
           {{- toYaml .Values.spec.resources | nindent 12 }}
       volumes:

diff --git a/helm/streampark/values.yaml b/helm/streampark/values.yaml
@@ -87,7 +87,9 @@ spec:
   ## More info: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/
   livenessProbe:
     enabled: true
-    initialDelaySeconds: "90"
+    containerPort: 10000
+    livenessPath: "/actuator/health/liveness"
+    initialDelaySeconds: "45"
     periodSeconds: "30"
     timeoutSeconds: "20"
     failureThreshold: "3"
@@ -97,7 +99,9 @@ spec:
   ## More info: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/
   readinessProbe:
     enabled: true
-    initialDelaySeconds: "90"
+    containerPort: 10000
+    readinessPath: "/actuator/health/liveness"
+    initialDelaySeconds: "45"
     periodSeconds: "30"
     timeoutSeconds: "20"
     failureThreshold: "3"