Merge branch 'master' into allow-disabling-redis

.gitignore

@@ -0,0 +1,3 @@
+# Helm resources
+charts/*/charts/*.tgz
+charts/*/Chart.lock

.gitlab-ci.yml

@@ -16,6 +16,10 @@ pages:
     name: codenest/helm
     entrypoint: ["/bin/sh", "-c"]
   stage: deploy
+  before_script:
+    - grep 'repository:' charts/*/Chart.yaml charts/*/requirements.yaml | awk '{ print $3 }' | uniq | xargs -rn1 sh -c 'helm repo add $(basename $0) $0'
+    - helm repo update
+    - ls -d1 charts/* | xargs -rn1 helm dependency build --skip-refresh
   script:
     - mkdir -p public
     - "echo \"User-Agent: *\nDisallow: /\" > ./public/robots.txt"

charts/funkwhale/Chart.yaml

@@ -1,7 +1,13 @@
 ---
-apiVersion: v1
+apiVersion: v2
 appVersion: "1.1"
 description: A social platform to enjoy and share music
 icon: https://funkwhale.audio/favicon.png
 name: funkwhale
 version: 0.3.7
+
+dependencies:
+- name: redis
+  version: ~10.6.10
+  repository: https://charts.bitnami.com/bitnami
+  condition: redis.enabled

charts/funkwhale/requirements.lock

@@ -1,6 +0,0 @@
-dependencies:
-- name: redis
-  repository: https://charts.bitnami.com/bitnami
-  version: 10.6.10
-digest: sha256:5a929e0124864ab7fbe29c01fcbe1a23e4532dd0912abcb8bc185fff5f4e65f3
-generated: "2020-04-24T11:47:31.68381778+02:00"

charts/funkwhale/requirements.yaml

@@ -1,5 +0,0 @@
-dependencies:
-  - name: redis
-    version: ~10.6.10
-    repository: https://charts.bitnami.com/bitnami
-    condition: redis.enabled

charts/funkwhale/templates/secret.yaml

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

charts/funkwhale/values.yaml

@@ -53,7 +53,7 @@ redis:
 
   host: ''
   redisPort: 6379
-  password: funkwhale
+  password: 'funkwhale'
 
   cluster:
     enabled: false

charts/matrix-synapse/Chart.yaml

@@ -3,10 +3,10 @@ apiVersion: v2
 name: matrix-synapse
 description: Matrix reference homeserver
 icon: https://matrix.org/images/matrix-logo.svg
-appVersion: 1.29.0
+appVersion: 1.30.0
 
 type: application
-version: 2.0.0
+version: 2.0.1
 maintainers:
   - name: Alexander Olofsson
     email: ace@haxalot.com