Merge branch 'master' into tolerations

Author: cfis

charts/docker-mailserver/templates/deployment.yaml

@@ -32,6 +32,9 @@ 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 }}

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: {}