chore: better handling redis deployment architecture and connection

lml2468 · Mar 9, 2024 · eea803c · eea803c
1 parent b3646f6
commit eea803c
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/deploy/charts/litellm/templates/_helpers.tpl b/deploy/charts/litellm/templates/_helpers.tpl
@@ -65,6 +65,20 @@ Create the name of the service account to use
 Get redis service name
 */}}
 {{- define "litellm.redis.serviceName" -}}
-{{- printf "%s-headless" (default "redis" .Values.redis.nameOverride | trunc 63 | trimSuffix "-") -}}
+{{- if and (eq .Values.redis.architecture "standalone") .Values.redis.sentinel.enabled -}}
+{{- printf "%s-%s" .Release.Name (default "redis" .Values.redis.nameOverride | trunc 63 | trimSuffix "-") -}}
+{{- else -}}
+{{- printf "%s-%s-master" .Release.Name (default "redis" .Values.redis.nameOverride | trunc 63 | trimSuffix "-") -}}
+{{- end -}}
 {{- end -}}
 
+{{/*
+Get redis service port
+*/}}
+{{- define "litellm.redis.port" -}}
+{{- if .Values.redis.sentinel.enabled -}}
+{{ .Values.redis.sentinel.service.ports.sentinel }}
+{{- else -}}
+{{ .Values.redis.master.service.ports.redis }}
+{{- end -}}
+{{- end -}}
diff --git a/deploy/charts/litellm/templates/deployment.yaml b/deploy/charts/litellm/templates/deployment.yaml
@@ -144,9 +144,9 @@ spec:
                   key: masterkey
             {{- if .Values.redis.enabled }}
             - name: REDIS_HOST
-              value: {{ template "litellm.redis.serviceName" . }}
+              value: {{ include "litellm.redis.serviceName" . }}
             - name: REDIS_PORT
-              value: {{ if .Values.redis.sentinel.enabled }}{{ .Values.redis.sentinel.service.ports.sentinel }}{{ else }}{{ .Values.redis.master.service.ports.redis}}{{ end }}
+              value: {{ include "litellm.redis.port" . | quote }}
             - name: REDIS_PASSWORD
               valueFrom:
                 secretKeyRef:

diff --git a/deploy/charts/litellm/values.yaml b/deploy/charts/litellm/values.yaml
@@ -87,6 +87,8 @@ proxy_config:
         api_key: eXaMpLeOnLy
   general_settings:
     master_key: os.environ/PROXY_MASTER_KEY
+#  litellm_settings:
+#    cache: true
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious
@@ -172,3 +174,4 @@ postgresql:
 # with cache: true to use existing redis instance
 redis:
   enabled: false
+  architecture: replication