Merge pull request #91 from convox/taint-variables

Don't apply match all toleration if specifying custom ones
DrFaust92 · Nov 20, 2022 · ad4d76c · ad4d76c
2 parents 87543de + 48f5650
commit ad4d76c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/controller.tf b/controller.tf
@@ -33,12 +33,8 @@ resource "kubernetes_deployment" "ebs_csi_controller" {
         automount_service_account_token = true
         priority_class_name             = "system-cluster-critical"
 
-        toleration {
-          operator = "Exists"
-        }
-
         dynamic "toleration" {
-          for_each = var.csi_controller_tolerations
+          for_each = length(var.csi_controller_tolerations) > 0 ? var.csi_controller_tolerations : [{ operator = "Exists" }]
           content {
             key                = lookup(toleration.value, "key", null)
             operator           = lookup(toleration.value, "operator", null)

diff --git a/node.tf b/node.tf
@@ -53,12 +53,8 @@ resource "kubernetes_daemonset" "node" {
         automount_service_account_token = true
         priority_class_name             = "system-node-critical"
 
-        toleration {
-          operator = "Exists"
-        }
-
         dynamic "toleration" {
-          for_each = var.node_tolerations
+          for_each = length(var.node_tolerations) > 0 ? var.csi_controller_tolerations : [{ operator = "Exists" }]
           content {
             key                = lookup(toleration.value, "key", null)
             operator           = lookup(toleration.value, "operator", null)