[bitnami/postgresql] collect metrics as postgres user (bitnami#29201)

* [bitnami/postgresql] collect metrics as postgres user Signed-off-by: Tim Balzer <[email protected]> * Update CHANGELOG.md Signed-off-by: Bitnami Containers <[email protected]> * Update CHANGELOG.md Signed-off-by: Bitnami Containers <[email protected]> * [bitnami/postgresql] bump to 15.5.29 Signed-off-by: Tim Balzer <[email protected]> * Update CHANGELOG.md Signed-off-by: Bitnami Containers <[email protected]> --------- Signed-off-by: Tim Balzer <[email protected]> Signed-off-by: Bitnami Containers <[email protected]> Co-authored-by: Bitnami Containers <[email protected]>
bartramakers · Sep 18, 2024 · 3616c85 · 3616c85
1 parent 9d887e2
commit 3616c85
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/bitnami/postgresql/CHANGELOG.md b/bitnami/postgresql/CHANGELOG.md
@@ -1,8 +1,12 @@
 # Changelog
 
-## 15.5.29 (2024-09-10)
+## 15.5.30 (2024-09-12)
 
-* [bitnami/postgresql] Release 15.5.29 ([#29330](https://github.com/bitnami/charts/pull/29330))
+* [bitnami/postgresql] collect metrics as postgres user ([#29201](https://github.com/bitnami/charts/pull/29201))
+
+## <small>15.5.29 (2024-09-10)</small>
+
+* [bitnami/postgresql] Release 15.5.29 (#29330) ([3c161f7](https://github.com/bitnami/charts/commit/3c161f7033eff31b2f3d98879bcac07c7070c0d6)), closes [#29330](https://github.com/bitnami/charts/issues/29330)
 
 ## <small>15.5.28 (2024-09-05)</small>
 

diff --git a/bitnami/postgresql/Chart.yaml b/bitnami/postgresql/Chart.yaml
@@ -35,4 +35,4 @@ maintainers:
 name: postgresql
 sources:
 - https://github.com/bitnami/charts/tree/main/bitnami/postgresql
-version: 15.5.29
+version: 15.5.30
diff --git a/bitnami/postgresql/templates/primary/statefulset.yaml b/bitnami/postgresql/templates/primary/statefulset.yaml
@@ -534,19 +534,18 @@ spec:
           env:
             - name: DATA_SOURCE_URI
               value: {{ printf "127.0.0.1:%d/postgres?sslmode=disable" (int (include "postgresql.v1.service.port" .)) }}
-            {{- $pwdKey := ternary (include "postgresql.v1.adminPasswordKey" .) (include "postgresql.v1.userPasswordKey" .) (or (eq $customUser "postgres") (empty $customUser)) }}
             {{- if .Values.auth.usePasswordFiles }}
             - name: DATA_SOURCE_PASS_FILE
-              value: {{ printf "/opt/bitnami/postgresql/secrets/%s" $pwdKey }}
+              value: {{ printf "/opt/bitnami/postgresql/secrets/%s" (include "postgresql.v1.adminPasswordKey" .) }}
             {{- else }}
             - name: DATA_SOURCE_PASS
               valueFrom:
                 secretKeyRef:
                   name: {{ include "postgresql.v1.secretName" . }}
-                  key: {{ $pwdKey }}
+                  key: {{ include "postgresql.v1.adminPasswordKey" . }}
             {{- end }}
             - name: DATA_SOURCE_USER
-              value: {{ default "postgres" $customUser | quote }}
+              value: "postgres"
             {{- if .Values.metrics.extraEnvVars }}
             {{- include "common.tplvalues.render" (dict "value" .Values.metrics.extraEnvVars "context" $) | nindent 12 }}
             {{- end }}