From b4768d50b48ca2672847de3b8b144246ae3d141d Mon Sep 17 00:00:00 2001 From: nellyk <3062772+nellyk@users.noreply.github.com> Date: Tue, 1 Oct 2024 15:51:48 +0100 Subject: [PATCH] align node pool variables --- examples/with_availability_zone/README.md | 3 +++ examples/with_availability_zone/main.tf | 5 ++++- locals.tf | 2 ++ main.tf | 3 +++ 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/examples/with_availability_zone/README.md b/examples/with_availability_zone/README.md index e04074d..b93209d 100644 --- a/examples/with_availability_zone/README.md +++ b/examples/with_availability_zone/README.md @@ -67,6 +67,7 @@ module "test" { min_count = 2 os_sku = "Ubuntu" mode = "User" + os_disk_size_gb = 128 }, ingress = { name = "ingress" @@ -76,6 +77,8 @@ module "test" { min_count = 2 os_sku = "Ubuntu" mode = "User" + os_disk_size_gb = 128 + } } } diff --git a/examples/with_availability_zone/main.tf b/examples/with_availability_zone/main.tf index e5636d1..650f9d6 100644 --- a/examples/with_availability_zone/main.tf +++ b/examples/with_availability_zone/main.tf @@ -61,6 +61,7 @@ module "test" { min_count = 2 os_sku = "Ubuntu" mode = "User" + os_disk_size_gb = 128 }, ingress = { name = "ingress" @@ -70,6 +71,8 @@ module "test" { min_count = 2 os_sku = "Ubuntu" mode = "User" + os_disk_size_gb = 128 + } } -} +} \ No newline at end of file diff --git a/locals.tf b/locals.tf index 9350d14..99a0b57 100644 --- a/locals.tf +++ b/locals.tf @@ -39,6 +39,8 @@ locals { max_count = pool.max_count min_count = pool.min_count os_sku = pool.os_sku + mode = pool.mode + os_disk_size_gb = pool.os_disk_size_gb zone = zone } ] diff --git a/main.tf b/main.tf index add2c96..551c994 100644 --- a/main.tf +++ b/main.tf @@ -76,6 +76,7 @@ resource "azurerm_kubernetes_cluster" "this" { ## Resources that only support UserAssigned dynamic "identity" { for_each = local.managed_identities.user_assigned + content { type = identity.value.type identity_ids = identity.value.user_assigned_resource_ids @@ -236,7 +237,9 @@ resource "azurerm_kubernetes_cluster_node_pool" "this" { enable_auto_scaling = true max_count = each.value.max_count min_count = each.value.min_count + mode = each.value.mode orchestrator_version = each.value.orchestrator_version + os_disk_size_gb = each.value.os_disk_size_gb os_sku = each.value.os_sku tags = var.tags vnet_subnet_id = module.avm_res_network_virtualnetwork.subnets["subnet"].resource_id