Add terminationGracePeriodSeconds support for PgBouncer in Helm chart

chart/templates/pgbouncer/pgbouncer-deployment.yaml

@@ -87,6 +87,7 @@ spec:
       {{- end }}
       tolerations: {{- toYaml $tolerations | nindent 8 }}
       topologySpreadConstraints: {{- toYaml $topologySpreadConstraints | nindent 8 }}
+      terminationGracePeriodSeconds: {{ .Values.pgbouncer.terminationGracePeriodSeconds }}
       serviceAccountName: {{ include "pgbouncer.serviceAccountName" . }}
       enableServiceLinks: {{ .Values.enableServiceLinks }}
       securityContext: {{ $securityContext | nindent 8 }}

chart/tests/helm_tests/other/test_pgbouncer.py

@@ -453,6 +453,20 @@ def test_should_add_component_specific_labels(self):
         assert "labels" in jmespath.search("spec.template.metadata", docs[0])
         assert jmespath.search("spec.template.metadata.labels", docs[0])["test_label"] == "test_label_value"
 
+    @pytest.mark.parametrize(
+        ("pgbouncer_values", "expected"),
+        [
+            ({"enabled": True}, 120),
+            ({"enabled": True, "terminationGracePeriodSeconds": 30}, 30),
+        ],
+    )
+    def test_pgbouncer_termination_grace_period_seconds(self, pgbouncer_values, expected):
+        docs = render_chart(
+            values={"pgbouncer": pgbouncer_values},
+            show_only=["templates/pgbouncer/pgbouncer-deployment.yaml"],
+        )
+        assert expected == jmespath.search("spec.template.spec.terminationGracePeriodSeconds", docs[0])
+
 
 class TestPgbouncerConfig:
     """Tests PgBouncer config."""

chart/values.schema.json

@@ -7873,6 +7873,13 @@
                         }
                     ]
                 },
+                "terminationGracePeriodSeconds": {
+                    "description": "Grace period for PgBouncer to finish after SIGTERM is sent from Kubernetes.",
+                    "type": "integer",
+                    "default": 120,
+                    "minimum": 0,
+                    "x-docsSection": "Kubernetes"
+                },
                 "securityContexts": {
                     "description": "Security context definition for the PgBouncer.",
                     "type": "object",

chart/values.yaml

@@ -2936,6 +2936,12 @@ pgbouncer:
         # Allow existing queries clients to complete within 120 seconds
         command: ["/bin/sh", "-c", "killall -INT pgbouncer && sleep 120"]
 
+  # Grace period for PgBouncer to finish after SIGTERM is sent from Kubernetes.
+  # Matches the default preStop hook above, which needs up to 120 seconds to
+  # drain client connections; with a shorter grace period the pod is killed
+  # mid-drain and in-flight connections are cut.
+  terminationGracePeriodSeconds: 120
+
   metricsExporterSidecar:
     resources: {}
     # limits: