Add missing usePgbouncer from values.yaml for triggerer (apache#40614)

romsharon98 · Jul 26, 2024 · c5f3eca · c5f3eca
1 parent 2929685
commit c5f3eca
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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
@@ -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"}},