From c7ab556a985a6df96324da0bb318533617264ff7 Mon Sep 17 00:00:00 2001
From: Barak Amar <barak.amar@treeverse.io>
Date: Wed, 17 Jan 2024 00:50:58 +0200
Subject: [PATCH] Fix: fluffy use secret database connection string

---
 charts/lakefs/templates/_fluffy.tpl | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

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