funkwhale: Update chart dependencies
This commit is contained in:
parent
2b2439d596
commit
5c00379a0b
3 changed files with 37 additions and 29 deletions
|
@ -4,14 +4,14 @@ appVersion: "1.2.9"
|
||||||
description: A social platform to enjoy and share music
|
description: A social platform to enjoy and share music
|
||||||
icon: https://funkwhale.audio/favicon.png
|
icon: https://funkwhale.audio/favicon.png
|
||||||
name: funkwhale
|
name: funkwhale
|
||||||
version: 0.7.0
|
version: 1.0.0
|
||||||
|
|
||||||
dependencies:
|
dependencies:
|
||||||
- name: redis
|
|
||||||
version: ^15.7.0
|
|
||||||
repository: https://charts.bitnami.com/bitnami
|
|
||||||
condition: redis.enabled
|
|
||||||
- name: postgresql
|
- name: postgresql
|
||||||
version: ^10.9.4
|
version: ^12.1.4
|
||||||
repository: https://charts.bitnami.com/bitnami
|
repository: https://charts.bitnami.com/bitnami
|
||||||
condition: postgresql.enabled
|
condition: postgresql.enabled
|
||||||
|
- name: redis
|
||||||
|
version: ^17.3.17
|
||||||
|
repository: https://charts.bitnami.com/bitnami
|
||||||
|
condition: redis.enabled
|
||||||
|
|
|
@ -12,14 +12,17 @@ Expand the name of the chart.
|
||||||
{{- end -}}
|
{{- end -}}
|
||||||
|
|
||||||
{{- define "funkwhale.dbUrl" -}}
|
{{- define "funkwhale.dbUrl" -}}
|
||||||
|
{{- if (or .Values.postgresql.postgresqlUsername .Values.postgresql.postgresqlPassword .Values.postgresql.postgresqlDatabase) -}}
|
||||||
|
{{ fail "You are using the old postgresql auth config keys - please update your values to the new postgresql.auth config keys" }}
|
||||||
|
{{- end -}}
|
||||||
{{- if .Values.database -}}
|
{{- if .Values.database -}}
|
||||||
{{ fail "You are using the old database config key - please update your values to the new postgresql config key" }}
|
{{ fail "You are using the old database config key - please update your values to the new postgresql config key" }}
|
||||||
{{- else if and .Values.postgresql.enabled .Values.postgresql.host -}}
|
{{- else if and .Values.postgresql.enabled .Values.postgresql.host -}}
|
||||||
{{ fail "Both postgresql.enabled and postgresql.host have been specified - you may want to set postgresql.enabled=false if you want to use an external database" }}
|
{{ fail "Both postgresql.enabled and postgresql.host have been specified - you may want to set postgresql.enabled=false if you want to use an external database" }}
|
||||||
{{- else if .Values.postgresql.enabled -}}
|
{{- else if .Values.postgresql.enabled -}}
|
||||||
postgres://{{ .Values.postgresql.postgresqlUsername }}:{{ .Values.postgresql.postgresqlPassword }}@{{ template "funkwhale.postgresql.host" . }}:{{ .Values.postgresql.service.port }}/{{ .Values.postgresql.postgresqlDatabase }}
|
postgres://{{ .Values.postgresql.auth.username }}:{{ .Values.postgresql.auth.password }}@{{ template "funkwhale.postgresql.host" . }}:{{ .Values.postgresql.service.port }}/{{ .Values.postgresql.auth.database }}
|
||||||
{{- else if .Values.postgresql.host -}}
|
{{- else if .Values.postgresql.host -}}
|
||||||
postgres://{{ .Values.postgresql.postgresqlUsername }}:{{ .Values.postgresql.postgresqlPassword }}@{{ .Values.postgresql.host }}:{{ .Values.postgresql.service.port }}/{{ .Values.postgresql.postgresqlDatabase }}
|
postgres://{{ .Values.postgresql.auth.username }}:{{ .Values.postgresql.auth.password }}@{{ .Values.postgresql.host }}:{{ .Values.postgresql.service.port }}/{{ .Values.postgresql.auth.database }}
|
||||||
{{- else -}}
|
{{- else -}}
|
||||||
{{ fail "Either postgresql.enabled or postgresql.host are required!" }}
|
{{ fail "Either postgresql.enabled or postgresql.host are required!" }}
|
||||||
{{- end -}}
|
{{- end -}}
|
||||||
|
|
|
@ -42,19 +42,21 @@ postgresql:
|
||||||
## External Postgresql hostname or IP
|
## External Postgresql hostname or IP
|
||||||
# host: postgresql.example.com
|
# host: postgresql.example.com
|
||||||
|
|
||||||
|
auth:
|
||||||
## Database user
|
## Database user
|
||||||
postgresqlUsername: funkwhale
|
username: funkwhale
|
||||||
|
|
||||||
## Database password
|
## Database password
|
||||||
postgresqlPassword: funkwhale
|
password: funkwhale
|
||||||
|
|
||||||
## Database password
|
## Database password
|
||||||
postgresqlDatabase: funkwhale
|
database: funkwhale
|
||||||
|
|
||||||
## Database port
|
## Database port
|
||||||
service:
|
service:
|
||||||
port: 5432
|
port: 5432
|
||||||
|
|
||||||
|
primary:
|
||||||
## Database storage configuration
|
## Database storage configuration
|
||||||
persistence:
|
persistence:
|
||||||
enabled: true
|
enabled: true
|
||||||
|
@ -66,7 +68,9 @@ postgresql:
|
||||||
host all all localhost trust
|
host all all localhost trust
|
||||||
host all all 0.0.0.0/0 md5
|
host all all 0.0.0.0/0 md5
|
||||||
host all all ::/0 md5
|
host all all ::/0 md5
|
||||||
initdbScripts:
|
|
||||||
|
initdb:
|
||||||
|
scripts:
|
||||||
enable_extensions.sh: |
|
enable_extensions.sh: |
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
|
@ -87,6 +91,7 @@ redis:
|
||||||
|
|
||||||
architecture: standalone
|
architecture: standalone
|
||||||
master:
|
master:
|
||||||
|
kind: Deployment
|
||||||
persistence:
|
persistence:
|
||||||
enabled: false
|
enabled: false
|
||||||
service:
|
service:
|
||||||
|
|
Loading…
Reference in a new issue