From 13e9da184ddfd92450b0e448edf747e1ad990546 Mon Sep 17 00:00:00 2001
From: Janne Mareike Koschinski <janne@kuschku.de>
Date: Sat, 30 Apr 2022 18:11:09 +0200
Subject: [PATCH] fix: correct volume definition

---
 templates/deploy-admin.yaml    |  4 ++--
 templates/deploy-antispam.yaml |  4 ++--
 templates/deploy-imap.yaml     |  4 ++--
 templates/deploy-smtp.yaml     |  2 +-
 templates/deploy-webdav.yaml   |  2 +-
 values.yaml                    | 10 +++++-----
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/templates/deploy-admin.yaml b/templates/deploy-admin.yaml
index e83e827..538e466 100644
--- a/templates/deploy-admin.yaml
+++ b/templates/deploy-admin.yaml
@@ -29,9 +29,9 @@ spec:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
       volumes:
         - name: data
-          {{- toYaml .Values.volumes.data | nindent 10 }}
+          {{- .Values.volumes.data | nindent 10 }}
         - name: dkim
-          {{- toYaml .Values.volumes.dkim | nindent 10 }}
+          {{- .Values.volumes.dkim | nindent 10 }}
         - name: config
           configMap:
             name: {{ include "mailu-helm.fullname" . }}-admin
diff --git a/templates/deploy-antispam.yaml b/templates/deploy-antispam.yaml
index 67e0e85..eb168b0 100644
--- a/templates/deploy-antispam.yaml
+++ b/templates/deploy-antispam.yaml
@@ -29,9 +29,9 @@ spec:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
       volumes:
         - name: filter
-          {{- toYaml .Values.volumes.filter | nindent 10 }}
+          {{- .Values.volumes.filter | nindent 10 }}
         - name: dkim
-          {{- toYaml .Values.volumes.dkim | nindent 10 }}
+          {{- .Values.volumes.dkim | nindent 10 }}
         - name: config
           secret:
             secretName: {{ include "mailu-helm.fullname" . }}-antispam
diff --git a/templates/deploy-imap.yaml b/templates/deploy-imap.yaml
index 9f4a32f..c5df9fa 100644
--- a/templates/deploy-imap.yaml
+++ b/templates/deploy-imap.yaml
@@ -29,9 +29,9 @@ spec:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
       volumes:
         - name: data
-          {{- toYaml .Values.volumes.data | nindent 10 }}
+          {{- .Values.volumes.data | nindent 10 }}
         - name: mail
-          {{- toYaml .Values.volumes.mail | nindent 10 }}
+          {{- .Values.volumes.mail | nindent 10 }}
       containers:
         - name: imap
           securityContext:
diff --git a/templates/deploy-smtp.yaml b/templates/deploy-smtp.yaml
index 75425a9..5e331de 100644
--- a/templates/deploy-smtp.yaml
+++ b/templates/deploy-smtp.yaml
@@ -29,7 +29,7 @@ spec:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
       volumes:
         - name: data
-          {{- toYaml .Values.volumes.data | nindent 10 }}
+          {{- .Values.volumes.data | nindent 10 }}
         - name: certs
           secret:
             secretName: {{ include "mailu-helm.fullname" . }}-tls
diff --git a/templates/deploy-webdav.yaml b/templates/deploy-webdav.yaml
index 98b2afd..2766b1b 100644
--- a/templates/deploy-webdav.yaml
+++ b/templates/deploy-webdav.yaml
@@ -29,7 +29,7 @@ spec:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
       volumes:
         - name: webdav
-          {{- toYaml .Values.volumes.webdav | nindent 10 }}
+          {{- .Values.volumes.webdav | nindent 10 }}
       containers:
         - name: webdav
           securityContext:
diff --git a/values.yaml b/values.yaml
index a5e222d..06a9b05 100644
--- a/values.yaml
+++ b/values.yaml
@@ -50,15 +50,15 @@ certificate:
     - "mail.example.com"
 
 volumes:
-  dkim:
+  dkim: |-
     emptyDir: {}
-  data:
+  data: |-
     emptyDir: {}
-  mail:
+  mail: |-
     emptyDir: {}
-  filter:
+  filter: |-
     emptyDir: {}
-  webdav:
+  webdav: |-
     emptyDir: {}
 
 front:
-- 
GitLab