From 1b017474acd1c05e7c183b46c6ffd84e7b7b4884 Mon Sep 17 00:00:00 2001 From: Alexander Olofsson Date: Sun, 30 Jul 2023 22:40:37 +0200 Subject: [PATCH] funkwhale: Ensure redis database default is used Some ways of using Helm don't always pull the new default values into the applied configuration, so it's best to ensure that it's applied with fallback defaults when necessary --- charts/funkwhale/templates/_helpers.tpl | 2 +- charts/funkwhale/values.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/funkwhale/templates/_helpers.tpl b/charts/funkwhale/templates/_helpers.tpl index a7eb807..62e400e 100644 --- a/charts/funkwhale/templates/_helpers.tpl +++ b/charts/funkwhale/templates/_helpers.tpl @@ -71,7 +71,7 @@ Create the correct image tag name {{- else if .Values.redis.enabled -}} redis://:{{ .Values.redis.auth.password }}@{{ template "funkwhale.redis.host" . }}:{{ .Values.redis.master.service.port | default 6379 }}/0 {{- else if .Values.redis.host -}} -redis://:{{ .Values.redis.auth.password }}@{{ .Values.redis.host }}:{{ .Values.redis.master.service.port | default 6379 }}/{{ .Values.redis.database }} +redis://:{{ .Values.redis.auth.password }}@{{ .Values.redis.host }}:{{ .Values.redis.master.service.port | default 6379 }}/{{ .Values.redis.database | default 0 }} {{- else -}} {{ fail "Either redis.enabled or redis.host are required!" }} {{- end -}} diff --git a/charts/funkwhale/values.yaml b/charts/funkwhale/values.yaml index 9da4103..6439eaa 100644 --- a/charts/funkwhale/values.yaml +++ b/charts/funkwhale/values.yaml @@ -84,8 +84,8 @@ redis: ## External Redis hostname or IP # host: redis.example.com - ## Name of the redis database funkwhale should connect to - database: 0 + ## The redis database ID that funkwhale should use, defaults to 0 + # database: 0 auth: enabled: true