From ab0f637c652f6ba54b0ce98f8acc34c0efa65c53 Mon Sep 17 00:00:00 2001
From: Barak Amar <barak.amar@treeverse.io>
Date: Wed, 17 Jan 2024 09:38:30 +0200
Subject: [PATCH] Fix: fluffy use secret database connection string (#228)

* Fix: fluffy use secret database connection string

* bump patch level
---
 charts/lakefs/Chart.yaml            |  2 +-
 charts/lakefs/templates/_fluffy.tpl | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/charts/lakefs/Chart.yaml b/charts/lakefs/Chart.yaml
index 6660419..7866a46 100644
--- a/charts/lakefs/Chart.yaml
+++ b/charts/lakefs/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: lakefs
 description: A Helm chart for running LakeFS on Kubernetes
 type: application
-version: 1.0.13
+version: 1.0.14
 appVersion: 1.8.0
 
 home: https://lakefs.io
diff --git a/charts/lakefs/templates/_fluffy.tpl b/charts/lakefs/templates/_fluffy.tpl
index 155274a..29c0acc 100644
--- a/charts/lakefs/templates/_fluffy.tpl
+++ b/charts/lakefs/templates/_fluffy.tpl
@@ -109,7 +109,19 @@ env:
   - name: FLUFFY_AUTH_SERVE_LISTEN_ADDRESS
     value: {{ printf ":%s" (include "fluffy.rbac.containerPort" .) }}
   {{- end }}
-  {{- if and .Values.useDevPostgres (.Values.fluffy.rbac).enabled }}
+  {{- if and .Values.existingSecret .Values.secretKeys.databaseConnectionString }}
+  - name: FLUFFY_DATABASE_POSTGRES_CONNECTION_STRING
+    valueFrom:
+      secretKeyRef:
+        name: {{ .Values.existingSecret }}
+        key: {{ .Values.secretKeys.databaseConnectionString }}
+  {{- else if and .Values.secrets (.Values.secrets).databaseConnectionString }}
+  - name: FLUFFY_DATABASE_POSTGRES_CONNECTION_STRING
+    valueFrom:
+      secretKeyRef:
+        name: {{ include "lakefs.fullname" . }}
+        key: database_connection_string
+  {{- else if and .Values.useDevPostgres (.Values.fluffy.rbac).enabled }}
   - name: FLUFFY_DATABASE_TYPE
     value: postgres
   - name: FLUFFY_DATABASE_POSTGRES_CONNECTION_STRING