Add support for redis protocol

Signed-off-by: Brenno Oliveira <brenno.oliveira@deliveryhero.com>

Author: brennoo

Chart.yaml

@@ -6,7 +6,7 @@ icon: https://ctfd.io/static/img/ctfd.svg
 type: application
 
 # Dev note: trigger a helm chart release by bumping the version
-version: 0.3.0
+version: 0.3.1
 
 # Redis, MySQL/MariaDB and Seaweedfs
 dependencies:

templates/_helpers.tpl

@@ -73,15 +73,14 @@ mysql+pymysql://{{ index .Values "mariadb-galera" "external" "username" }}:{{ in
 {{- end -}}
 
 
-
 {{/*
    Generate CTFd REDIS_URL (internal bitnami redis or external self managed redis)
 */}}
 {{- define "ctfd.REDIS_URL" -}}
 {{- if .Values.redis.enabled -}}
 redis://{{ .Release.Name }}-redis-master:6379
 {{- else -}}
-redis://{{ .Values.redis.external.username }}:{{ .Values.redis.external.password }}@{{ .Values.redis.external.host }}:{{ .Values.redis.external.port }}
+{{- printf "%s://%s:%s@%s:%v/%s" (.Values.redis.external.protocol | default "redis") .Values.redis.external.username .Values.redis.external.password .Values.redis.external.host .Values.redis.external.port (.Values.redis.external.database | default 0) -}}
 {{- end -}}
 {{- end -}}
 
@@ -93,4 +92,4 @@ redis://{{ .Values.redis.external.username }}:{{ .Values.redis.external.password
 http://{{ (index .Values.minio.ingress.hosts 0) }}
 {{- else -}}
 {{- end -}}
-{{- end -}}
+{{- end -}}

values.yaml

@@ -287,4 +287,4 @@ minio:
     size: 10Gi
 
 # -- Made for deploying custom manifests with this helm chart
-extraObjects: []
+extraObjects: []