Fix bokysan#66: mount sockets into a temporary directory

thienohs · May 29, 2021 · fb53f25 · fb53f25
1 parent 5713ef4
commit fb53f25
Showing 1 changed file with 3 additions and 17 deletions.
diff --git a/helm/mail/templates/statefulset.yaml b/helm/mail/templates/statefulset.yaml
@@ -83,36 +83,22 @@ spec:
             {{- if .Values.extraVolumeMounts }}{{- toYaml .Values.extraVolumeMounts | nindent 12 }}{{ end }}
           resources: {{ toYaml .Values.resources | nindent 12 }}
       volumes:
-      {{- if .Values.persistence.enabled }}
         # Socket directories
         - name: public
           emptyDir: {}
         - name: private
           emptyDir: {}
-        {{- if .Values.persistence.existingClaim }}
+        {{- if and .Values.persistence.enabled .Values.persistence.existingClaim }}
         - name: {{ $fullName }}
           persistentVolumeClaim:
             {{- with .Values.persistence.existingClaim }}
             claimName: {{ tpl . $ }}
             {{- end }}
-<<<<<<< HEAD
-        {{- if .Values.extraVolumes }}{{- toYaml .Values.extraVolumes | nindent 8 }}{{ end }}
-      {{- else }}
-      volumes:
-        - name: {{ $fullName }}
-          emptyDir: {}
-        {{- if .Values.extraVolumes }}{{- toYaml .Values.extraVolumes | nindent 8 }}{{ end }}
-      {{- end }}
-      {{- else }}
-      volumes:
+        {{- else if not .Values.persistence.enabled }}
         - name: {{ $fullName }}
           emptyDir: {}
+        {{- end }}
         {{- if .Values.extraVolumes }}{{- toYaml .Values.extraVolumes | nindent 8 }}{{ end }}
-=======
-        {{ end }}
-        {{ if .Values.extraVolumes -}}{{- toYaml .Values.extraVolumes | nindent 8 }}{{ end }}
->>>>>>> 0b8ed0f (Fix #66: mount sockets into a temporary directory)
-      {{- end }}
   {{- if and .Values.persistence.enabled (not .Values.persistence.existingClaim) }}
   volumeClaimTemplates:
     - metadata: