Skip to content

Add workers.celery.podAnnotations & workers.kubernetes.podAnnotations#65027

Merged
jscheffl merged 4 commits intoapache:mainfrom
Miretpl:add-workers-celery-k8s-pod-annotations
Apr 11, 2026
Merged

Add workers.celery.podAnnotations & workers.kubernetes.podAnnotations#65027
jscheffl merged 4 commits intoapache:mainfrom
Miretpl:add-workers-celery-k8s-pod-annotations

Conversation

@Miretpl
Copy link
Copy Markdown
Contributor

@Miretpl Miretpl commented Apr 10, 2026

related: #28880

This PR introduces two new fields: workers.celery.podAnnotations and workers.kubernetes.podAnnotations. The workers.podAnnotations field is now deprecated.


Was generative AI tooling used to co-author this PR?
  • Yes (please specify the tool below)

  • Read the Pull Request Guidelines for more information. Note: commit author/co-author name and email in commits become permanently public when merged.
  • For fundamental code changes, an Airflow Improvement Proposal (AIP) is needed.
  • When adding dependency, check compliance with the ASF 3rd Party License Policy.
  • For significant user-facing changes create newsfragment: {pr_number}.significant.rst, in airflow-core/newsfragments. You can add this file in a follow-up commit after the PR is created so you know the PR number.

@boring-cyborg boring-cyborg bot added the area:helm-chart Airflow Helm Chart label Apr 10, 2026
@kaxil kaxil requested a review from Copilot April 10, 2026 19:55
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Note

Copilot was unable to run its full agentic suite in this review.

This PR introduces new Helm values for worker pod annotations split by worker type (workers.celery.podAnnotations and workers.kubernetes.podAnnotations) and deprecates the legacy workers.podAnnotations.

Changes:

  • Add workers.celery.podAnnotations and workers.kubernetes.podAnnotations to values.yaml and values.schema.json, and mark workers.podAnnotations as deprecated.
  • Update pod-template-file annotation merging to prefer workers.kubernetes.podAnnotations (with fallback to the deprecated key).
  • Update/add Helm chart tests to validate templating, precedence, and per-worker annotation behavior; add deprecation note and newsfragment.

Reviewed changes

Copilot reviewed 9 out of 9 changed files in this pull request and generated 6 comments.

Show a summary per file
File Description
helm-tests/tests/helm_tests/airflow_core/test_worker_sets.py Adds coverage for Celery worker set podAnnotations overrides.
helm-tests/tests/helm_tests/airflow_core/test_worker.py Adjusts worker annotation tests to use workers.celery.podAnnotations.
helm-tests/tests/helm_tests/airflow_aux/test_pod_template_file.py Expands tests around templating / precedence of global vs worker annotation sources.
helm-tests/tests/helm_tests/airflow_aux/test_annotations.py Updates annotation templating tests; adds Celery-specific workers annotation cases and removes redundant pod-template-file tests.
chart/values.yaml Deprecates workers.podAnnotations; adds workers.celery.podAnnotations and workers.kubernetes.podAnnotations.
chart/values.schema.json Updates schema descriptions and adds schema entries for the new fields.
chart/templates/NOTES.txt Adds a deprecation warning for workers.podAnnotations.
chart/newsfragments/65027.significant.rst Documents the deprecation and migration path.
chart/files/pod-template-file.kubernetes-helm-yaml Switches pod-template-file annotation source to workers.kubernetes.podAnnotations with fallback.

@Miretpl Miretpl force-pushed the add-workers-celery-k8s-pod-annotations branch from f8db0a1 to 5d6e9bb Compare April 11, 2026 13:22
@Miretpl Miretpl force-pushed the add-workers-celery-k8s-pod-annotations branch from 5d6e9bb to b2f051a Compare April 11, 2026 16:17
@Miretpl Miretpl marked this pull request as ready for review April 11, 2026 16:17
@jscheffl jscheffl added the backport-to-chart/v1-2x-test Automatic backport to chart 1.2x maintenance branch label Apr 11, 2026
@jscheffl jscheffl merged commit 8a02c43 into apache:main Apr 11, 2026
131 of 139 checks passed
github-actions bot pushed a commit that referenced this pull request Apr 11, 2026
…etes.podAnnotations (#65027)

* Move pod_template annotations tests & add missing test cases

* Add workers.celery.podAnnotations & workers.kubernetes.podAnnotations

* Add newsfragment

* Make pod template tests more robust
(cherry picked from commit 8a02c43)

Co-authored-by: Przemysław Mirowski <17602603+Miretpl@users.noreply.github.com>
@github-actions
Copy link
Copy Markdown

Backport successfully created: chart/v1-2x-test

Note: As of Merging PRs targeted for Airflow 3.X
the committer who merges the PR is responsible for backporting the PRs that are bug fixes (generally speaking) to the maintenance branches.

In matter of doubt please ask in #release-management Slack channel.

Status Branch Result
chart/v1-2x-test PR Link

jscheffl pushed a commit that referenced this pull request Apr 11, 2026
…etes.podAnnotations (#65027) (#65068)

* Move pod_template annotations tests & add missing test cases

* Add workers.celery.podAnnotations & workers.kubernetes.podAnnotations

* Add newsfragment

* Make pod template tests more robust
(cherry picked from commit 8a02c43)

Co-authored-by: Przemysław Mirowski <17602603+Miretpl@users.noreply.github.com>
@Miretpl Miretpl deleted the add-workers-celery-k8s-pod-annotations branch April 11, 2026 18:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area:helm-chart Airflow Helm Chart backport-to-chart/v1-2x-test Automatic backport to chart 1.2x maintenance branch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants