Fix node labels/taints

kubespray-inventory-setup.sh

@@ -33,7 +33,7 @@ function create_inventory_file()
 
   # add labels and taints
   printenv MASTER_NODES_JSON INFRA_NODES_JSON APP_NODES_JSON \
-  | jq -s '.[] | .[] | {(.hostname // .address):{node_taints: .taints, node_labels: .labels}}' \
+  | jq -s '.[] | .[] | {(.hostname // .address):{node_taints: .node_taints, node_labels: .node_labels}}' \
   | jq -s add \
   | jq '{all:{hosts:.,vars:{kube_version:"'$KUBE_VERSION'"}}}' \
   | yq e -P - \

locals.tf

@@ -1,29 +1,32 @@
 locals {
   kubeconfig_filename = abspath(pathexpand(var.kubeconfig_filename))
 
-  master_nodes = [for i, node in var.master_nodes : merge({
-    node_type : "master"
-    hostname : "master-${i}"
-    disks : {}
-    labels : var.default_master_node_labels
-    taints : var.default_master_node_taints
-  }, node)]
+  master_nodes = [for i, node in var.master_nodes : {
+    node_type : try(node.node_type, "master")
+    hostname : try(node.hostname, "")
+    address : try(node.address, "")
+    disks : try(node.disks, {})
+    node_labels : merge(var.default_master_node_labels, try(node.node_labels, {}))
+    node_taints : toset(concat(var.default_master_node_taints, try(node.node_taints, [])))
+  }]
 
-  infra_nodes = [for i, node in var.infra_nodes : merge({
-    node_type : "worker"
-    hostname : "infra-${i}"
-    disks : {}
-    labels : var.default_infra_node_labels
-    taints : var.default_infra_node_taints
-  }, node)]
+  infra_nodes = [for i, node in var.infra_nodes : {
+    node_type : try(node.node_type, "infra")
+    hostname : try(node.hostname, "")
+    address : try(node.address, "")
+    disks : try(node.disks, {})
+    node_labels : merge(var.default_infra_node_labels, try(node.node_labels, {}))
+    node_taints : toset(concat(var.default_infra_node_taints, try(node.node_taints, [])))
+  }]
 
-  app_nodes = [for i, node in var.app_nodes : merge({
-    node_type : "worker"
-    hostname : "app-${i}"
-    disks : {}
-    labels : var.default_app_node_labels
-    taints : var.default_app_node_taints
-  }, node)]
+  app_nodes = [for i, node in var.app_nodes : {
+    node_type : try(node.node_type, "worker")
+    hostname : try(node.hostname, "")
+    address : try(node.address, "")
+    disks : try(node.disks, {})
+    node_labels : merge(var.default_app_node_labels, try(node.node_labels, {}))
+    node_taints : toset(concat(var.default_app_node_taints, try(node.node_taints, [])))
+  }]
 
   all_nodes = concat(local.master_nodes, local.infra_nodes, local.app_nodes)