Merge branch 'pr29'

Author: masterkain

charts/pgbouncer/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: pgbouncer
 description: A Helm chart for deploying PgBouncer, a PostgreSQL connection pooler, on Kubernetes
 type: application
-version: 3.0.1
+version: 3.1.0
 appVersion: 1.24.1
 kubeVersion: ">= 1.22.0-0"
 icon: https://icoretech.github.io/helm/charts/pgbouncer/logo.png

charts/pgbouncer/README.md

@@ -40,11 +40,12 @@ The following table lists the configurable parameters of the PgBouncer chart and
 | config.adminUserKey | string | `"adminUser"` | The key in the existingAdminSecret that corresponds to the admin username. |
 | config.authPassword | string | `nil` | Password for the authUser above, if used. |
 | config.authUser | string | `nil` | If set, PgBouncer will use this user to authenticate client connections. |
-| config.databases | object | `{}` | Mapping of database names to connection parameters. E.g.: mydb: host=postgresql port=5432 |
+| config.databases | object | `{}` | Mapping of database names to connection parameters. E.g.: mydb = host=postgresql port=5432 |
 | config.existingAdminSecret | string | `""` | If set, skip creating a new secret for admin credentials, and reference this existing Secret name instead. |
 | config.existingUserlistSecret | string | `""` | Reference to an existing Secret that contains a userlist.txt file, with entries for other users/passwords. |
 | config.pgbouncer | object | `{}` | Additional PgBouncer parameters (e.g. auth_type, pool_mode). |
 | config.userlist | object | `{}` | if existingUserlistSecret isn't used. |
+| config.users | object | `{}` | Mapping of usernames to connection parameters. E.g.: someUser = pool_mode=session |
 | extraContainers | list | `[]` | Extra containers to run within the PgBouncer pod. |
 | extraEnvs | list | `[]` | Additional environment variables to set in the PgBouncer container. |
 | extraInitContainers | list | `[]` | Init containers to run before the PgBouncer container starts. |

charts/pgbouncer/templates/configmap.yaml

@@ -9,6 +9,10 @@ data:
     [databases]
 {{- range $key, $val := .Values.config.databases }}
     {{ $key }} ={{ range $k, $v := $val }} {{ $k }}={{ $v }}{{ end }}
+{{- end }}
+    [users]
+{{- range $key, $val := .Values.config.users }}
+    {{ $key }} ={{ range $k, $v := $val }} {{ $k }}={{ $v }}{{ end }}
 {{- end }}
     [pgbouncer]
     listen_addr = *

charts/pgbouncer/values.yaml

@@ -165,9 +165,12 @@ config:
   # -- Password for the authUser above, if used.
   authPassword:
 
-  # -- Mapping of database names to connection parameters. E.g.: mydb: host=postgresql port=5432
+  # -- Mapping of database names to connection parameters. E.g.: mydb = host=postgresql port=5432
   databases: {}
 
+  # -- Mapping of usernames to connection parameters. E.g.: someUser = pool_mode=session
+  users: {}
+
   # -- Additional PgBouncer parameters (e.g. auth_type, pool_mode).
   pgbouncer: {}
     # auth_type: md5