Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(chart): webserver probes timeout and period. #30609

Merged
merged 6 commits into from
Apr 14, 2023
Merged

fix(chart): webserver probes timeout and period. #30609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9465f5f
fix(chart): webserver probes timeout and period
mikaeld Apr 12, 2023
119a457
Update default values in JSON schema to reflect values.yaml
mikaeld Apr 12, 2023
f4920e9
remove defautl templated values
mikaeld Apr 13, 2023
81dd721
Merge branch 'main' into fix/helm/webserver-probe-config
mikaeld Apr 13, 2023
276190b
Merge branch 'main' into fix/helm/webserver-probe-config
mikaeld Apr 13, 2023
c9f28a3
Merge branch 'main' into fix/helm/webserver-probe-config
mikaeld Apr 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions chart/templates/webserver/webserver-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,10 +203,10 @@ spec:
value: {{ regexReplaceAll ":\\d+$" (urlParse (tpl .Values.config.webserver.base_url .)).host "" }}
{{- end }}
scheme: {{ .Values.webserver.livenessProbe.scheme | default "http" }}
initialDelaySeconds: {{ .Values.webserver.livenessProbe.initialDelaySeconds | default 15 }}
timeoutSeconds: {{ .Values.webserver.livenessProbe.timeoutSeconds | default 30 }}
failureThreshold: {{ .Values.webserver.livenessProbe.failureThreshold | default 20 }}
periodSeconds: {{ .Values.webserver.livenessProbe.periodSeconds | default 5 }}
initialDelaySeconds: {{ .Values.webserver.livenessProbe.initialDelaySeconds }}
timeoutSeconds: {{ .Values.webserver.livenessProbe.timeoutSeconds }}
failureThreshold: {{ .Values.webserver.livenessProbe.failureThreshold }}
periodSeconds: {{ .Values.webserver.livenessProbe.periodSeconds }}
readinessProbe:
httpGet:
path: {{ if .Values.config.webserver.base_url }}{{- with urlParse (tpl .Values.config.webserver.base_url .) }}{{ .path }}{{ end }}{{ end }}/health
Expand All @@ -217,10 +217,10 @@ spec:
value: {{ regexReplaceAll ":\\d+$" (urlParse (tpl .Values.config.webserver.base_url .)).host "" }}
{{- end }}
scheme: {{ .Values.webserver.readinessProbe.scheme | default "http" }}
initialDelaySeconds: {{ .Values.webserver.readinessProbe.initialDelaySeconds | default 15 }}
timeoutSeconds: {{ .Values.webserver.readinessProbe.timeoutSeconds | default 30 }}
failureThreshold: {{ .Values.webserver.readinessProbe.failureThreshold | default 20 }}
periodSeconds: {{ .Values.webserver.readinessProbe.periodSeconds | default 5 }}
initialDelaySeconds: {{ .Values.webserver.readinessProbe.initialDelaySeconds }}
timeoutSeconds: {{ .Values.webserver.readinessProbe.timeoutSeconds }}
failureThreshold: {{ .Values.webserver.readinessProbe.failureThreshold }}
periodSeconds: {{ .Values.webserver.readinessProbe.periodSeconds }}
envFrom: {{- include "custom_airflow_environment_from" . | default "\n []" | indent 10 }}
env:
{{- include "custom_airflow_environment" . | indent 10 }}
Expand Down
12 changes: 6 additions & 6 deletions chart/values.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3211,17 +3211,17 @@
"timeoutSeconds": {
"description": "Webserver Liveness probe timeout seconds.",
"type": "integer",
"default": 30
"default": 5
},
"failureThreshold": {
"description": "Webserver Liveness probe failure threshold.",
"type": "integer",
"default": 20
"default": 5
},
"periodSeconds": {
"description": "Webserver Liveness probe period seconds.",
"type": "integer",
"default": 5
"default": 10
},
"scheme": {
"description": "Webserver Liveness probe scheme.",
Expand All @@ -3243,17 +3243,17 @@
"timeoutSeconds": {
"description": "Webserver Readiness probe timeout seconds.",
"type": "integer",
"default": 30
"default": 5
},
"failureThreshold": {
"description": "Webserver Readiness probe failure threshold.",
"type": "integer",
"default": 20
"default": 5
},
"periodSeconds": {
"description": "Webserver Readiness probe period seconds.",
"type": "integer",
"default": 5
"default": 10
},
"scheme": {
"description": "Webserver Readiness probe scheme.",
Expand Down
12 changes: 6 additions & 6 deletions chart/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -958,16 +958,16 @@ webserver:
allowPodLogReading: true
livenessProbe:
initialDelaySeconds: 15
timeoutSeconds: 30
failureThreshold: 20
periodSeconds: 5
timeoutSeconds: 5
failureThreshold: 5
periodSeconds: 10
scheme: HTTP

readinessProbe:
initialDelaySeconds: 15
timeoutSeconds: 30
failureThreshold: 20
periodSeconds: 5
timeoutSeconds: 5
failureThreshold: 5
periodSeconds: 10
scheme: HTTP

# Number of webservers
Expand Down