From 3fd1d52990cddea556cc1c9675ca33b9a249b77c Mon Sep 17 00:00:00 2001
From: Shrikant Sharat Kandula <shrikant@appsmith.com>
Date: Tue, 28 May 2024 19:40:36 +0530
Subject: [PATCH] chore: Support APPSMITH_DB_URL in Helm chart (#33656)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

If the `APPSMITH_MONGODB_URI` is not set, we set it to a constructed
service URL value. This PR adds the same feature to new
`APPSMITH_DB_URL` env variable as well.

⚠️ This will cause conflicts on sync. DO NOT MERGE unless the author is
available.

/test sanity

---------

Co-authored-by: Goutham Pratapa <goutham@appsmith.com>
---
 deploy/helm/Chart.yaml               |  2 +-
 deploy/helm/templates/configMap.yaml | 10 +++++-----
 deploy/helm/values.yaml              |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/deploy/helm/Chart.yaml b/deploy/helm/Chart.yaml
index 9c7332b431..9792aa61fc 100644
--- a/deploy/helm/Chart.yaml
+++ b/deploy/helm/Chart.yaml
@@ -11,7 +11,7 @@ sources:
   - https://github.com/appsmithorg/appsmith
 home: https://www.appsmith.com/
 icon: https://assets.appsmith.com/appsmith-icon.png
-version: 2.0.7
+version: 2.1.0
 dependencies:
 - condition: redis.enabled
   name: redis
diff --git a/deploy/helm/templates/configMap.yaml b/deploy/helm/templates/configMap.yaml
index 650cf79a99..4e3ea9a793 100644
--- a/deploy/helm/templates/configMap.yaml
+++ b/deploy/helm/templates/configMap.yaml
@@ -12,12 +12,12 @@ metadata:
   labels:
     {{- include "appsmith.labels" . | nindent 4 }}
 data:
+  {{- if and $.Values.mongodb.enabled (not .Values.applicationConfig.APPSMITH_MONGODB_URI) (not .Values.applicationConfig.APPSMITH_DB_URL) }}
+  APPSMITH_DB_URL: |
+    mongodb+srv://{{ $mongoUser }}:{{ $mongoPassword }}@{{ $mongoServicename }}.{{ $nameSpace }}.svc.cluster.local/appsmith?retryWrites=true&authSource=admin&ssl=false
+  {{- end }}
+
   {{- range $key, $value := .Values.applicationConfig }}
-  {{- if and (eq "APPSMITH_MONGODB_URI" $key) (not $value) }}
-  {{- if $.Values.mongodb.enabled }}
-  {{ $key }}: mongodb+srv://{{ $mongoUser }}:{{ $mongoPassword }}@{{ $mongoServicename }}.{{ $nameSpace }}.svc.cluster.local/appsmith?retryWrites=true&authSource=admin&ssl=false
-  {{- end }}
-  {{- end }}
   {{- if and (eq "APPSMITH_REDIS_URL" $key) ( not $value) }}
   {{- if $.Values.redis.enabled }}
   {{ $key }}: redis://{{ $releaseName }}-redis-master.{{ $nameSpace }}.svc.cluster.local:6379
diff --git a/deploy/helm/values.yaml b/deploy/helm/values.yaml
index 1c54837c07..030335ccfd 100644
--- a/deploy/helm/values.yaml
+++ b/deploy/helm/values.yaml
@@ -305,7 +305,7 @@ applicationConfig:
   APPSMITH_RECAPTCHA_SITE_KEY: ""
   APPSMITH_RECAPTCHA_SECRET_KEY: ""
   APPSMITH_RECAPTCHA_ENABLED: ""
-  APPSMITH_MONGODB_URI: ""
+  APPSMITH_DB_URL: ""
   APPSMITH_REDIS_URL: ""
   APPSMITH_ENCRYPTION_PASSWORD: ""
   APPSMITH_ENCRYPTION_SALT: ""