Allow custom volumeClaimTemplates when logs.persistence.enabled is true#60118
Merged
jscheffl merged 2 commits intoapache:mainfrom Jan 5, 2026
Merged
Allow custom volumeClaimTemplates when logs.persistence.enabled is true#60118jscheffl merged 2 commits intoapache:mainfrom
jscheffl merged 2 commits intoapache:mainfrom
Conversation
jscheffl
approved these changes
Jan 5, 2026
Contributor
jscheffl
left a comment
There was a problem hiding this comment.
Good catch.
Can you please add a test case as well?
Contributor
Author
done, do review and merge at your availability after CI checks |
…plates based on persistence settings
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
98 tasks
jhgoebbert
pushed a commit
to jhgoebbert/airflow_Owen-CH-Leung
that referenced
this pull request
Feb 8, 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
Subham-KRLX
pushed a commit
to Subham-KRLX/airflow
that referenced
this pull request
Mar 4, 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
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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.