Skip to content

More restrictive chart rendering logic#63464

Merged
jscheffl merged 11 commits intoapache:mainfrom
Miretpl:fix-if-conditions
Mar 12, 2026
Merged

More restrictive chart rendering logic#63464
jscheffl merged 11 commits intoapache:mainfrom
Miretpl:fix-if-conditions

Conversation

@Miretpl
Copy link
Contributor

@Miretpl Miretpl commented Mar 12, 2026

While checking the chart for unremoved items after #61018, I noticed that we actually have some missing conditional logic or inconsistent places.

This PR consists of changes in the rendering conditions for various places in the chart:

  1. Render API Server HPA only when Airflow >= 3.0 and api server is enabled (in addition to the existing condition)
  2. Adjust PgBouncer Network Policy KEDA enabled var to Hybrid Executors
  3. Adjust SCC RoleBinding for Workers to Hybrid Executors
  4. Render subjects for various components in SCC RoleBinding when enabled
  5. Generate Flower secret when Flower is enabled (in addition to the existing condition)
  6. Generate Kerberos Keytab secret when Kerberos is enabled (in addition to the existing condition)
  7. Generate PgBouncer Certificate Secret when PgBouncer is enabled (in addition to the existing condition)

Additional changes to the above-mentioned are:

  1. Removal of airflowVersion in API Server HPA tests
  2. Simplification of SCC RoleBinding tests and separation of some per Airflow 2 and default chart version

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 Mar 12, 2026
@Miretpl Miretpl marked this pull request as ready for review March 12, 2026 21:29
@Miretpl
Copy link
Contributor Author

Miretpl commented Mar 12, 2026

Not sure how the current run will be, but in general, static checks are failing due to the AGENTS.md file (so unrelated to this PR changes). I saw that there is a PR to fix for that already

@Miretpl
Copy link
Contributor Author

Miretpl commented Mar 12, 2026

Saw that the fix for the static check was merged, so it should be good now.

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.

Looks good! Let's have CI green and then...

@jscheffl jscheffl merged commit bc6eaf2 into apache:main Mar 12, 2026
98 checks passed
Pyasma pushed a commit to Pyasma/airflow that referenced this pull request Mar 13, 2026
* Fix api server hpa render

* Fix keda enabled if for pgbouncer network policy

* Fix rendering of flower-secret

* Fix pgbouncer certificate secret rendering

* Fix kerberos keytab secret rendering

* Refactor scc rolebinding tests

* Fix scc rolebanding rendering
@Miretpl Miretpl deleted the fix-if-conditions branch March 15, 2026 14:50
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.

2 participants