Merge pull request #526 from risinger/respecify-toleration

Chart option to disable default toleration of all taints
kubernetes-sigs · Nov 25, 2020 · 14874af · 14874af
2 parents edc2926 + 2266146
commit 14874af
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/aws-ebs-csi-driver/templates/controller.yaml b/aws-ebs-csi-driver/templates/controller.yaml
@@ -32,10 +32,12 @@ spec:
       affinity: {{ toYaml . | nindent 8 }}
       {{- end }}
       tolerations:
+        {{- if .Values.tolerateAllTaints }}
         - operator: Exists
-      {{- with .Values.tolerations }}
+        {{- end }}
+        {{- with .Values.tolerations }}
 {{ toYaml . | indent 8 }}
-      {{- end }}
+        {{- end }}
       containers:
         - name: ebs-plugin
           image: {{ .Values.image.repository }}:{{ .Values.image.tag }}

diff --git a/aws-ebs-csi-driver/templates/node.yaml b/aws-ebs-csi-driver/templates/node.yaml
@@ -34,7 +34,9 @@ spec:
       hostNetwork: true
       priorityClassName: system-node-critical
       tolerations:
+        {{- if .Values.node.tolerateAllTaints }}
         - operator: Exists
+        {{- end }}
         {{- with .Values.node.tolerations }}
 {{ toYaml . | indent 8 }}
         {{- end }}

diff --git a/aws-ebs-csi-driver/values.yaml b/aws-ebs-csi-driver/values.yaml
@@ -58,6 +58,7 @@ resources: {}
 
 nodeSelector: {}
 
+tolerateAllTaints: true
 tolerations: []
 
 affinity: {}
@@ -83,6 +84,7 @@ region: ""
 
 node:
   podAnnotations: {}
+  tolerateAllTaints: true
   tolerations: []
 
 serviceAccount: