From a724307db141c690f9e03478d614dfa03baec60d Mon Sep 17 00:00:00 2001 From: Xiang Li Date: Thu, 4 Mar 2021 16:34:57 -0800 Subject: [PATCH] add toleration time to NoExecute effect --- charts/aws-ebs-csi-driver/Chart.yaml | 2 +- charts/aws-ebs-csi-driver/templates/controller.yaml | 6 ++++++ charts/aws-ebs-csi-driver/templates/node.yaml | 6 ++++++ deploy/kubernetes/base/controller.yaml | 4 ++++ deploy/kubernetes/base/node.yaml | 4 ++++ docs/README.md | 2 ++ 6 files changed, 23 insertions(+), 1 deletion(-) diff --git a/charts/aws-ebs-csi-driver/Chart.yaml b/charts/aws-ebs-csi-driver/Chart.yaml index 65ed462d5f..e2a26cd9ba 100644 --- 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 index 1e3dcf3ee3..835a5eea5f 100644 --- a/charts/aws-ebs-csi-driver/templates/controller.yaml +++ b/charts/aws-ebs-csi-driver/templates/controller.yaml @@ -33,6 +33,12 @@ spec: tolerations: {{- if .Values.tolerateAllTaints }} - operator: Exists + {{- else }} + - key: CriticalAddonsOnly + operator: Exists + - operator: Exists + effect: NoExecute + tolerationSeconds: 300 {{- end }} {{- with .Values.tolerations }} {{ toYaml . | indent 8 }} diff --git a/charts/aws-ebs-csi-driver/templates/node.yaml b/charts/aws-ebs-csi-driver/templates/node.yaml index bf9c6e0111..e6de913d4b 100644 --- a/charts/aws-ebs-csi-driver/templates/node.yaml +++ b/charts/aws-ebs-csi-driver/templates/node.yaml @@ -39,6 +39,12 @@ spec: tolerations: {{- if .Values.node.tolerateAllTaints }} - operator: Exists + {{- else }} + - key: CriticalAddonsOnly + operator: Exists + - operator: Exists + effect: NoExecute + tolerationSeconds: 300 {{- end }} {{- with .Values.node.tolerations }} {{ toYaml . | indent 8 }} diff --git a/deploy/kubernetes/base/controller.yaml b/deploy/kubernetes/base/controller.yaml index 193e3b4898..ac911e049b 100644 --- a/deploy/kubernetes/base/controller.yaml +++ b/deploy/kubernetes/base/controller.yaml @@ -25,7 +25,11 @@ spec: serviceAccountName: ebs-csi-controller-sa priorityClassName: system-cluster-critical tolerations: + - key: CriticalAddonsOnly + operator: Exists - 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 index bc00d3f7bb..769fc2abb9 100644 --- a/deploy/kubernetes/base/node.yaml +++ b/deploy/kubernetes/base/node.yaml @@ -34,7 +34,11 @@ spec: serviceAccountName: ebs-csi-node-sa priorityClassName: system-node-critical tolerations: + - key: CriticalAddonsOnly + operator: Exists - operator: Exists + effect: NoExecute + tolerationSeconds: 300 containers: - name: ebs-plugin securityContext: diff --git a/docs/README.md b/docs/README.md index 6f5a62fc0e..80746f9615 100644 --- a/docs/README.md +++ b/docs/README.md @@ -110,6 +110,8 @@ If your cluster is v1.14+, you can skip this step. Install the `CSINodeInfo` CRD ```sh kubectl create -f https://raw.githubusercontent.com/kubernetes/csi-api/release-1.13/pkg/crd/manifests/csinodeinfo.yaml ``` +#### Config node toleration settings +By default, driver can be deployed on any nodes, to have driver tolerate taint `CriticalAddonsOnly`, please set helm `Value.node.tolerateAllTaints` and `Value.tolerateAllTaints` to false before deployment #### Deploy driver Please see the compatibility matrix above before you deploy the driver