diff --git a/chart/values.schema.json b/chart/values.schema.json index 4d91debcd04c1..dc787fc726f91 100644 --- a/chart/values.schema.json +++ b/chart/values.schema.json @@ -3362,6 +3362,11 @@ "description": "Query to use for KEDA autoscaling. Must return a single integer.", "type": "string", "default": "SELECT ceil(COUNT(*)::decimal / {{ .Values.config.triggerer.default_capacity }}) FROM trigger" + }, + "usePgbouncer": { + "description": "Whether to use PGBouncer to connect to the database or not when it is enabled. This configuration will be ignored if PGBouncer is not enabled.", + "type": "boolean", + "default": false } } } diff --git a/chart/values.yaml b/chart/values.yaml index e780032a89201..ed4aabb090a11 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -1688,6 +1688,10 @@ triggerer: SELECT ceil(COUNT(*)::decimal / {{ .Values.config.triggerer.default_capacity }}) FROM trigger + # Whether to use PGBouncer to connect to the database or not when it is enabled + # This configuration will be ignored if PGBouncer is not enabled + usePgbouncer: false + # Airflow Dag Processor Config dagProcessor: enabled: false diff --git a/helm_tests/airflow_core/test_triggerer.py b/helm_tests/airflow_core/test_triggerer.py index 9ef19b38df239..a3125b96a02b9 100644 --- a/helm_tests/airflow_core/test_triggerer.py +++ b/helm_tests/airflow_core/test_triggerer.py @@ -775,6 +775,20 @@ def test_should_use_keda_query(self, query, expected_query): ) assert expected_query == jmespath.search("spec.triggers[0].metadata.query", docs[0]) + def test_mysql_db_backend_keda_default_value(self): + docs = render_chart( + values={ + "data": {"metadataConnection": {"protocol": "mysql"}}, + "triggerer": { + "enabled": True, + "keda": {"enabled": True}, + }, + }, + show_only=["templates/triggerer/triggerer-kedaautoscaler.yaml"], + ) + + assert jmespath.search("spec.triggerers[0].metadata.keda.usePgBouncer", docs[0]) is None + def test_mysql_db_backend_keda(self): docs = render_chart( values={ diff --git a/helm_tests/airflow_core/test_worker.py b/helm_tests/airflow_core/test_worker.py index 85384f176c682..de0d66a55b942 100644 --- a/helm_tests/airflow_core/test_worker.py +++ b/helm_tests/airflow_core/test_worker.py @@ -1066,7 +1066,7 @@ def test_should_use_keda_query(self, query, executor, expected_query): ) assert expected_query == jmespath.search("spec.triggers[0].metadata.query", docs[0]) - def test_mysql_db_backend_keda(self): + def test_mysql_db_backend_keda_worker(self): docs = render_chart( values={ "data": {"metadataConnection": {"protocol": "mysql"}},