From 6faaf791d2e236bcb5a8c39c6d87c7a0a2dd3e31 Mon Sep 17 00:00:00 2001
From: Goutham Pratapa <goutham@appsmith.com>
Date: Mon, 31 Jul 2023 14:55:57 +0530
Subject: [PATCH] fix: redis-url when deploying appsmith via helm (#25689)

Fixes: [25688](https://github.com/appsmithorg/appsmith/issues/25688)
---
 deploy/helm/templates/configMap.yaml   | 3 ++-
 deploy/helm/templates/statefulset.yaml | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/deploy/helm/templates/configMap.yaml b/deploy/helm/templates/configMap.yaml
index 4a53bbe25b..96a64b5af9 100644
--- a/deploy/helm/templates/configMap.yaml
+++ b/deploy/helm/templates/configMap.yaml
@@ -3,6 +3,7 @@
 {{- $mongoUser := .Values.mongodb.auth.rootUser -}}
 {{- $mongoPassword := .Values.mongodb.auth.rootPassword -}}
 {{- $mongoServicename := .Values.mongodb.service.nameOverride -}}
+{{- $releaseName := .Release.Name -}}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -19,7 +20,7 @@ data:
   {{- end }}
   {{- if and (eq "APPSMITH_REDIS_URL" $key) ( not $value) }}
   {{- if $.Values.redis.enabled }}
-  {{ $key }}: redis://{{ $name }}-redis-master.{{ $nameSpace }}.svc.cluster.local:6379
+  {{ $key }}: redis://{{ $releaseName }}-redis-master.{{ $nameSpace }}.svc.cluster.local:6379
   {{- end }}
   {{- end }}
   {{- if $value }}
diff --git a/deploy/helm/templates/statefulset.yaml b/deploy/helm/templates/statefulset.yaml
index 9e6ad7f0d6..43625df91b 100644
--- a/deploy/helm/templates/statefulset.yaml
+++ b/deploy/helm/templates/statefulset.yaml
@@ -51,7 +51,7 @@ spec:
       {{- else }}
         image: "docker.io/library/redis:6.2-alpine"
       {{- end }}
-        command: ['sh', '-c', "until redis-cli -h {{ include "appsmith.fullname" . }}-redis-master.{{.Release.Namespace}}.svc.cluster.local ping ; do echo waiting for redis; sleep 2; done"]
+        command: ['sh', '-c', "until redis-cli -h {{.Release.Name}}-redis-master.{{.Release.Namespace}}.svc.cluster.local ping ; do echo waiting for redis; sleep 2; done"]
       {{- end }}
       {{- if .Values.mongodb.enabled }}
       - name: mongo-init-container