pub/charts
1
0
Fork 0
Code Issues Pull requests Releases Packages 19 Activity Actions

Fix disabling internal redis installation and validate state of redis.enabled and redis.host

Browse source
This commit is contained in:
Florian Piesche 2021-03-21 01:44:14 +00:00
parent 7d86a26e14
commit 8406f013d9
No known key found for this signature in database
GPG key ID: CF7283FB896221F3
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
charts/funkwhale/templates/_helpers.tpl
View file

@ -7,11 +7,7 @@ Expand the name of the chart.
{{- end -}} {{- end -}}
{{- define "funkwhale.dbUrl" -}} {{- define "funkwhale.dbUrl" -}}
postgres://{{ .Values.database.user}}:{{ .Values.database.password }}@{{ .Values.database.host }}:{{ .Values.database.port }}/{{ .Values.database.database }} postgres://{{ .Values.database.user }}:{{ .Values.database.password }}@{{ .Values.database.host }}:{{ .Values.database.port }}/{{ .Values.database.database }}
{{- end -}}
{{- define "funkwhale.redisUrl" -}}
redis://:{{ .Values.redis.password }}@{{ .Values.redis.host }}:{{ .Values.redis.redisPort }}/0
{{- end -}} {{- end -}}
{{/* {{/*
@ -45,3 +41,15 @@ Create the correct image tag name
{{- define "funkwhale.imageTag" -}} {{- define "funkwhale.imageTag" -}}
{{- .Values.image.tag | default .Chart.AppVersion -}} {{- .Values.image.tag | default .Chart.AppVersion -}}
{{- end -}} {{- end -}}
{{- define "funkwhale.redisUrl" -}}
{{- if and .Values.redis.enabled .Values.redis.host -}}
{{ fail "Setting both redis.enabled and redis.host will deploy an internal Redis service and attempt to use an external one - please set only one of the two!" }}
{{- else if .Values.redis.enabled -}}
redis://:{{ .Values.redis.password }}@{{ template "funkwhale.fullname" . }}:{{ .Values.redis.redisPort }}/0
{{- else if .Values.redis.host -}}
redis://:{{ .Values.redis.password }}@{{ .Values.redis.host }}:{{ .Values.redis.redisPort }}/0
{{- else -}}
{{ fail "Either redis.enabled or redis.host are required!" }}
{{- end -}}
{{- end -}}

2
charts/funkwhale/values.yaml
View file

@ -51,7 +51,7 @@ redis:
# this to false and adjust the host to use your existing service. # this to false and adjust the host to use your existing service.
enabled: true enabled: true
host: {{ template "funkwhale.fullname" . }}-redis-master host: ''
redisPort: 6379 redisPort: 6379
password: funkwhale password: funkwhale