Skip to content

Commit f97b08e

Browse files
feat(pooler): allow configuration of advanced TLS cipher settings (#9571)
The operator now supports overriding specific TLS cipher parameters in the PgBouncer configuration. Previously, these were rejected by the internal validation schema. Supported parameters: - `client_tls_ciphers` - `client_tls13_ciphers` (requires PgBouncer 1.25+) - `server_tls13_ciphers` (requires PgBouncer 1.25+) Note: Users are responsible for ensuring their PgBouncer image version supports these settings to avoid configuration errors. Closes #9570 Signed-off-by: Alex Szakaly <[email protected]> Signed-off-by: Gabriele Bartolini <[email protected]> Co-authored-by: Gabriele Bartolini <[email protected]>
1 parent 51438ad commit f97b08e

2 files changed

Lines changed: 9 additions & 2 deletions

File tree

‎docs/src/connection_pooling.md‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -380,8 +380,9 @@ The operator manages most of the [configuration options for PgBouncer](https://w
380380
allowing you to modify only a subset of them.
381381

382382
:::warning
383-
You are responsible for correctly setting the value of each option, as the
384-
operator doesn't validate them.
383+
The operator passes these settings directly to PgBouncer without validation.
384+
To prevent configuration errors or crash loops, ensure each parameter is
385+
supported by your specific PgBouncer image version.
385386
:::
386387

387388
These are the PgBouncer options you can customize, with links to the PgBouncer
@@ -394,7 +395,9 @@ are the ones directly set by PgBouncer.
394395
- [`cancel_wait_timeout`](https://www.pgbouncer.org/config.html#cancel_wait_timeout)
395396
- [`client_idle_timeout`](https://www.pgbouncer.org/config.html#client_idle_timeout)
396397
- [`client_login_timeout`](https://www.pgbouncer.org/config.html#client_login_timeout)
398+
- [`client_tls_ciphers`](https://www.pgbouncer.org/config.html#client_tls_ciphers)
397399
- [`client_tls_sslmode`](https://www.pgbouncer.org/config.html#client_tls_sslmode)
400+
- [`client_tls13_ciphers`](https://www.pgbouncer.org/config.html#client_tls13_ciphers) (1.25+)
398401
- [`default_pool_size`](https://www.pgbouncer.org/config.html#default_pool_size)
399402
- [`disable_pqexec`](https://www.pgbouncer.org/config.html#disable_pqexec)
400403
- [`dns_max_ttl`](https://www.pgbouncer.org/config.html#dns_max_ttl)
@@ -432,6 +435,7 @@ are the ones directly set by PgBouncer.
432435
- [`server_reset_query_always`](https://www.pgbouncer.org/config.html#server_reset_query_always)
433436
- [`server_round_robin`](https://www.pgbouncer.org/config.html#server_round_robin)
434437
- [`server_tls_ciphers`](https://www.pgbouncer.org/config.html#server_tls_ciphers)
438+
- [`server_tls13_ciphers`](https://www.pgbouncer.org/config.html#server_tls13_ciphers) (1.25+)
435439
- [`server_tls_protocols`](https://www.pgbouncer.org/config.html#server_tls_protocols)
436440
- [`server_tls_sslmode`](https://www.pgbouncer.org/config.html#server_tls_sslmode)
437441
- [`stats_period`](https://www.pgbouncer.org/config.html#stats_period)

‎internal/webhook/v1/pooler_webhook.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,9 @@ var AllowedPgbouncerGenericConfigurationParameters = stringset.From([]string{
4242
"cancel_wait_timeout",
4343
"client_idle_timeout",
4444
"client_login_timeout",
45+
"client_tls_ciphers",
4546
"client_tls_sslmode",
47+
"client_tls13_ciphers",
4648
"default_pool_size",
4749
"disable_pqexec",
4850
"dns_max_ttl",
@@ -77,6 +79,7 @@ var AllowedPgbouncerGenericConfigurationParameters = stringset.From([]string{
7779
"server_reset_query_always",
7880
"server_round_robin",
7981
"server_tls_ciphers",
82+
"server_tls13_ciphers",
8083
"server_tls_protocols",
8184
"server_tls_sslmode",
8285
"stats_period",

0 commit comments

Comments
 (0)