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

Fix configmap and secret generation

Browse source
This commit is contained in:
Alexander Olofsson 2019-05-20 12:54:07 +02:00
parent 0c0fcd41f0
commit 8de88b4368
No known key found for this signature in database
GPG key ID: D439C9470CB04C73
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
charts/funkwhale/templates/configmap.yaml
View file

@ -23,21 +23,21 @@ data:
DJANGO_ALLOWED_HOSTS: '*' DJANGO_ALLOWED_HOSTS: '*'
{{- if .Values.s3.enabled -}} {{- if .Values.s3.enabled }}
AWS_ACCESS_KEY_ID: {{ .Values.s3.accessKey }} AWS_ACCESS_KEY_ID: {{ .Values.s3.accessKey }}
AWS_SECRET_ACCESS_KEY: {{ .Values.s3.secretKey }} AWS_SECRET_ACCESS_KEY: {{ .Values.s3.secretKey }}
AWS_STORAGE_BUCKET_NAME: {{ .Values.s3.bucket }} AWS_STORAGE_BUCKET_NAME: {{ .Values.s3.bucket }}
{{- if .Values.s3.region -}} {{- if .Values.s3.region }}
AWS_S3_REGION_NAME: {{ .Values.s3.region }} AWS_S3_REGION_NAME: {{ .Values.s3.region }}
{{- end -}} {{- end }}
{{- if .Values.s3.location -}} {{- if .Values.s3.location }}
AWS_LOCATION: {{ .Values.s3.location }} AWS_LOCATION: {{ .Values.s3.location }}
{{- end -}} {{- end }}
{{- if .Values.s3.url -}} {{- if .Values.s3.url }}
AWS_S3_ENDPOINT_URL: {{ .Values.s3.url }} AWS_S3_ENDPOINT_URL: {{ .Values.s3.url }}
{{- end -}} {{- end }}
PROXY_MEDIA: {{ .Values.s3.proxy | quote }} PROXY_MEDIA: {{ .Values.s3.proxy | quote }}
{{- end -}} {{- end }}
{{- with .Values.extraEnv -}} {{- with .Values.extraEnv -}}
{{- toYaml . | nindent 2 }} {{- toYaml . | nindent 2 }}

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

@ -12,6 +12,6 @@ data:
DATABASE_URL: {{ include "funkwhale.dbUrl" . | b64enc }} DATABASE_URL: {{ include "funkwhale.dbUrl" . | b64enc }}
DJANGO_SECRET_KEY: {{ .Values.djangoSecret | b64enc }} DJANGO_SECRET_KEY: {{ .Values.djangoSecret | b64enc }}
{{- range $key, $val := .Values.extraSecret -}} {{- range $key, $val := .Values.extraSecret }}
{{ $key }}: {{ $val | b64enc }} {{ $key }}: {{ $val | b64enc }}
{{- end -}} {{- end }}