Remove subpaths to allow config reload (#46)

Signed-off-by: Antoine Bardoux <antoine.b@padoa-group.com>
cradlepoint · Oct 18, 2021 · 82db31b · 82db31b
1 parent 7a2c2db
commit 82db31b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/pgbouncer/templates/_pgbouncer.ini.tpl b/pgbouncer/templates/_pgbouncer.ini.tpl
@@ -48,7 +48,7 @@ unix_socket_dir = var/run/postgresql
 
 auth_type = {{ .Values.settings.auth_type }}
 ;auth_file = /8.0/main/global/pg_auth
-auth_file = /etc/pgbouncer/userlist.txt
+auth_file = /etc/pgbouncer.d/userlist.txt
 ;auth_hba_file =
 
 {{- with .Values.settings.auth_query }}

diff --git a/pgbouncer/templates/deployment-pgbouncer.yaml b/pgbouncer/templates/deployment-pgbouncer.yaml
@@ -62,9 +62,15 @@ spec:
         - name: userssecret
           secret:
             secretName: {{ template "pgbouncer.usersSecretName" . }}
+            items:
+              - key: {{ template "pgbouncer.usersSecretKey" . }}
+                path: userlist.txt
         - name: config
           configMap:
             name: {{ template "pgbouncer.fullname" . }}-config
+            items:
+              - key: pgbouncer.ini
+                path: pgbouncer.ini
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
@@ -89,12 +95,10 @@ spec:
                 command: ["/bin/sh","-c","sleep 5"]
           volumeMounts:
             - name: userssecret
-              subPath: {{ template "pgbouncer.usersSecretKey" . }}
-              mountPath: /etc/pgbouncer/userlist.txt
+              mountPath: /etc/pgbouncer.d
               readOnly: true
             - name: config
-              subPath: pgbouncer.ini
-              mountPath: /etc/pgbouncer/pgbouncer.ini
+              mountPath: /etc/pgbouncer
               readOnly: true
           resources:
             {{- toYaml .Values.resources | nindent 12 }}