Aks_cli to support node_labels and user AKS custom header for extra p…

…ools.
Azure · Feb 3, 2025 · f95f680 · f95f680
1 parent 66a2374
commit f95f680
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 0 deletions.
diff --git a/modules/terraform/azure/aks-cli/main.tf b/modules/terraform/azure/aks-cli/main.tf
@@ -121,6 +121,12 @@ resource "terraform_data" "aks_cli" {
       "--nodepool-name", var.aks_cli_config.default_node_pool.name,
       "--node-count", var.aks_cli_config.default_node_pool.node_count,
       "--node-vm-size", var.aks_cli_config.default_node_pool.vm_size,
+      length(var.aks_cli_config.default_node_pool.node_labels) == 0 ? "" : format("%s %s",
+        "--labels", join(" ", [
+          for label_name, label_value in var.aks_cli_config.default_node_pool.node_labels :
+          format("%s=%s", label_name, label_value)
+        ])
+      ),
       "--vm-set-type", var.aks_cli_config.default_node_pool.vm_set_type,
       local.optional_parameters,
       local.subnet_id_parameter,
@@ -159,6 +165,13 @@ resource "terraform_data" "aks_nodepool_cli" {
       "--nodepool-name", each.value.name,
       "--node-count", each.value.node_count,
       "--node-vm-size", each.value.vm_size,
+      local.aks_custom_headers_flags,
+      length(each.value.node_labels) == 0 ? "" : format("%s %s",
+        "--labels", join(" ", [
+          for label_name, label_value in each.value.node_labels :
+          format("%s=%s", label_name, label_value)
+        ])
+      ),
       "--vm-set-type", each.value.vm_set_type,
     ])
   }

diff --git a/modules/terraform/azure/aks-cli/variables.tf b/modules/terraform/azure/aks-cli/variables.tf
@@ -36,13 +36,15 @@ variable "aks_cli_config" {
       name        = string
       node_count  = number
       vm_size     = string
+      node_labels = optional(map(string), {})
       vm_set_type = optional(string, "VirtualMachineScaleSets")
     })
     extra_node_pool = optional(
       list(object({
         name        = string
         node_count  = number
         vm_size     = string
+        node_labels = optional(map(string), {})
         vm_set_type = optional(string, "VirtualMachineScaleSets")
     })), [])
     optional_parameters = optional(list(object({

diff --git a/modules/terraform/azure/variables.tf b/modules/terraform/azure/variables.tf
@@ -13,13 +13,15 @@ variable "json_input" {
       name        = string
       node_count  = number
       vm_size     = string
+      node_labels = optional(map(string), {})
       vm_set_type = string
     }))
     aks_cli_user_node_pool = optional(
       list(object({
         name        = string
         node_count  = number
         vm_size     = string
+        node_labels = optional(map(string), {})
         vm_set_type = string
       }))
     )
@@ -217,13 +219,15 @@ variable "aks_cli_config_list" {
       name        = string
       node_count  = number
       vm_size     = string
+      node_labels = optional(map(string), {})
       vm_set_type = optional(string, "VirtualMachineScaleSets")
     })
     extra_node_pool = optional(
       list(object({
         name        = string
         node_count  = number
         vm_size     = string
+        node_labels = optional(map(string), {})
         vm_set_type = optional(string, "VirtualMachineScaleSets")
     })), [])
     optional_parameters = optional(list(object({