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

Merge branch 'master' into 'master'

Browse source 
Allow external redis service and fix API pod extra volume mounts.

See merge request ananace/charts!2
This commit is contained in:
Alexander Olofsson 2021-03-15 07:10:19 +00:00
commit 374c18191a
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -11,7 +11,7 @@ postgres://{{ .Values.database.user}}:{{ .Values.database.password }}@{{ .Values
{{- end -}} {{- end -}}
{{- define "funkwhale.redisUrl" -}} {{- define "funkwhale.redisUrl" -}}
redis://:{{ .Values.redis.password }}@{{ template "funkwhale.fullname" . }}-redis-master:{{ .Values.redis.redisPort }}/0 redis://:{{ .Values.redis.password }}@{{ .Values.redis.host }}:{{ .Values.redis.redisPort }}/0
{{- end -}} {{- end -}}
{{/* {{/*

2
charts/funkwhale/templates/deployment.yaml
View file

@ -66,7 +66,7 @@ spec:
name: frontend name: frontend
- name: data - name: data
mountPath: /srv/funkwhale/data mountPath: /srv/funkwhale/data
{{- with .Values.extraVolumeMounts }} {{- with .Values.api.extraVolumeMounts }}
{{ toYaml . | nindent 12 }} {{ toYaml . | nindent 12 }}
{{- end }} {{- end }}
resources: resources:

1
charts/funkwhale/values.yaml
View file

@ -57,6 +57,7 @@ redis:
enabled: false enabled: false
password: funkwhale password: funkwhale
redisPort: 6379 redisPort: 6379
host: {{ template "funkwhale.fullname" . }}-redis-master
djangoSecret: '' djangoSecret: ''