Merge branch 'master' into master

Author: Elbandi

charts/portainer/Chart.yaml

@@ -17,7 +17,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 
-version: 1.0.57
+version: 1.0.58
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.

charts/portainer/templates/deployment.yaml

@@ -18,7 +18,8 @@ spec:
       labels:
         {{- include "portainer.selectorLabels" . | nindent 8 }}
     spec:
-      nodeSelector: {{- toYaml .Values.nodeSelector | nindent 8 -}}
+      nodeSelector: {{- toYaml .Values.nodeSelector | nindent 8 }}
+      tolerations: {{- toYaml .Values.tolerations | nindent 8 -}}
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}

charts/portainer/values.yaml

@@ -20,6 +20,7 @@ image:
 imagePullSecrets: []
 
 nodeSelector: {}
+tolerations: []
 
 serviceAccount:
   annotations: {}