Replace custom redis with bitnami redis with persistence storage

Author: thenav56

deploy/helm/ifrcgo-helm/.gitignore

@@ -1,2 +1,3 @@
 .helm-charts
 values-local.yaml
+charts

deploy/helm/ifrcgo-helm/Chart.yaml

@@ -5,3 +5,9 @@ version: 0.0.2-SET-BY-CICD
 
 sources:
   - https://github.com/IFRCGo/go-api
+
+dependencies:
+  - name: redis
+    version: "20.7.1"
+    repository: https://charts.bitnami.com/bitnami
+    condition: redis.enabled

deploy/helm/ifrcgo-helm/requirements.lock

@@ -0,0 +1,6 @@
+dependencies:
+- name: redis
+  repository: https://charts.bitnami.com/bitnami
+  version: 20.7.1
+digest: sha256:1852c9489ae647e0394ccb39fa70787bb29ebbdbe24b89b914ce01a2adc6ff29
+generated: "2025-02-18T16:08:53.322089326+05:45"

deploy/helm/ifrcgo-helm/templates/config/configmap.yaml

@@ -7,8 +7,15 @@ metadata:
     environment: {{ .Values.environment }}
     release: {{ .Release.Name }}
 data:
-  CELERY_REDIS_URL: "redis://{{ template "ifrcgo-helm.fullname" . }}-redis:6379/0"
-  CACHE_REDIS_URL: "redis://{{ template "ifrcgo-helm.fullname" . }}-redis:6379/1"
+  # Redis
+  {{- if .Values.redis.enabled }}
+  CELERY_REDIS_URL: "redis://{{ printf "%s-master" (include "common.names.fullname" .Subcharts.redis) }}:6379/0"
+  CACHE_REDIS_URL: "redis://{{ printf "%s-master" (include "common.names.fullname" .Subcharts.redis) }}:6379/1"
+  {{- else }}
+  CELERY_REDIS_URL: {{ required "env.CELERY_REDIS_URL" .Values.env.CELERY_REDIS_URL | quote }}
+  CACHE_REDIS_URL: {{ required "env.CACHE_REDIS_URL" .Values.env.CACHE_REDIS_URL | quote }}
+  {{- end }}
+
   CACHE_MIDDLEWARE_SECONDS: {{ .Values.env.CACHE_MIDDLEWARE_SECONDS | quote }}
   DJANGO_DEBUG: {{ .Values.env.DJANGO_DEBUG | quote }}
   ELASTIC_SEARCH_HOST: {{ default (printf "elasticsearch://%s-elasticsearch:9200" (include "ifrcgo-helm.fullname" .)) .Values.env.ELASTIC_SEARCH_HOST | quote }}

deploy/helm/ifrcgo-helm/values.yaml

@@ -84,6 +84,24 @@ secretsAdditional:
   # Additional secrets
   # EXAMPLE: MY_SECRET: "my-secret-value"
 
+redis:
+  enabled: true
+  architecture: standalone
+  fullnameOverride: go-redis
+  auth:
+    enabled: false
+  master:
+    persistence:
+      enabled: true
+      size: 1Gi
+    resources:
+      requests:
+        cpu: "0.5"
+        memory: 1Gi
+      limits:
+        cpu: "1"
+        memory: 2Gi
+
 api:
   domain: "go-staging.ifrc.org"
   tls:
@@ -104,16 +122,6 @@ api:
       cpu: "2"
       memory: 4Gi
 
-redis:
-  enabled: true
-  resources:
-    requests:
-      cpu: "0.5"
-      memory: 1Gi
-    limits:
-      cpu: "1"
-      memory: 2Gi
-
 celery:
   enabled: true
   resources: