From c97cb1307d57974436569247aa66c7dd8f450a04 Mon Sep 17 00:00:00 2001
From: Marcin Jasion <mjasion@users.noreply.github.com>
Date: Thu, 13 Jul 2023 15:33:23 +0200
Subject: [PATCH] fix(redis): Remove fullnameOverride from redis

---
 charts/studio/templates/configmap-studio.yaml | 6 +++---
 charts/studio/values.yaml                     | 9 +++++++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/charts/studio/templates/configmap-studio.yaml b/charts/studio/templates/configmap-studio.yaml
index 91795139..66b8219f 100644
--- a/charts/studio/templates/configmap-studio.yaml
+++ b/charts/studio/templates/configmap-studio.yaml
@@ -46,19 +46,19 @@ data:
   {{- if .Values.global.celery.brokerUrl }}
   CELERY_BROKER_URL: {{ .Values.global.celery.brokerUrl }}
   {{- else }}
-  CELERY_BROKER_URL: "redis://{{ .Values.redis.fullnameOverride }}-master.{{ .Release.Namespace }}.svc.cluster.local:6379"
+  CELERY_BROKER_URL: "redis://{{ .Release.Name }}-redis-master.{{ .Release.Namespace }}.svc.cluster.local:6379"
   {{- end }}
 
   {{- if .Values.global.celery.resultBackend }}
   CELERY_RESULT_BACKEND: {{ .Values.global.celery.resultBackend }}
   {{- else }}
-  CELERY_RESULT_BACKEND: "redis://{{ .Values.redis.fullnameOverride }}-master.{{ .Release.Namespace }}.svc.cluster.local:6379"
+  CELERY_RESULT_BACKEND: "redis://{{ .Release.Name }}-redis-master.{{ .Release.Namespace }}.svc.cluster.local:6379"
   {{- end }}
 
   {{- if .Values.global.celery.resultBackend }}
   REDIS_URL: {{ .Values.global.celery.resultBackend }}
   {{- else }}
-  REDIS_URL: "redis://{{ .Values.redis.fullnameOverride }}-master.{{ .Release.Namespace }}.svc.cluster.local:6379"
+  REDIS_URL: "redis://{{ .Release.Name }}-redis-master.{{ .Release.Namespace }}.svc.cluster.local:6379"
   {{- end }}
 
   {{- if .Values.global.scmProviders.github.apiUrl }}
diff --git a/charts/studio/values.yaml b/charts/studio/values.yaml
index 306d526f..9d7d6b78 100644
--- a/charts/studio/values.yaml
+++ b/charts/studio/values.yaml
@@ -250,8 +250,13 @@ nginx:
 redis:
   # -- Redis enabled
   enabled: true
-  # -- Redis name override
-  fullnameOverride: studio-redis
+
+  # -- Redis master configuration
+  master:
+    # -- Redis master persistence configuration
+    persistence:
+      # -- Redis master persistence size in PVC
+      size: "1Gi"
 
   # -- Redis master configuration
   master: