incl. working for_each and adjusted variable admission plugins (strin…

…g instead of list of strings
isovalent · Jan 10, 2025 · f6ed844 · f6ed844
1 parent fa0ce4c
commit f6ed844
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 19 deletions.
diff --git a/00-variables.tf b/00-variables.tf
@@ -170,6 +170,6 @@ variable "config_patch_files" {
 
 variable "admission_plugins" {
   description = "List of admission plugins to enable"
-  type        = list(string)
-  default     = ["MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ServiceAccount"]
+  type        = string
+  default     = "MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ServiceAccount"
 }
diff --git a/03-talos.tf b/03-talos.tf
@@ -49,6 +49,8 @@ module "talos_worker_group" {
 resource "talos_machine_secrets" "this" {}
 
 data "talos_machine_configuration" "controlplane" {
+  for_each = { for index in range(var.controlplane_count) : index => index }
+
   cluster_name       = var.cluster_name
   cluster_endpoint   = "https://${module.elb_k8s_elb.elb_dns_name}"
   machine_type       = "controlplane"
@@ -59,6 +61,18 @@ data "talos_machine_configuration" "controlplane" {
     local.config_patches_common,
     [yamlencode(local.common_config_patch)],
     [yamlencode(local.config_cilium_patch)],
+    [yamlencode(
+                                {
+                                  machine = {
+                                    kubelet = {
+                                      extraArgs = {
+                                        hostname-override          = module.talos_control_plane_nodes[each.key].id
+                                      }
+                                    }
+                                  }
+                                }
+                              )
+                              ],
     [for path in var.control_plane.config_patch_files : file(path)]
   )
 }
@@ -83,7 +97,6 @@ data "talos_machine_configuration" "worker_group" {
                                       extraArgs = {
                                         hostname-override          = module.talos_worker_group[each.key].id
                                       }
-
                                     }
                                   }
                                 }
@@ -94,25 +107,13 @@ data "talos_machine_configuration" "worker_group" {
 }
 
 resource "talos_machine_configuration_apply" "controlplane" {
-  count = var.controlplane_count
+for_each = { for index, instance in module.talos_control_plane_nodes : index => instance }
   client_configuration        = talos_machine_secrets.this.client_configuration
-  machine_configuration_input = data.talos_machine_configuration.controlplane.machine_configuration
-  endpoint                    = module.talos_control_plane_nodes[count.index].public_ip
-  node                        = module.talos_control_plane_nodes[count.index].private_ip
+  machine_configuration_input = data.talos_machine_configuration.controlplane[each.key].machine_configuration
+  endpoint                    = module.talos_control_plane_nodes[each.key].public_ip
+  node                        = module.talos_control_plane_nodes[each.key].private_ip
 }
 
-# resource "talos_machine_configuration_apply" "controlplane" {
-# for_each = { for index, instance in module.talos_control_plane_nodes : index => instance }
-#   client_configuration        = talos_machine_secrets.this.client_configuration
-#   machine_configuration_input = data.talos_machine_configuration.controlplane[tonumber(each.key)].machine_configuration
-#   endpoint                    = module.talos_control_plane_nodes[tonumber(each.key)].public_ip
-#   node                        = module.talos_control_plane_nodes[tonumber(each.key)].private_ip
-# }
-# output "controlplane_apply" {
-#   value = talos_machine_configuration_apply.controlplane
-
-# }
-
 resource "talos_machine_configuration_apply" "worker_group" {
   for_each = merge([for info in var.worker_groups : { for index in range(0, var.workers_count) : "${info.name}.${index}" => info }]...)