Skip to content

Use merged to render airflow.cfg and include computed defaults #51828

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
romsharon98 merged 6 commits into from
Jun 20, 2025
Merged

Use merged to render airflow.cfg and include computed defaults #51828

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d07ded3
Use merged to render airflow.cfg and include computed defaults
bdsoha Jun 17, 2025
b78a9d5
Move into scope
bdsoha Jun 17, 2025
39f863c
Merge branch 'main' into feature/helm-use-merged-config-values
bdsoha Jun 17, 2025
25c5e4d
Merge branch 'main' into feature/helm-use-merged-config-values
bdsoha Jun 17, 2025
a162dbf
Use deepCopy instead of merge
bdsoha Jun 20, 2025
c7a92e5
Merge branch 'feature/helm-use-merged-config-values' of github.com:bd…
bdsoha Jun 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions chart/templates/configmaps/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ metadata:
{{- end }}
{{- $Global := . }}
data:
{{- $config := deepCopy .Values.config | merge (dict "core" dict) }}
{{/*- Set a default for core.execution_api_server_url pointing to the api-server service if it's not set -*/}}
{{- if semverCompare ">=3.0.0" .Values.airflowVersion -}}
{{- $basePath := "" -}}
{{- $config := merge .Values.config ( dict "core" dict )}}
{{- if not (hasKey $config.core "execution_api_server_url") -}}
{{- if (and $config.api $config.api.base_url) -}}
{{- with urlParse $config.api.base_url }}{{ $basePath = (trimSuffix "/" .path) }}{{ end }}
Expand All @@ -51,7 +51,7 @@ data:
{{- end -}}
# These are system-specified config overrides.
airflow.cfg: |-
{{- range $section, $settings := .Values.config }}
{{- range $section, $settings := $config }}
[{{ $section }}]
{{- range $key, $val := $settings }}
{{ $key }} = {{ tpl ($val | toString) $Global }}
Expand Down
13 changes: 6 additions & 7 deletions helm-tests/tests/helm_tests/airflow_aux/test_configmap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ def test_standalone_dag_processor_explicit(self, airflow_version, enabled):
"3.0.0",
None,
None,
"http://release-name-api-server:8080/execution",
"http://release-name-api-server:8080/execution/",
),
(
"2.9.0",
Expand All @@ -260,13 +260,13 @@ def test_standalone_dag_processor_explicit(self, airflow_version, enabled):
"3.0.0",
"http://example.com",
None,
"http://release-name-api-server:8080/execution",
"http://release-name-api-server:8080/execution/",
),
(
"3.0.0",
"http://example.com/airflow",
None,
"http://release-name-api-server:8080/airflow/execution",
"http://release-name-api-server:8080/airflow/execution/",
),
(
"3.0.0",
Expand All @@ -291,14 +291,13 @@ def test_execution_api_server_url(
show_only=["templates/configmaps/configmap.yaml"],
)

# config is the jmespath search for the data["airflow.cfg"] in the configmap
config = jmespath.search('data.["airflow.cfg"]', configmap[0])
config = jmespath.search('data."airflow.cfg"', configmap[0])
assert config is not None, "Configmap data for airflow.cfg should not be None"
assert len(config) > 0, "Configmap data for airflow.cfg should not be empty"

if expected_execution_url is not None:
assert f"\nexecution_api_server_url = {expected_execution_url}" in config[0]
assert f"\nexecution_api_server_url = {expected_execution_url}\n" in config
else:
assert "execution_api_server_url" not in config[0], (
assert "execution_api_server_url" not in config, (
"execution_api_server_url should not be set for Airflow 2.x versions"
)