This is an automated email from the ASF dual-hosted git repository.
Miretpl pushed a commit to branch chart/v1-2x-test
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/chart/v1-2x-test by this push:
new 38309de92ee [chart/v1-2x-test] Fix PgBouncer NetworkPolicy using
namespace labels of disabled triggerer KEDA (#74565) (#76626)
38309de92ee is described below
commit 38309de92eefea69a3b9f79d67cf70a35890b2fa
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Fri Nov 6 21:58:35 2026 +0100
[chart/v1-2x-test] Fix PgBouncer NetworkPolicy using namespace labels of
disabled triggerer KEDA (#74565) (#76626)
(cherry picked from commit 4d54940ceef10367bfa4ab9bb35fd5367efbec9d)
Co-authored-by: Huy Bui <[email protected]>
Co-authored-by: Tiennguyentony <[email protected]>
Co-authored-by: Przemysław Mirowski
<[email protected]>
---
chart/templates/pgbouncer/pgbouncer-networkpolicy.yaml | 2 +-
helm-tests/tests/helm_tests/other/test_pgbouncer.py | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/chart/templates/pgbouncer/pgbouncer-networkpolicy.yaml
b/chart/templates/pgbouncer/pgbouncer-networkpolicy.yaml
index 0c6a4dcc659..7c23cbe9dd0 100644
--- a/chart/templates/pgbouncer/pgbouncer-networkpolicy.yaml
+++ b/chart/templates/pgbouncer/pgbouncer-networkpolicy.yaml
@@ -59,7 +59,7 @@ spec:
- namespaceSelector:
matchLabels: {{- toYaml (.Values.workers.celery.keda.namespaceLabels |
default .Values.workers.keda.namespaceLabels) | nindent 10 }}
podSelector:
- {{- else if and .Values.triggerer.enabled
.Values.triggerer.keda.namespaceLabels }}
+ {{- else if and $triggererKedaEnabled
.Values.triggerer.keda.namespaceLabels }}
- namespaceSelector:
matchLabels: {{- toYaml .Values.triggerer.keda.namespaceLabels |
nindent 10 }}
podSelector:
diff --git a/helm-tests/tests/helm_tests/other/test_pgbouncer.py
b/helm-tests/tests/helm_tests/other/test_pgbouncer.py
index 8bde2b419e8..bd31ef2aea1 100644
--- a/helm-tests/tests/helm_tests/other/test_pgbouncer.py
+++ b/helm-tests/tests/helm_tests/other/test_pgbouncer.py
@@ -926,6 +926,11 @@ class TestPgbouncerNetworkPolicy:
"workers": {"keda": {"enabled": True}},
"triggerer": {"keda": {"enabled": True}},
},
+ # namespaceLabels of disabled triggerer.keda must not replace the
workers.celery.keda peer
+ {
+ "workers": {"celery": {"keda": {"enabled": True}}},
+ "triggerer": {"keda": {"enabled": False, "namespaceLabels":
{"env": "inactive"}}},
+ },
],
)
def test_pod_selectors_with_keda_without_namespace_labels(self, executor,
values):
