This is an automated email from the ASF dual-hosted git repository.
benjobs pushed a commit to branch dev-2.1.5
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
The following commit(s) were added to refs/heads/dev-2.1.5 by this push:
new ed46fd09b fixed logback.xml -> logback-spring.xml (#3717)
ed46fd09b is described below
commit ed46fd09bd933ea6aae7b1c576a44e474134ce5c
Author: soulzz <[email protected]>
AuthorDate: Sun May 19 11:00:41 2024 +0800
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 <[email protected]>
---
.../{logback.xml => logback-spring.xml} | 0
helm/streampark/templates/streampark.yml | 20 +++++++++++++++-----
helm/streampark/values.yaml | 8 ++++++--
3 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/helm/streampark/conf/streampark-console-config/logback.xml
b/helm/streampark/conf/streampark-console-config/logback-spring.xml
similarity index 100%
rename from helm/streampark/conf/streampark-console-config/logback.xml
rename to helm/streampark/conf/streampark-console-config/logback-spring.xml
diff --git a/helm/streampark/templates/streampark.yml
b/helm/streampark/templates/streampark.yml
index 0a465be6a..9be7ba0df 100755
--- 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
index 59d61b745..b0b64473c 100644
--- 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"
