From b7976cc78b5455f5397cd6d3c30ad8b1b7a51133 Mon Sep 17 00:00:00 2001
From: "Alexander \"Ace\" Olofsson" <ace@haxalot.com>
Date: Wed, 19 May 2021 17:46:40 +0200
Subject: [PATCH] matrix-synapse: Fix worker volume inheritance

Only volumeMounts were inherited from the global config, not the
volumes themselves
---
 charts/matrix-synapse/Chart.yaml                       | 2 +-
 charts/matrix-synapse/templates/worker-deployment.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/charts/matrix-synapse/Chart.yaml b/charts/matrix-synapse/Chart.yaml
index 8327acd..4c7ace0 100644
--- a/charts/matrix-synapse/Chart.yaml
+++ b/charts/matrix-synapse/Chart.yaml
@@ -6,7 +6,7 @@ icon: https://matrix.org/images/matrix-logo.svg
 appVersion: 1.34.0
 
 type: application
-version: 2.0.9
+version: 2.0.10
 maintainers:
   - name: Alexander Olofsson
     email: ace@haxalot.com
diff --git a/charts/matrix-synapse/templates/worker-deployment.yaml b/charts/matrix-synapse/templates/worker-deployment.yaml
index 74f7082..9eee724 100644
--- a/charts/matrix-synapse/templates/worker-deployment.yaml
+++ b/charts/matrix-synapse/templates/worker-deployment.yaml
@@ -170,7 +170,7 @@ spec:
           emptyDir: {}
         {{- end }}
       {{- end }}
-      {{- with $config.volumes }}
+      {{- with $config.volumes | default $default.volumes }}
         {{ . | toYaml | nindent 8 }}
       {{- end }}
 {{- end }}