Skip to content

Flower K8s Probe config #37528

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

Merged
potiuk merged 8 commits into from
Feb 20, 2024
Merged

Flower K8s Probe config #37528

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
551cc83
flower probe config values
Seokyun-Ha Feb 19, 2024
d04a355
fix typo
Seokyun-Ha Feb 19, 2024
d073a4b
flower probe config to values schema
Seokyun-Ha Feb 19, 2024
314f607
Merge branch 'main' into flower-probe-config
Seokyun-Ha Feb 19, 2024
4394c72
flower probe timeout seconds
Seokyun-Ha Feb 19, 2024
8b48abe
probe values configurable test
Seokyun-Ha Feb 19, 2024
7a33e41
Merge branch 'main' into flower-probe-config
Seokyun-Ha Feb 19, 2024
e8ab301
static checks lint
Seokyun-Ha Feb 19, 2024
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
14 changes: 8 additions & 6 deletions chart/templates/flower/flower-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ spec:
- name: flower-ui
containerPort: {{ .Values.ports.flowerUI }}
livenessProbe:
failureThreshold: 10
failureThreshold: {{ .Values.flower.livenessProbe.failureThreshold }}
exec:
command:
- curl
Expand All @@ -125,10 +125,11 @@ spec:
- $AIRFLOW__CELERY__FLOWER_BASIC_AUTH
{{- end }}
- {{ printf "localhost:%s" (.Values.ports.flowerUI | toString) }}
initialDelaySeconds: 10
periodSeconds: 5
initialDelaySeconds: {{ .Values.flower.livenessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.flower.livenessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.flower.livenessProbe.timeoutSeconds }}
readinessProbe:
failureThreshold: 10
failureThreshold: {{ .Values.flower.readinessProbe.failureThreshold }}
exec:
command:
- curl
Expand All @@ -137,8 +138,9 @@ spec:
- $AIRFLOW__CELERY__FLOWER_BASIC_AUTH
{{- end }}
- {{ printf "localhost:%s" (.Values.ports.flowerUI | toString) }}
initialDelaySeconds: 10
periodSeconds: 5
initialDelaySeconds: {{ .Values.flower.readinessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.flower.readinessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.flower.readinessProbe.timeoutSeconds }}
envFrom:
{{- include "custom_airflow_environment_from" . | default "\n []" | indent 10 }}
env:
Expand Down
54 changes: 54 additions & 0 deletions chart/values.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4955,6 +4955,60 @@
"type": "boolean",
"default": false
},
"livenessProbe": {
"description": "Liveness probe configuration.",
"type": "object",
"additionalProperties": false,
"properties": {
"initialDelaySeconds": {
"description": "Flower Liveness probe initial delay.",
"type": "integer",
"default": 10
},
"timeoutSeconds": {
"description": "Flower Liveness probe timeout seconds.",
"type": "integer",
"default": 5
},
"failureThreshold": {
"description": "Flower Liveness probe failure threshold.",
"type": "integer",
"default": 10
},
"periodSeconds": {
"description": "Flower Liveness probe period seconds.",
"type": "integer",
"default": 5
}
}
},
"readinessProbe": {
"description": "Readiness probe configuration.",
"type": "object",
"additionalProperties": false,
"properties": {
"initialDelaySeconds": {
"description": "Flower Readiness probe initial delay.",
"type": "integer",
"default": 10
},
"timeoutSeconds": {
"description": "Flower Readiness probe timeout seconds.",
"type": "integer",
"default": 5
},
"failureThreshold": {
"description": "Flower Readiness probe failure threshold.",
"type": "integer",
"default": 10
},
"periodSeconds": {
"description": "Flower Readiness probe period seconds.",
"type": "integer",
"default": 5
}
}
},
"revisionHistoryLimit": {
"description": "Number of old replicasets to retain.",
"type": [
Expand Down
13 changes: 13 additions & 0 deletions chart/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1708,6 +1708,19 @@ flower:
# Enable flower.
# If True, and using CeleryExecutor/CeleryKubernetesExecutor, will deploy flower app.
enabled: false

livenessProbe:
initialDelaySeconds: 10
timeoutSeconds: 5
failureThreshold: 10
periodSeconds: 5

readinessProbe:
initialDelaySeconds: 10
timeoutSeconds: 5
failureThreshold: 10
periodSeconds: 5

# Max number of old replicasets to retain
revisionHistoryLimit: ~

Expand Down
24 changes: 24 additions & 0 deletions helm_tests/other/test_flower.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,6 +363,30 @@ def test_should_add_component_specific_annotations(self):
assert "annotations" in jmespath.search("metadata", docs[0])
assert jmespath.search("metadata.annotations", docs[0])["test_annotation"] == "test_annotation_value"

@pytest.mark.parametrize("probe", ["livenessProbe", "readinessProbe"])
def test_probe_values_are_configurable(self, probe):
docs = render_chart(
values={
"flower": {
"enabled": True,
probe: {
"initialDelaySeconds": 111,
"timeoutSeconds": 222,
"failureThreshold": 333,
"periodSeconds": 444,
},
},
},
show_only=["templates/flower/flower-deployment.yaml"],
)

assert 111 == jmespath.search(
f"spec.template.spec.containers[0].{probe}.initialDelaySeconds", docs[0]
)
assert 222 == jmespath.search(f"spec.template.spec.containers[0].{probe}.timeoutSeconds", docs[0])
assert 333 == jmespath.search(f"spec.template.spec.containers[0].{probe}.failureThreshold", docs[0])
assert 444 == jmespath.search(f"spec.template.spec.containers[0].{probe}.periodSeconds", docs[0])


class TestFlowerService:
"""Tests flower service."""
Expand Down