github-actions[bot] opened a new pull request, #65081:
URL: https://github.com/apache/airflow/pull/65081
* Support tpl rendering in ServiceAccount annotations, metadataConnection,
and config ConfigMap names
The scheduler ServiceAccount already tpl-renders annotations via
range/tpl, but all other ServiceAccounts (pgbouncer, webserver, workers,
triggerer, dag-processor, api-server) use raw toYaml. This makes it
impossible to use template expressions like
{{ .Values.global.appName }}[email protected] in
annotation values for those components.
Apply the same range/tpl pattern from the scheduler to all ServiceAccount
templates for consistency.
Also tpl-render data.metadataConnection.user and
data.metadataConnection.db so wrapper charts can derive database
credentials from template expressions instead of requiring static values.
This affects the metadata connection secret and pgbouncer config.
Also tpl-render webserverConfigConfigMapName and
apiServerConfigConfigMapName so wrapper charts can use
{{ .Release.Name }}-custom-config instead of hardcoding the release name.
All changes are backward compatible: tpl on a plain string without
template expressions returns the string unchanged.
* Address review feedback: make tplDict generic, move tests to existing files
- Remove nindent from tplDict helper, move indent to call sites
- Move SA annotation tpl tests to test_annotations.py
- Move metadataConnection tpl tests to test_metadata_connection_secret.py
- Split Airflow 2/3 version tests into separate parametrized cases
- Remove conditional logic from tests per review feedback
- Fix result-backend nit (remove unnecessary parens)
- Delete test_tpl_rendering.py (tests relocated)
Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>
* Address round 2 review: split pgbouncer, use celery/k8s worker SA, fix
versions
- Separate pgbouncer into dedicated test (no conditional logic)
- Use workers.celery.serviceAccount for Celery worker tpl test
- Add workers.kubernetes.serviceAccount test for KubernetesExecutor
- Use airflowVersion 2.11.0 (first supported 2.11) instead of 2.11.2
- Remove explicit airflowVersion from Airflow 3 tests (default is 3.x)
Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>
* Remove kubernetes worker SA test — workers.kubernetes does not own SA
template
The worker SA template reads from workers.serviceAccount (merged from
workers.celery), not workers.kubernetes.serviceAccount. Removed invalid test.
All 82 tests in test_annotations.py and test_metadata_connection_secret.py
pass.
Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>
* Fix tplDict multi-annotation bug: use toYaml instead of printf
The previous printf-based approach concatenated multiple annotations
into a single YAML line due to whitespace trimming. Replace with
dict-building + toYaml for correct YAML output with any number of
entries. Also adds toString for non-string value safety.
Added test_tpl_rendered_multiple_annotations to verify 3 annotations
(2 templated + 1 plain) render correctly.
Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>
* Add KubernetesExecutor worker SA tpl annotation test
The worker-serviceaccount.yaml template serves both CeleryExecutor and
KubernetesExecutor. Add test verifying tpl rendering works for the
KubernetesExecutor path via workers.serviceAccount.annotations.
Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>
---------
(cherry picked from commit 3a458dea5e98f0f3c23a288a9497e6c6c071df09)
Co-authored-by: shlomi tubul <[email protected]>
Co-authored-by: Claude Opus 4.6 (1M context) <[email protected]>
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
