From 006f5e722dfeb592f12ecf5c157fda6e49aa55b3 Mon Sep 17 00:00:00 2001
From: Philippe Caseiro <pcaseiro@cadoles.com>
Date: Fri, 3 Mar 2023 11:07:10 +0100
Subject: [PATCH] to merge with previous commit on main

---
 bare-metal/flatcar-linux/kubernetes/variables.tf         | 4 ++--
 .../flatcar-linux/kubernetes/worker/butane/worker.yaml   | 2 +-
 bare-metal/flatcar-linux/kubernetes/worker/variables.tf  | 9 +++++++++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/bare-metal/flatcar-linux/kubernetes/variables.tf b/bare-metal/flatcar-linux/kubernetes/variables.tf
index f13ada35..40458009 100644
--- a/bare-metal/flatcar-linux/kubernetes/variables.tf
+++ b/bare-metal/flatcar-linux/kubernetes/variables.tf
@@ -74,10 +74,10 @@ variable "worker_node_taints" {
 }
 
 variable "worker_bind_devices" {
-  type        = list(object({
+  type        = map(list(object({
     source = string
     target = string
-  }))
+  })))
   description = <<EOD
   List of devices to bind on kubelet container for direct storage usage
   [
diff --git a/bare-metal/flatcar-linux/kubernetes/worker/butane/worker.yaml b/bare-metal/flatcar-linux/kubernetes/worker/butane/worker.yaml
index 185a7b4d..cd712d21 100644
--- a/bare-metal/flatcar-linux/kubernetes/worker/butane/worker.yaml
+++ b/bare-metal/flatcar-linux/kubernetes/worker/butane/worker.yaml
@@ -77,7 +77,7 @@ systemd:
           --register-with-taints=${taint} \
           %{~ endfor ~}
           --node-labels=node.kubernetes.io/node
-          %{~ for device in compact(split(",", node_devices)) ~}
+          %{~ for device in node_devices ~}
           --device=${device.source}:${device.target}
           %{~ endfor ~}
         ExecStart=docker logs -f kubelet
diff --git a/bare-metal/flatcar-linux/kubernetes/worker/variables.tf b/bare-metal/flatcar-linux/kubernetes/worker/variables.tf
index 2293ea90..126531e1 100644
--- a/bare-metal/flatcar-linux/kubernetes/worker/variables.tf
+++ b/bare-metal/flatcar-linux/kubernetes/worker/variables.tf
@@ -72,6 +72,15 @@ variable "node_taints" {
   default     = []
 }
 
+variable "node_devices" {
+  type        = list(object({
+    source = string
+    target = string
+  }))
+  description = "List of devices object to bind with --device option"
+  default     = []
+}
+
 # optional
 
 variable "download_protocol" {