postgresqlpassword is in auth block

Author: robkooper

CHANGELOG.md

@@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 0.6.1
+
+### Fixed
+- postgresqlpassword is in auth block
+
 ## 0.6.0
 
 ### Fixed

Chart.yaml

@@ -12,7 +12,7 @@ description: >
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.6.0
+version: 0.6.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
@@ -43,5 +43,4 @@ annotations:
     - name: Helm Chart
       url: https://github.com/pecanproject/bety-helm
   artifacthub.io/changes: |
-    - bitnami legacy postgresql image
-    - could not find passsword for postgresql
+    - postgresqlpassword is in auth block

templates/_helpers.tpl

@@ -79,9 +79,14 @@ Environment variables for PostgreSQL
 - name: PGPASSWORD
   valueFrom:
     secretKeyRef:
+{{- if .Values.postgresql.enabled }}
+      name: {{ .Release.Name }}-postgresql
+      key: postgres-password
+{{- else }}
       name: {{ include "betydb.fullname" . }}
       key: postgresqlPassword
 {{- end }}
+{{- end }}
 
 {{/*
 Environment variables for BetyDB

templates/secrets.yaml

@@ -6,8 +6,8 @@ metadata:
     {{- include "betydb.labels" . | nindent 4 }}
 type: Opaque
 data:
-{{- if and (not .Values.postgresql.enabled) .Values.postgresql.auth.password }}
-  postgresqlPassword: {{ .Values.postgresql.auth.password | b64enc | quote }}
+{{- if and (not .Values.postgresql.enabled) .Values.postgresql.auth.postgresPassword }}
+  postgresqlPassword: {{ .Values.postgresql.auth.postgresPassword | b64enc | quote }}
 {{- end }}
   betyPassword:  {{ .Values.betyPassword | b64enc | quote }}
   secretKey:  {{ .Values.secretKey | b64enc | quote }}