Merge pull request #21 from brennoo/add_redis_protocol

Add support for redis protocol

Author: ScribblerCoder

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 MinIO
 dependencies:

README.md

@@ -1,5 +1,5 @@
 # CTFd Helm Chart
-![Version: 0.3.0](https://img.shields.io/badge/Version-0.3.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
+![Version: 0.3.1](https://img.shields.io/badge/Version-0.3.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 [![Lint and Server-side Dryrun Chart](https://github.com/ScribblerCoder/CTFd-Helm/actions/workflows/helm-lint-test.yaml/badge.svg)](https://github.com/ScribblerCoder/CTFd-Helm/actions/workflows/helm-lint-test.yaml)
 
 This is a Helm chart for deploying CTFd on Kubernetes. It deploys the official [CTFd Docker image](ghcr.io/ctfd/ctfd). HA and Autoscaling + MariaDB + Redis + S3 Storage. Also supports using external MariaDB/Redis/S3.

templates/_helpers.tpl

@@ -81,7 +81,7 @@ mysql+pymysql://{{ index .Values "mariadb-galera" "external" "username" }}:{{ in
 {{- 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/%v" (.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 +93,4 @@ redis://{{ .Values.redis.external.username }}:{{ .Values.redis.external.password
 http://{{ (index .Values.minio.ingress.hosts 0) }}
 {{- else -}}
 {{- end -}}
-{{- end -}}
+{{- end -}}

values.yaml

@@ -250,6 +250,8 @@ redis:
     host: external-redis-host
     username: ""
     password: ""
+    protocol: "redis"  # change to rediss if you are using TLS
+    database: 0
   volumePermissions:
     enabled: true  # set to false if you want to manage the permissions yourself
     image:
@@ -315,4 +317,4 @@ minio:
     size: 10Gi
 
 # -- Made for deploying custom manifests with this helm chart
-extraObjects: []
+extraObjects: []