fix: change pooler image to bitnami/pgbouncer

flanksource · Feb 23, 2024 · a8d2968 · a8d2968
1 parent b985aae
commit a8d2968
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 14 deletions.
diff --git a/chart/templates/pgbouncer.yaml b/chart/templates/pgbouncer.yaml
@@ -34,45 +34,40 @@ spec:
       serviceAccountName: {{ include "incident-commander.fullname" . }}-pgbouncer
       containers:
       - name: pgbouncer
-        image: edoburu/pgbouncer:1.21.0-p1
+        image: {{ .Values.db.connectionPooler.image }}
         ports:
         - containerPort: 5432
         env:
-        - name: AUTH_TYPE
+        - name: PGBOUNCER_AUTH_TYPE
           value: md5
-        - name: DB_HOST
+        - name: POSTGRESQL_HOST
           valueFrom:
             secretKeyRef:
               name: {{ .Values.db.secretKeyRef.name }}
               key: POSTGRES_HOST
-        - name: AUTH_USER
+        - name: POSTGRESQL_USERNAME
           valueFrom:
             secretKeyRef:
               name: {{ .Values.db.secretKeyRef.name }}
               key: POSTGRES_USER
-        - name: DB_USER
-          valueFrom:
-            secretKeyRef:
-              name: {{ .Values.db.secretKeyRef.name }}
-              key: POSTGRES_USER
-        - name: DB_PASSWORD
+        - name: POSTGRESQL_PASSWORD
           valueFrom:
             secretKeyRef:
               name: {{ .Values.db.secretKeyRef.name }}
               key: POSTGRES_PASSWORD
-        - name: DB_NAME
+        - name: POSTGRESQL_DATABASE
           valueFrom:
             secretKeyRef:
               name: {{ .Values.db.secretKeyRef.name }}
               key: DATABASE
-        - name: DB_PORT
+        - name: POSTGRESQL_PORT
           valueFrom:
             secretKeyRef:
               name: {{ .Values.db.secretKeyRef.name }}
               key: POSTGRES_PORT
         volumeMounts:
           - name: configfiles
-            mountPath: "/etc/pgbouncer"
+            mountPath: "/bitnami/pgbouncer/conf/"
             readOnly: true 
       volumes:
         - name: configfiles

diff --git a/chart/templates/secrets.yaml b/chart/templates/secrets.yaml
@@ -89,7 +89,7 @@ listen_addr = 0.0.0.0
 listen_port = 5432
 unix_socket_dir =
 auth_user = {{ .pguser }}
-auth_file = /etc/pgbouncer/userlist.txt
+auth_file = /bitnami/pgbouncer/conf/userlist.txt
 auth_type = md5
 pool_mode = session
 max_client_conn = 100

diff --git a/chart/values.yaml b/chart/values.yaml
@@ -106,6 +106,7 @@ db:
     serviceAccount:
       annotations: {}
     extraContainers: ""
+    image: bitnami/pgbouncer:1.22.0
   storageClass:
   storage: 20Gi
   shmVolume: 256Mi