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

Automatically generate random secrets for the redis password and django secret

Browse source
This commit is contained in:
Florian Piesche 2021-03-21 12:26:31 +00:00
parent 215217bd8c
commit 094a76b647
No known key found for this signature in database
GPG key ID: CF7283FB896221F3
3 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -7,11 +7,11 @@ 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 -}} {{- end -}}
{{- define "funkwhale.redisUrl" -}} {{- define "funkwhale.redisUrl" -}}
redis://:{{ .Values.redis.password }}@{{ .Values.redis.host | default (printf "%s-%s" (include "funkwhale.fullname" .) "redis-master") }}:{{ .Values.redis.redisPort }}/0 redis://:{{ default uuidv4 .Values.redis.password }}@{{ .Values.redis.host | default (printf "%s-%s" (include "funkwhale.fullname" .) "redis-master") }}:{{ .Values.redis.redisPort }}/0
{{- end -}} {{- end -}}
{{/* {{/*

8
charts/funkwhale/templates/secret.yaml
View file

@ -1,3 +1,5 @@
{{- $secret := (lookup "v1" "Secret" .Release.Namespace (include "funkwhale.fullname" .)) -}}
apiVersion: v1 apiVersion: v1
kind: Secret kind: Secret
metadata: metadata:
@ -10,7 +12,11 @@ metadata:
data: data:
CACHE_URL: {{ include "funkwhale.redisUrl" . | b64enc }} CACHE_URL: {{ include "funkwhale.redisUrl" . | b64enc }}
DATABASE_URL: {{ include "funkwhale.dbUrl" . | b64enc }} DATABASE_URL: {{ include "funkwhale.dbUrl" . | b64enc }}
DJANGO_SECRET_KEY: {{ .Values.djangoSecret | b64enc }} {{ if $secret -}}
DJANGO_SECRET_KEY: {{ $secret.data.DJANGO_SECRET_KEY }}
{{ else -}}
DJANGO_SECRET_KEY: {{ (default uuidv4 .Values.djangoSecret) | b64enc }}
{{ end }}
{{- range $key, $val := .Values.extraSecret }} {{- range $key, $val := .Values.extraSecret }}
{{ $key }}: {{ $val | b64enc }} {{ $key }}: {{ $val | b64enc }}

11
charts/funkwhale/values.yaml
View file

@ -47,6 +47,14 @@ database:
database: funkwhale database: funkwhale
redis: redis:
# If you already have a Redis service you'd like to use, set
# this to false and adjust the host to use your existing service.
enabled: true
host: ''
redisPort: 6379
password: ''
cluster: cluster:
enabled: false enabled: false
master: master:
@ -55,9 +63,6 @@ redis:
slave: slave:
persistence: persistence:
enabled: false enabled: false
password: funkwhale
redisPort: 6379
# host: {{ template "funkwhale.fullname" . }}-redis-master
djangoSecret: '' djangoSecret: ''