From c9566e7c566cdc444873e705e1e49be76878e2e4 Mon Sep 17 00:00:00 2001
From: Christopher Kolstad <chriswk@getunleash.io>
Date: Wed, 13 Mar 2024 15:46:28 +0100
Subject: [PATCH] fix: set DATABASE_NAME instead of DATABASE. (#137)

- Unleash looks for DATABASE_NAME, it does not look for DATABASE, so
  this has actually not been working earlier

fixes: #136
---
 charts/unleash/Chart.yaml                | 16 ++++++++--------
 charts/unleash/templates/deployment.yaml |  2 +-
 charts/unleash/values.yaml               | 10 +++++++---
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/charts/unleash/Chart.yaml b/charts/unleash/Chart.yaml
index e3bcc6a..bd98663 100644
--- a/charts/unleash/Chart.yaml
+++ b/charts/unleash/Chart.yaml
@@ -1,18 +1,18 @@
 apiVersion: v2
 appVersion: "5.9.6"
 dependencies:
-- name: postgresql
-  repository: https://charts.bitnami.com/bitnami
-  version: 12.1.6
-  condition: postgresql.enabled
+  - name: postgresql
+    repository: https://charts.bitnami.com/bitnami
+    version: 12.1.6
+    condition: postgresql.enabled
 description: Unleash is a open source feature flag & toggle system, that gives you a great overview over all feature toggles across all your applications and services.
 maintainers:
-- name: evanstucker-hates-2fa
-- name: ivarconr
-  email: ivarconr@gmail.com
+  - name: evanstucker-hates-2fa
+  - name: ivarconr
+    email: ivarconr@gmail.com
 name: unleash
 sources:
   - https://github.com/Unleash/unleash
   - https://github.com/Unleash/helm-charts
 type: application
-version: 4.0.1
+version: 4.0.2
diff --git a/charts/unleash/templates/deployment.yaml b/charts/unleash/templates/deployment.yaml
index e2425cd..64f600c 100644
--- a/charts/unleash/templates/deployment.yaml
+++ b/charts/unleash/templates/deployment.yaml
@@ -38,7 +38,7 @@ spec:
                   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 }}password{{ end }}
             {{- end }}
-            - name: DATABASE
+            - name: DATABASE_NAME
               value: "{{ .Values.dbConfig.database }}"
             - name: DATABASE_HOST
               value: "{{ if .Values.postgresql.enabled }}{{ .Values.postgresql.fullnameOverride }}{{ else }}{{ .Values.dbConfig.host }}{{ end }}"
diff --git a/charts/unleash/values.yaml b/charts/unleash/values.yaml
index 3c34126..090774f 100644
--- a/charts/unleash/values.yaml
+++ b/charts/unleash/values.yaml
@@ -110,6 +110,7 @@ containerPort: 4242
 
 dbConfig:
   # if postgres dependency chart is used, this needs to be the same value as postgresql.auth.database
+  # Will be used to set DATABASE_NAME as an environment variable.
   database: unleash
   # Defaults to 'public'
   schema: ""
@@ -133,7 +134,8 @@ env: []
 #    value: https://unleash.example.com/api/auth/callback
 
 # adds environmentvars for existing secrets to the container via tpl function
-existingSecrets: []
+existingSecrets:
+  []
   # - name: GOOGLE_CLIENT_SECRET
   #   valueFrom:
   #     secretKeyRef:
@@ -144,7 +146,8 @@ fullnameOverride: ""
 
 image:
   repository: unleashorg/unleash-server
-  tag:  # Obtained from .Chart.AppVersion, up to date tags available at https://hub.docker.com/r/unleashorg/unleash-server/tags
+  # Obtained from .Chart.AppVersion, up to date tags available at https://hub.docker.com/r/unleashorg/unleash-server/tags
+  tag:
   pullPolicy: Always
 
 imagePullSecrets: []
@@ -161,7 +164,8 @@ serviceAccount:
 ingress:
   enabled: false
   className: ""
-  annotations: {}
+  annotations:
+    {}
     # kubernetes.io/ingress.class: nginx
     # kubernetes.io/tls-acme: "true"
   hosts: