Skip to content

Add workers.celery.resources & workers.kubernetes.resources #61890

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
jscheffl merged 3 commits into from
Mar 11, 2026
Merged

Add workers.celery.resources & workers.kubernetes.resources #61890

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dc7a626
Add workers.celery.resources & workers.kubernetes.resources
Miretpl Feb 13, 2026
3c3aae6
Add newsfragment
Miretpl Feb 13, 2026
1c1955a
Merge branch 'main' into add-workers-celery-k8s-resources
Miretpl Mar 11, 2026
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
2 changes: 1 addition & 1 deletion chart/files/pod-template-file.kubernetes-helm-yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ spec:
{{- if or .Values.workers.kubernetes.command .Values.workers.command }}
command: {{ tpl (toYaml (.Values.workers.kubernetes.command | default .Values.workers.command)) . | nindent 8 }}
{{- end }}
resources: {{- toYaml .Values.workers.resources | nindent 8 }}
resources: {{- toYaml (.Values.workers.kubernetes.resources | default .Values.workers.resources) | nindent 8 }}
volumeMounts:
- mountPath: {{ template "airflow_logs" . }}
name: logs
Expand Down
1 change: 1 addition & 0 deletions chart/newsfragments/61890.significant.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
``workers.resources`` section is now deprecated in favor of ``workers.celery.resources`` and ``workers.kubernetes.resources``. Please update your configuration accordingly.
8 changes: 8 additions & 0 deletions chart/templates/NOTES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,6 +501,14 @@ DEPRECATION WARNING:

{{- end }}

{{- if not (empty .Values.workers.resources) }}

DEPRECATION WARNING:
`workers.resources` has been renamed to `workers.celery.resources`/`workers.kubernetes.resources`.
Please change your values as support for the old name will be dropped in a future release.

{{- end }}

{{- if not (empty .Values.webserver.defaultUser) }}

DEPRECATION WARNING:
Expand Down
38 changes: 37 additions & 1 deletion chart/values.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2264,7 +2264,7 @@
}
},
"resources": {
"description": "Resource configuration for Airflow Celery workers and pods created with pod-template-file.",
"description": "Resource configuration for Airflow Celery workers and pods created with pod-template-file (deprecated, use `workers.celery.resources` or/and `workers.kubernetes.resources` instead).",
"type": "object",
"default": {},
"examples": [
Expand Down Expand Up @@ -3257,6 +3257,24 @@
}
}
}
},
"resources": {
"description": "Resource configuration for Airflow Celery workers.",
"type": "object",
"default": {},
"examples": [
{
"limits": {
"cpu": "100m",
"memory": "128Mi"
},
"requests": {
"cpu": "100m",
"memory": "128Mi"
}
}
],
"$ref": "#/definitions/io.k8s.api.core.v1.ResourceRequirements"
}
}
},
Expand Down Expand Up @@ -3512,6 +3530,24 @@
}
}
}
},
"resources": {
"description": "Resource configuration for pods created with pod-template-file.",
"type": "object",
"default": {},
"examples": [
{
"limits": {
"cpu": "100m",
"memory": "128Mi"
},
"requests": {
"cpu": "100m",
"memory": "128Mi"
}
}
],
"$ref": "#/definitions/io.k8s.api.core.v1.ResourceRequirements"
}
}
}
Expand Down
19 changes: 19 additions & 0 deletions chart/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -898,6 +898,7 @@ workers:
containerLifecycleHooks: {}

# Resource configuration for Airflow Celery workers and pods created with pod-template-file
# (deprecated, use `workers.celery.resources` or/and `workers.kubernetes.resources` instead)
resources: {}
# limits:
# cpu: 100m
Expand Down Expand Up @@ -1246,6 +1247,15 @@ workers:
# Container level lifecycle hooks
containerLifecycleHooks: {}

# Resource configuration for Airflow Celery workers
resources: {}
# limits:
# cpu: 100m
# memory: 128Mi
# requests:
# cpu: 100m
# memory: 128Mi

kubernetes:
# Command to use in pod-template-file (templated)
command: ~
Expand Down Expand Up @@ -1301,6 +1311,15 @@ workers:
# Container level lifecycle hooks
containerLifecycleHooks: {}

# Resource configuration for pods created with pod-template-file
resources: {}
# limits:
# cpu: 100m
# memory: 128Mi
# requests:
# cpu: 100m
# memory: 128Mi

# Airflow scheduler settings
scheduler:
enabled: true
Expand Down
26 changes: 13 additions & 13 deletions helm-tests/tests/helm_tests/airflow_aux/test_pod_template_file.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1015,25 +1015,25 @@ def test_should_add_component_specific_labels(self):
assert "test_label" in jmespath.search("metadata.labels", docs[0])
assert jmespath.search("metadata.labels", docs[0])["test_label"] == "test_label_value"

def test_should_add_resources(self):
docs = render_chart(
values={
"workers": {
"resources": {
"requests": {"memory": "2Gi", "cpu": "1"},
"limits": {"memory": "3Gi", "cpu": "2"},
}
}
@pytest.mark.parametrize(
"workers_values",
[
{"resources": {"requests": {"memory": "2Gi", "cpu": "1"}}},
{"kubernetes": {"resources": {"requests": {"memory": "2Gi", "cpu": "1"}}}},
{
"resources": {"limits": {"memory": "1Gi", "cpu": "2"}},
"kubernetes": {"resources": {"requests": {"memory": "2Gi", "cpu": "1"}}},
},
],
)
def test_should_add_resources(self, workers_values):
docs = render_chart(
values={"workers": workers_values},
show_only=["templates/pod-template-file.yaml"],
chart_dir=self.temp_chart_dir,
)

assert jmespath.search("spec.containers[0].resources", docs[0]) == {
"limits": {
"cpu": "2",
"memory": "3Gi",
},
"requests": {
"cpu": "1",
"memory": "2Gi",
Expand Down
48 changes: 19 additions & 29 deletions helm-tests/tests/helm_tests/airflow_core/test_worker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -821,41 +821,31 @@ def test_logs_persistence_changes_volume(self, log_values, expected_volume):

assert {"name": "logs", **expected_volume} in jmespath.search("spec.template.spec.volumes", docs[0])

def test_worker_resources_are_configurable(self):
docs = render_chart(
values={
"workers": {
"resources": {
"limits": {"cpu": "200m", "memory": "128Mi"},
"requests": {"cpu": "300m", "memory": "169Mi"},
}
},
@pytest.mark.parametrize(
"workers_values",
[
{"resources": {"requests": {"cpu": "300m", "memory": "169Mi"}}},
{"celery": {"resources": {"requests": {"cpu": "300m", "memory": "169Mi"}}}},
{
"resources": {"limits": {"cpu": "100m", "memory": "128Mi"}},
"celery": {"resources": {"requests": {"cpu": "300m", "memory": "169Mi"}}},
},
],
)
def test_worker_resources_are_configurable(self, workers_values):
docs = render_chart(
values={"workers": workers_values},
show_only=["templates/workers/worker-deployment.yaml"],
)
# main container
assert jmespath.search("spec.template.spec.containers[0].resources.limits.memory", docs[0]) == "128Mi"
assert jmespath.search("spec.template.spec.containers[0].resources.limits.cpu", docs[0]) == "200m"

assert (
jmespath.search("spec.template.spec.containers[0].resources.requests.memory", docs[0]) == "169Mi"
)
assert jmespath.search("spec.template.spec.containers[0].resources.requests.cpu", docs[0]) == "300m"
assert jmespath.search("spec.template.spec.containers[0].resources", docs[0]) == {
"requests": {"cpu": "300m", "memory": "169Mi"}
}

# initContainer wait-for-airflow-configurations
assert (
jmespath.search("spec.template.spec.initContainers[0].resources.limits.memory", docs[0])
== "128Mi"
)
assert jmespath.search("spec.template.spec.initContainers[0].resources.limits.cpu", docs[0]) == "200m"

assert (
jmespath.search("spec.template.spec.initContainers[0].resources.requests.memory", docs[0])
== "169Mi"
)
assert (
jmespath.search("spec.template.spec.initContainers[0].resources.requests.cpu", docs[0]) == "300m"
)
assert jmespath.search("spec.template.spec.initContainers[0].resources", docs[0]) == {
"requests": {"cpu": "300m", "memory": "169Mi"}
}

def test_worker_resources_are_not_added_by_default(self):
docs = render_chart(
Expand Down
16 changes: 16 additions & 0 deletions helm-tests/tests/helm_tests/airflow_core/test_worker_sets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2149,6 +2149,22 @@ def test_overwrite_kerberos_sidecar_container_lifecycle_hooks(self, values):
],
},
},
{
"celery": {
"resources": {
"requests": {"cpu": "10m", "memory": "20Mi"},
},
"enableDefault": False,
"sets": [
{
"name": "test",
"resources": {
"limits": {"cpu": "3m", "memory": "4Mi"},
},
}
],
},
},
],
)
def test_overwrite_resources(self, values):
Expand Down
Loading