fix: add node_selector field for fluent-bit pods

aneoconsulting · Oct 30, 2024 · d619361 · d619361
1 parent bed36ed
commit d619361
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 25 deletions.
diff --git a/monitoring/onpremise/exporters/node-exporter/README.md b/monitoring/onpremise/exporters/node-exporter/README.md
@@ -10,7 +10,7 @@
 
 | Name | Version |
 |------|---------|
-| <a name="provider_kubernetes"></a> [kubernetes](#provider\_kubernetes) | 2.26.0 |
+| <a name="provider_kubernetes"></a> [kubernetes](#provider\_kubernetes) | >= 2.21.1 |
 
 ## Modules
 

diff --git a/monitoring/onpremise/exporters/node-exporter/locals.tf b/monitoring/onpremise/exporters/node-exporter/locals.tf
diff --git a/monitoring/onpremise/exporters/node-exporter/main.tf b/monitoring/onpremise/exporters/node-exporter/main.tf
@@ -32,18 +32,13 @@ resource "kubernetes_daemonset" "node_exporter" {
         }
       }
       spec {
-        node_selector = local.node_exporter_node_selector
+        node_selector = var.node_selector
         dynamic "toleration" {
-          for_each = (var.node_selector != {} ? [
-            for index in range(0, length(local.node_selector_keys)) : {
-              key   = local.node_selector_keys[index]
-              value = local.node_selector_values[index]
-            }
-          ] : [])
+          for_each = var.node_selector != {} ? var.node_selector : {}
           content {
-            key      = toleration.value.key
+            key      = toleration.key
             operator = "Equal"
-            value    = toleration.value.value
+            value    = toleration.value
             effect   = "NoSchedule"
           }
         }

diff --git a/monitoring/onpremise/fluent-bit/locals.tf b/monitoring/onpremise/fluent-bit/locals.tf
@@ -14,8 +14,6 @@ locals {
   fluent_bit_image_pull_secrets                 = try(var.fluent_bit.image_pull_secrets, "")
   fluent_bit_var_lib_docker_containers_hostpath = try(var.fluent_bit.var_lib_docker_containers_hostpath, "/var/lib/docker/containers")
   fluent_bit_run_log_journal_hostpath           = try(var.fluent_bit.run_log_journal_hostpath, "/run/log/journal")
-  fluent_bit_node_selector_keys                 = keys(var.node_selector)
-  fluent_bit_node_selector_values               = values(var.node_selector)
 
   # Seq
   seq_host    = try(var.seq.host, "")

diff --git a/monitoring/onpremise/fluent-bit/main.tf b/monitoring/onpremise/fluent-bit/main.tf
@@ -24,17 +24,13 @@ resource "kubernetes_daemonset" "fluent_bit" {
         }
       }
       spec {
+        node_selector = var.node_selector
         dynamic "toleration" {
-          for_each = (var.node_selector != {} ? [
-            for index in range(0, length(local.fluent_bit_node_selector_keys)) : {
-              key   = local.fluent_bit_node_selector_keys[index]
-              value = local.fluent_bit_node_selector_values[index]
-            }
-          ] : [])
+          for_each = var.node_selector != {} ? var.node_selector : {}
           content {
-            key      = toleration.value.key
+            key      = toleration.key
             operator = "Equal"
-            value    = toleration.value.value
+            value    = toleration.value
             effect   = "NoSchedule"
           }
         }