Merge pull request #178 from one-acre-fund/feature/pgbouncer

Add server_tls configurations
one-acre-fund · Oct 24, 2023 · 3e92480 · 3e92480
2 parents 04ea4b5 + 1555d4d
commit 3e92480
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 23 deletions.
diff --git a/charts/pgbouncer/Chart.yaml b/charts/pgbouncer/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: pgbouncer
 description: A Helm chart for deploying bitnami/pgbouncer with TLS encryption
-version: 0.1.4
+version: 0.1.5
 appVersion: 1.19.1
 type: application
 maintainers:

diff --git a/charts/pgbouncer/README.md b/charts/pgbouncer/README.md
@@ -1,31 +1,31 @@
-# PgBouncer
-
-![Version: 0.1.4](https://img.shields.io/badge/Version-0.1.4-informational?style=flat-square)
-
-A Helm chart for deploying bitnami/pgbouncer with TLS encryption
-
-**Homepage:** <https://github.com/one-acre-fund/oaf-public-charts>
-
+# PgBouncer
+
+![Version: 0.1.5](https://img.shields.io/badge/Version-0.1.5-informational?style=flat-square) 
+
+A Helm chart for deploying bitnami/pgbouncer with TLS encryption
+
+**Homepage:** <https://github.com/one-acre-fund/oaf-public-charts>
+
 ## Maintainers
 
 | Name | Email | Url |
 | ---- | ------ | --- |
-| Rahma | <rahma.ahmed@oneacrefund.org> | <https://github.com/samaroon> |
-
+| Rahma | <rahma.ahmed@oneacrefund.org> | <https://github.com/samaroon> |
+
 ## Source Code
 
 * <https://github.com/one-acre-fund/oaf-public-charts>
-* <https://bitnami.com/stack/pgbouncer>
-
-## TL;DR
-
-[pgbouncer](https://www.pgbouncer.org/) is a lightweight connection pooler for PostgreSQL.
-
-```console
-helm repo add one-acre-fund https://one-acre-fund.github.io/oaf-public-charts
-helm install pgbouncer one-acre-fund/pgbouncer
-```
-
+* <https://bitnami.com/stack/pgbouncer>
+
+## TL;DR
+
+[pgbouncer](https://www.pgbouncer.org/) is a lightweight connection pooler for PostgreSQL.
+
+```console
+helm repo add one-acre-fund https://one-acre-fund.github.io/oaf-public-charts
+helm install pgbouncer one-acre-fund/pgbouncer
+```
+
 ## Values
 
 | Key | Type | Default | Description |
@@ -73,4 +73,4 @@ helm install pgbouncer one-acre-fund/pgbouncer
 | tls.certFile | string | `"tls.crt"` |  |
 | tls.enabled | bool | `true` |  |
 | tls.existingSecret | string | `"oaf-tls"` |  |
-| tls.keyFile | string | `"tls.key"` |  |
+| tls.keyFile | string | `"tls.key"` |  |
diff --git a/charts/pgbouncer/templates/deployment.yaml b/charts/pgbouncer/templates/deployment.yaml
@@ -68,6 +68,12 @@ spec:
           value: "/etc/pgbouncer/tls/tls.crt"
         - name: PGBOUNCER_CLIENT_TLS_KEY_FILE
           value: "/etc/pgbouncer/tls/tls.key"
+        - name: PGBOUNCER_SERVER_TLS_SSLMODE
+          value: "require"
+        - name: PGBOUNCER_SERVER_TLS_KEY_FILE
+          value: "/etc/pgbouncer/tls/tls.key"
+        - name: PGBOUNCER_SERVER_TLS_CA_FILE
+          value: "/etc/pgbouncer/tls/tls.crt"
         {{- end }}
         {{- include "pgbouncer.env" . | nindent 8 }}
         ports: