fix postgresql password

Author: robkooper

CHANGELOG.md

@@ -5,6 +5,12 @@ 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.0
+
+### Fixed
+- bitnami legacy postgresql image
+- could not find passsword for postgresql
+
 ## 0.5.5
 
 ### Fixed
@@ -40,4 +46,4 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## Added
 - initial release of the BETY helm chart.
-- build on bety 5.4.1
+- build on bety 5.4.1

Chart.yaml

@@ -6,13 +6,13 @@ name: betydb
 icon: https://isda.ncsa.illinois.edu/~kooper/charts/images/betydb.png
 home: https://www.betydb.org
 description: >
-  Web-interface to the Biofuel Ecophysiological Traits and Yields Database 
+  Web-interface to the Biofuel Ecophysiological Traits and Yields Database
   (used by PEcAn and TERRA REF)
 
 # 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.5.5
+version: 0.6.0
 
 # 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
@@ -33,14 +33,15 @@ sources:
 # Dependencies for chart. Some of the dependencies are only installed if they
 # are enabled.
 dependencies:
-- name: postgresql
-  version: ~11
-  repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
-  condition: postgres.enabled
+  - name: postgresql
+    version: ~11
+    repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
+    condition: postgres.enabled
 
 annotations:
   artifacthub.io/links: |
     - name: Helm Chart
       url: https://github.com/pecanproject/bety-helm
   artifacthub.io/changes: |
-    - use bitnami legacy postgresql image
+    - bitnami legacy postgresql image
+    - could not find passsword for postgresql

templates/_helpers.tpl

@@ -79,14 +79,9 @@ 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.postgresqlPassword }}
-  postgresqlPassword: {{ .Values.postgresql.postgresqlPassword | b64enc | quote }}
+{{- if and (not .Values.postgresql.enabled) .Values.postgresql.auth.password }}
+  postgresqlPassword: {{ .Values.postgresql.auth.password | b64enc | quote }}
 {{- end }}
   betyPassword:  {{ .Values.betyPassword | b64enc | quote }}
   secretKey:  {{ .Values.secretKey | b64enc | quote }}