From dc2f079da6ec608ebe750a75c9e32fb66e381ad7 Mon Sep 17 00:00:00 2001
From: Maxence 'Linutux' POULAIN <linutux42@users.noreply.github.com>
Date: Thu, 13 Oct 2022 13:34:54 +0200
Subject: [PATCH] refactor: Move the default controller tolerations in the helm
 chart values

---
 charts/aws-ebs-csi-driver/templates/controller.yaml | 5 -----
 charts/aws-ebs-csi-driver/values.yaml               | 7 ++++++-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/charts/aws-ebs-csi-driver/templates/controller.yaml b/charts/aws-ebs-csi-driver/templates/controller.yaml
index e541c23d79..147d9da906 100644
--- a/charts/aws-ebs-csi-driver/templates/controller.yaml
+++ b/charts/aws-ebs-csi-driver/templates/controller.yaml
@@ -41,11 +41,6 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       tolerations:
-        - key: CriticalAddonsOnly
-          operator: Exists
-        - operator: Exists
-          effect: NoExecute
-          tolerationSeconds: 300
         {{- with .Values.controller.tolerations }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
diff --git a/charts/aws-ebs-csi-driver/values.yaml b/charts/aws-ebs-csi-driver/values.yaml
index bbc143f78f..6fde5127b3 100644
--- a/charts/aws-ebs-csi-driver/values.yaml
+++ b/charts/aws-ebs-csi-driver/values.yaml
@@ -186,7 +186,12 @@ controller:
     create: true # A service account will be created for you if set to true. Set to false if you want to use your own.
     name: ebs-csi-controller-sa # Name of the service-account to be used/created.
     annotations: {}
-  tolerations: []
+  tolerations:
+    - key: CriticalAddonsOnly
+      operator: Exists
+    - operator: Exists
+      effect: NoExecute
+      tolerationSeconds: 300
   # TSCs without the label selector stanza
   #
   # Example: