add toleration time to NoExecute effect

kubernetes-sigs · Mar 4, 2021 · 089e34b · 089e34b
1 parent f013880
commit 089e34b
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 2 deletions.
diff --git a/charts/aws-ebs-csi-driver/Chart.yaml b/charts/aws-ebs-csi-driver/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "0.9.0"
 name: aws-ebs-csi-driver
 description: A Helm chart for AWS EBS CSI Driver
-version: 0.9.13
+version: 0.9.14
 kubeVersion: ">=1.17.0-0"
 home: https://github.com/kubernetes-sigs/aws-ebs-csi-driver
 sources:

diff --git a/charts/aws-ebs-csi-driver/templates/controller.yaml b/charts/aws-ebs-csi-driver/templates/controller.yaml
@@ -34,6 +34,13 @@ spec:
         {{- if .Values.tolerateAllTaints }}
         - operator: Exists
         {{- end }}
+        {{ - if .Values.tolerateAllTaintsWithTolerationSeconds }}
+        - operator: Exists
+          effect: NoSchedule
+        - operator: Exists
+          effect: NoExecute
+          tolerationSeconds: 300
+        {{ - end }}
         {{- with .Values.tolerations }}
 {{ toYaml . | indent 8 }}
         {{- end }}

diff --git a/charts/aws-ebs-csi-driver/templates/node.yaml b/charts/aws-ebs-csi-driver/templates/node.yaml
@@ -40,6 +40,13 @@ spec:
         {{- if .Values.node.tolerateAllTaints }}
         - operator: Exists
         {{- end }}
+        {{ - if .Values.tolerateAllTaintsWithTolerationSeconds }}
+        - operator: Exists
+          effect: NoSchedule
+        - operator: Exists
+          effect: NoExecute
+          tolerationSeconds: 300
+        {{ - end }}
         {{- with .Values.node.tolerations }}
 {{ toYaml . | indent 8 }}
         {{- end }}

diff --git a/charts/aws-ebs-csi-driver/values.yaml b/charts/aws-ebs-csi-driver/values.yaml
@@ -70,7 +70,8 @@ resources:
 
 priorityClassName: ""
 nodeSelector: {}
-tolerateAllTaints: true
+tolerateAllTaints: false
+tolerateAllTaintsWithTolerationSeconds: true
 tolerations: []
 affinity: {}
 

diff --git a/deploy/kubernetes/base/controller.yaml b/deploy/kubernetes/base/controller.yaml
@@ -26,6 +26,10 @@ spec:
       priorityClassName: system-cluster-critical
       tolerations:
         - operator: Exists
+          effect: NoSchedule
+        - operator: Exists
+          effect: NoExecute
+          tolerationSeconds: 300
       containers:
         - name: ebs-plugin
           image: k8s.gcr.io/provider-aws/aws-ebs-csi-driver:v0.9.0

diff --git a/deploy/kubernetes/base/node.yaml b/deploy/kubernetes/base/node.yaml
@@ -35,6 +35,10 @@ spec:
       priorityClassName: system-node-critical
       tolerations:
         - operator: Exists
+          effect: NoSchedule
+        - operator: Exists
+          effect: NoExecute
+          tolerationSeconds: 300
       containers:
         - name: ebs-plugin
           securityContext: