[KYUUBI #4819] [K8S][HELM] Refactor liveness and readiness probes

### _Why are the changes needed?_
The changes are needed to follow common flat structure pattern for liveness and readiness probes, for example:
- [Airflow](584a9f5dae/chart/values.yaml (L961-L973))
- [Superset](e3719a1b07/helm/superset/values.yaml (L300-L317))
- [Bitnami PostgreSQL](8f2277440b/bitnami/postgresql/values.yaml (L390-L410))
- [ArgoCD](b37a9e72a6/charts/argo-cd/values.yaml (L1631-L1653))

### _How was this patch tested?_
- [ ] Add some test cases that check the changes thoroughly including negative and positive cases if possible

- [ ] Add screenshots for manual tests if appropriate

- [ ] [Run test](https://kyuubi.readthedocs.io/en/master/develop_tools/testing.html#running-tests) locally before make a pull request

Closes #4819 from dnskr/helm_refactor_probes.

Closes #4819

eb692379f [dnskr] [K8S][HELM] Refactor liveness and readiness probes

Authored-by: dnskr <dnskrv88@gmail.com>
Signed-off-by: Cheng Pan <chengpan@apache.org>
This commit is contained in:
dnskr 2023-05-11 11:01:17 +08:00 committed by Cheng Pan
parent 299df0d7c2
commit d73d73eb2e
No known key found for this signature in database
GPG Key ID: 8001952629BCC75D
2 changed files with 30 additions and 28 deletions

View File

@ -65,25 +65,25 @@ spec:
containerPort: {{ $frontend.port }}
{{- end }}
{{- end }}
{{- if .Values.probe.liveness.enabled }}
{{- if .Values.livenessProbe.enabled }}
livenessProbe:
exec:
command: ["/bin/bash", "-c", "bin/kyuubi status"]
initialDelaySeconds: {{ .Values.probe.liveness.initialDelaySeconds }}
periodSeconds: {{ .Values.probe.liveness.periodSeconds }}
timeoutSeconds: {{ .Values.probe.liveness.timeoutSeconds }}
failureThreshold: {{ .Values.probe.liveness.failureThreshold }}
successThreshold: {{ .Values.probe.liveness.successThreshold }}
initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.livenessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }}
failureThreshold: {{ .Values.livenessProbe.failureThreshold }}
successThreshold: {{ .Values.livenessProbe.successThreshold }}
{{- end }}
{{- if .Values.probe.readiness.enabled }}
{{- if .Values.readinessProbe.enabled }}
readinessProbe:
exec:
command: ["/bin/bash", "-c", "$KYUUBI_HOME/bin/kyuubi status"]
initialDelaySeconds: {{ .Values.probe.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.probe.readiness.periodSeconds }}
timeoutSeconds: {{ .Values.probe.readiness.timeoutSeconds }}
failureThreshold: {{ .Values.probe.readiness.failureThreshold }}
successThreshold: {{ .Values.probe.readiness.successThreshold }}
initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
failureThreshold: {{ .Values.readinessProbe.failureThreshold }}
successThreshold: {{ .Values.readinessProbe.successThreshold }}
{{- end }}
{{- with .Values.resources }}
resources: {{- toYaml . | nindent 12 }}

View File

@ -41,22 +41,6 @@ rbac:
resources: ["pods"]
verbs: ["create", "list", "delete"]
probe:
liveness:
enabled: true
initialDelaySeconds: 30
periodSeconds: 10
timeoutSeconds: 2
failureThreshold: 10
successThreshold: 1
readiness:
enabled: true
initialDelaySeconds: 30
periodSeconds: 10
timeoutSeconds: 2
failureThreshold: 10
successThreshold: 1
server:
# Thrift Binary protocol (HiveServer2 compatible)
thriftBinary:
@ -162,6 +146,24 @@ resources: {}
# cpu: 2
# memory: 4Gi
# Liveness probe
livenessProbe:
enabled: true
initialDelaySeconds: 30
periodSeconds: 10
timeoutSeconds: 2
failureThreshold: 10
successThreshold: 1
# Readiness probe
readinessProbe:
enabled: true
initialDelaySeconds: 30
periodSeconds: 10
timeoutSeconds: 2
failureThreshold: 10
successThreshold: 1
# Constrain Kyuubi server pods to specific nodes
nodeSelector: {}
tolerations: []