Merge branch 'docker-mailserver:master' into extra-deploy

Author: gulecroc

charts/docker-mailserver/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: "13.3.1"
 description: A fullstack but simple mailserver (smtp, imap, antispam, antivirus, ssl...) using Docker.
 name: docker-mailserver
-version: 3.0.10
+version: 3.0.12
 sources:
 - https://github.com/docker-mailserver/docker-mailserver-helm
 maintainers:

charts/docker-mailserver/templates/deployment.yaml

@@ -32,13 +32,19 @@ spec:
 {{ toYaml .Values.deployment.annotations | indent 8 }}
         {{ end }}
     spec:
+      {{- if .Values.deployment.affinity }}
+      affinity: {{- toYaml .Values.deployment.affinity | nindent 8 }}
+      {{ end }}
       nodeSelector: {{- toYaml .Values.deployment.nodeSelector | nindent 8 }}
       runtimeClassName: {{ .Values.deployment.runtimeClassName }}
       priorityClassName: {{ .Values.deployment.priorityClassName }}
       restartPolicy: "Always"
       serviceAccountName: {{ template "dockermailserver.serviceAccountName" . }}
       securityContext:
 {{ toYaml .Values.securityContext | indent 8 }}
+      {{- if .Values.deployment.tolerations }}
+      tolerations: {{- toYaml .Values.deployment.tolerations | nindent 8 }}
+      {{ end }}
       volumes:
           # ConfigMaps
       {{- range $name, $config := .Values.configMaps }}

charts/docker-mailserver/values.yaml

@@ -25,6 +25,9 @@ deployment:
   ## How many versions of the deployment to run
   replicas: 1
 
+  ## Optionally specify affinity for the deployment
+  affinity: {}
+
   ## Optionally add additional annotations to the deployment
   annotations: {}  
 
@@ -264,6 +267,9 @@ deployment:
       ## it may terminated.
       memory: "2048Mi"
       ephemeral-storage: "500Mi"
+  
+  ## Optionally specify tolerations for the deployment
+  tolerations: []
 
 service:
   ## What scope the service should be exposed in. One of: