From 9f50212a70d16bf9b897349dc2dd8642a9549855 Mon Sep 17 00:00:00 2001
From: Roman <4456572+sturman@users.noreply.github.com>
Date: Tue, 7 Mar 2023 17:17:30 +0200
Subject: [PATCH] chore: Change default values for Bitnami Postgres helm chart 
 (#71)

* Change default values for Bitnami Postgres helm chart
* Use password defined in `postgresql.auth.password`
---
 charts/unleash/Chart.yaml                |  2 +-
 charts/unleash/templates/deployment.yaml |  2 +-
 charts/unleash/values.yaml               | 15 ++++++++-------
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/charts/unleash/Chart.yaml b/charts/unleash/Chart.yaml
index ef9bcdd..96c31de 100644
--- a/charts/unleash/Chart.yaml
+++ b/charts/unleash/Chart.yaml
@@ -15,4 +15,4 @@ sources:
   - https://github.com/Unleash/unleash
   - https://github.com/Unleash/helm-charts
 type: application
-version: 2.7.6
+version: 2.7.7
diff --git a/charts/unleash/templates/deployment.yaml b/charts/unleash/templates/deployment.yaml
index 28cdaf0..21d6cc3 100644
--- a/charts/unleash/templates/deployment.yaml
+++ b/charts/unleash/templates/deployment.yaml
@@ -36,7 +36,7 @@ spec:
               valueFrom:
                 secretKeyRef:
                   name: {{ if .Values.dbConfig.useExistingSecret.name }}{{ .Values.dbConfig.useExistingSecret.name }}{{ else }}{{ .Values.postgresql.fullnameOverride }}{{ end }}
-                  key: {{ if .Values.dbConfig.useExistingSecret.key }}{{ .Values.dbConfig.useExistingSecret.key }}{{ else }}postgres-password{{ end }}
+                  key: {{ if .Values.dbConfig.useExistingSecret.key }}{{ .Values.dbConfig.useExistingSecret.key }}{{ else }}password{{ end }}
             {{- end }}
             - name: DATABASE
               value: "{{ .Values.dbConfig.database }}"
diff --git a/charts/unleash/values.yaml b/charts/unleash/values.yaml
index 1ec2e7a..057c5f0 100644
--- a/charts/unleash/values.yaml
+++ b/charts/unleash/values.yaml
@@ -109,17 +109,17 @@ configMaps: {}
 containerPort: 4242
 
 dbConfig:
-  # if postgres dependency chart is used, this needs to be the same value as postgresql.postgresqlDatabase
+  # if postgres dependency chart is used, this needs to be the same value as postgresql.auth.database
   database: unleash
   host: postgres
-  # if postgres dependency chart is used, this needs to be the same value as postgresql.postgresqlPassword
+  # if postgres dependency chart is used, this needs to be the same value as postgresql.auth.password
   # this should be change to something more secure or use an existing secret
   pass: unleash
   port: 5432
   useExistingSecret:
     name: ""
     key: ""
-  # if postgres dependency chart is used, this needs to be the same value as postgresql.postgresqlUsername
+  # if postgres dependency chart is used, this needs to be the same value as postgresql.auth.username
   user: unleash
   ssl: false
 
@@ -231,10 +231,11 @@ vpa:
 postgresql:
   enabled: true
   fullnameOverride: "unleash-postgresql"
-  postgresqlDatabase: unleash
-  postgresqlUsername: unleash
-  # this should be change to something more secure or use an existing secret
-  postgresqlPassword: unleash
+  auth:
+    username: unleash
+    # this should be change to something more secure or use an existing secret
+    password: unleash
+    database: unleash
 
 securityContext: {}
 # Autoscaling