Skip to content

Commit 60faf87

Browse files
chore: Certs as secret
1 parent 97744dc commit 60faf87

File tree

7 files changed

+19
-18
lines changed

7 files changed

+19
-18
lines changed

bootstrap/cell/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ module "dbsync_pgbouncer" {
6060

6161
namespace = var.namespace
6262
pg_bouncer_replicas = var.pgbouncer_replicas
63-
certs_configmap_name = var.certs_configmap_name
63+
certs_secret_name = var.certs_secret_name
6464
pg_bouncer_auth_user_password = var.pgbouncer_auth_user_password
6565
instance_role = "pgbouncer"
6666
postgres_secret_name = var.postgres_secret_name

bootstrap/cell/variables.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ variable "salt" {
77
description = "Salt used to identify all components as part of the cell. Should be unique between cells."
88
}
99

10-
variable "certs_configmap_name" {
10+
variable "certs_secret_name" {
1111
type = string
1212
default = "pgbouncer-certs"
1313
}

bootstrap/feature/configs.tf

Lines changed: 0 additions & 11 deletions
This file was deleted.

bootstrap/feature/secret.tf

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,15 @@ resource "kubernetes_secret" "postgres" {
88
}
99
type = "Opaque"
1010
}
11+
12+
resource "kubernetes_secret" "pgbouncer_certs" {
13+
metadata {
14+
namespace = var.namespace
15+
name = "pgbouncer-certs"
16+
}
17+
18+
data = {
19+
"tls.crt" = var.pgbouncer_server_crt
20+
"tls.key" = var.pgbouncer_server_key
21+
}
22+
}

bootstrap/pgbouncer/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ variable "load_balancer" {
2626
default = false
2727
}
2828

29-
variable "certs_configmap_name" {
29+
variable "certs_secret_name" {
3030
type = string
3131
default = "pgbouncer-certs"
3232
}

bootstrap/pgbouncer/pg-bouncer.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -269,8 +269,8 @@ resource "kubernetes_deployment_v1" "pgbouncer" {
269269

270270
volume {
271271
name = "pgbouncer-certs"
272-
config_map {
273-
name = var.certs_configmap_name
272+
secret {
273+
secret_name = var.certs_secret_name
274274
}
275275
}
276276

bootstrap/pgbouncer/pgbouncer.ini.tftpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ pidfile=/opt/bitnami/pgbouncer/tmp/pgbouncer.pid
1717
logfile=/opt/bitnami/pgbouncer/logs/pgbouncer.log
1818
admin_users=postgres
1919
client_tls_sslmode=allow
20-
client_tls_key_file=/certs/server.key
21-
client_tls_cert_file=/certs/server.crt
20+
client_tls_key_file=/certs/tls.key
21+
client_tls_cert_file=/certs/tls.crt
2222
server_tls_sslmode=disable
2323
ignore_startup_parameters=extra_float_digits,statement_timeout
2424
stats_period=60

0 commit comments

Comments
 (0)