Skip to content

Conversation

@arjav1528
Copy link
Contributor

Fixes : #59571

Problem

Custom volumeClaimTemplates for workers were ignored when workers.persistence.enabled: true and logs.persistence.enabled: true. The volumeClaimTemplates section was only rendered in the {{- else }} branch, which only runs when logs.persistence.enabled: false. As a result, custom templates were never created, causing pods to fail with volume mount errors.

Root Cause:

The template logic in worker-deployment.yaml had the volumeClaimTemplates section nested inside an {{- else }} block that only executed when logs.persistence.enabled: false. When logs.persistence.enabled: true, the code took the first branch (creating logs as a regular PVC) and skipped the {{- else }} block entirely, preventing custom volumeClaimTemplates from being rendered.

Solution

Separated the volumeClaimTemplates logic from the logs volume handling. The volumeClaimTemplates section is now created independently when:
workers.persistence.enabled: true (StatefulSet is used), AND
Either logs.persistence.enabled: false (logs needs to be a template) OR custom volumeClaimTemplates are provided
This ensures custom volumeClaimTemplates are always rendered when provided, regardless of the logs persistence setting.

Copy link
Contributor

@jscheffl jscheffl left a comment

Choose a reason for hiding this comment

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

Good catch.

Can you please add a test case as well?

@arjav1528 arjav1528 requested a review from dstandish as a code owner January 5, 2026 13:34
@arjav1528
Copy link
Contributor Author

Good catch.

Can you please add a test case as well?

done, do review and merge at your availability after CI checks

@jscheffl jscheffl merged commit 8e5bc6f into apache:main Jan 5, 2026
93 checks passed
@jscheffl jscheffl added this to the Airflow Helm Chart 1.19.0 milestone Jan 5, 2026
chirodip98 pushed a commit to chirodip98/airflow-contrib that referenced this pull request Jan 9, 2026
…ue (apache#60118)

* Update worker-deployment.yaml to conditionally include volumeClaimTemplates based on persistence settings

* Add tests for volumeClaimTemplates behavior with logs persistence enabled
stegololz pushed a commit to stegololz/airflow that referenced this pull request Jan 9, 2026
…ue (apache#60118)

* Update worker-deployment.yaml to conditionally include volumeClaimTemplates based on persistence settings

* Add tests for volumeClaimTemplates behavior with logs persistence enabled
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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[helm-chart] 1.16.0: Cannot add custom volumeClaimTemplates to workers

2 participants