Skip to content

Fix flower network policy condition when multiple executors #58635

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
jscheffl merged 2 commits into from
Nov 24, 2025
Merged

Fix flower network policy condition when multiple executors #58635

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04e77e2
Fix flower network policy condition when multiple executors
ronaldorcampos Nov 24, 2025
c6866ed
fix checks
ronaldorcampos Nov 24, 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
3 changes: 1 addition & 2 deletions chart/templates/flower/flower-networkpolicy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@
## Airflow Flower NetworkPolicy
#################################
{{- if .Values.flower.enabled }}
{{- $celery_executors := list "CeleryExecutor" "CeleryKubernetesExecutor"}}
{{- if and .Values.networkPolicies.enabled (has .Values.executor $celery_executors) }}
{{- if and .Values.networkPolicies.enabled (or (contains "CeleryExecutor" .Values.executor) (contains "CeleryKubernetesExecutor" .Values.executor)) }}
{{- $from := or .Values.flower.networkPolicy.ingress.from .Values.flower.extraNetworkPolicies }}
apiVersion: networking.k8s.io/v1
kind: NetworkPolicy
Expand Down
35 changes: 29 additions & 6 deletions helm-tests/tests/helm_tests/airflow_aux/test_basic_helm_chart.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,14 +327,25 @@ def test_basic_deployment_without_statsd(self, version):
assert ("Service", "test-basic-statsd") not in list_of_kind_names_tuples
assert ("Deployment", "test-basic-statsd") not in list_of_kind_names_tuples

@pytest.mark.parametrize("airflow_version", ["2.10.0", "3.0.0", "default"])
def test_network_policies_are_valid(self, airflow_version):
@pytest.mark.parametrize(
("airflow_version", "executor"),
[
["2.10.0", "CeleryExecutor"],
["2.10.0", "CeleryKubernetesExecutor"],
["2.10.0", "CeleryExecutor,KubernetesExecutor"],
["3.0.0", "CeleryExecutor"],
["3.0.0", "CeleryExecutor,KubernetesExecutor"],
["default", "CeleryExecutor"],
["default", "CeleryExecutor,KubernetesExecutor"],
],
)
def test_network_policies_are_valid(self, airflow_version, executor):
k8s_objects = render_chart(
name="test-basic",
values=self._get_values_with_version(
values={
"networkPolicies": {"enabled": True},
"executor": "CeleryExecutor",
"executor": executor,
"flower": {"enabled": True},
"pgbouncer": {"enabled": True},
},
Expand Down Expand Up @@ -366,14 +377,24 @@ def test_network_policies_are_valid(self, airflow_version):
for kind_name in expected_kind_names:
assert kind_name in kind_names_tuples

@pytest.mark.parametrize("airflow_version", ["2.10.0", "3.0.0", "default"])
def test_labels_are_valid(self, airflow_version):
@pytest.mark.parametrize(
("airflow_version", "executor"),
[
["2.10.0", "CeleryExecutor"],
["2.10.0", "CeleryExecutor,KubernetesExecutor"],
["3.0.0", "CeleryExecutor"],
["3.0.0", "CeleryExecutor,KubernetesExecutor"],
["default", "CeleryExecutor"],
["default", "CeleryExecutor,KubernetesExecutor"],
],
)
def test_labels_are_valid(self, airflow_version, executor):
"""Test labels are correctly applied on all objects created by this chart."""
release_name = "test-basic"

values = {
"labels": {"label1": "value1", "label2": "value2"},
"executor": "CeleryExecutor",
"executor": executor,
"data": {
"resultBackendConnection": {
"user": "someuser",
Expand Down Expand Up @@ -490,6 +511,8 @@ def test_labels_are_valid(self, airflow_version):
expected_labels["component"] = component
if k8s_object_name == f"{release_name}-scheduler":
expected_labels["executor"] = "CeleryExecutor"
if executor == "CeleryExecutor,KubernetesExecutor":
expected_labels["executor"] = "CeleryExecutor-KubernetesExecutor"
actual_labels = kind_k8s_obj_labels_tuples.pop((k8s_object_name, kind))
assert actual_labels == expected_labels

Expand Down