review comments

README.md

@@ -331,7 +331,7 @@ Description: This is the full output for the resource.
 
 ## Modules
 
-The following Modules are called:
+The following modules are called:
 
 ### <a name="module_regions"></a> [regions](#module\_regions)
 

examples/with_region_having_availability_zone/README.md → examples/with_availability_zone/README.md

@@ -1,5 +1,5 @@
 <!-- BEGIN_TF_DOCS -->
-# AKS cluster with region having availability zone
+# AKS cluster with the region having availability zone
 
 This deploys the module with a region that has availability zones.
 

examples/with_region_having_availability_zone/main.tf → examples/with_availability_zone/main.tf

@@ -12,14 +12,6 @@ provider "azurerm" {
   features {}
 }
 
-
-## Section to provide a random Azure region for the resource group
-# This allows us to randomize the region for the resource group.
-module "regions" {
-  source  = "Azure/regions/azurerm"
-  version = ">= 0.3.0"
-}
-
 # This ensures we have unique CAF compliant names for our resources.
 module "naming" {
   source  = "Azure/naming/azurerm"

examples/with_region_having_no_availability_zone/README.md → examples/without_availability_zone/README.md

@@ -1,5 +1,5 @@
 <!-- BEGIN_TF_DOCS -->
-# AKS cluster with region having  no availability zone
+# AKS cluster with region having no availability zone
 
 This deploys the module with a region that has no availability zones.
 

examples/with_region_having_no_availability_zone/_header.md → examples/without_availability_zone/_header.md

@@ -1,3 +1,3 @@
-# AKS cluster with region having  no availability zone
+# AKS cluster without availability zones
 
 This deploys the module with a region that has no availability zones.

examples/with_region_having_no_availability_zone/main.tf → examples/without_availability_zone/main.tf

@@ -12,14 +12,6 @@ provider "azurerm" {
   features {}
 }
 
-
-## Section to provide a random Azure region for the resource group
-# This allows us to randomize the region for the resource group.
-module "regions" {
-  source  = "Azure/regions/azurerm"
-  version = ">= 0.3.0"
-}
-
 # This ensures we have unique CAF compliant names for our resources.
 module "naming" {
   source  = "Azure/naming/azurerm"

locals.tf

@@ -15,4 +15,14 @@ locals {
       }
     ]
   ]) : "${assoc.pe_key}-${assoc.asg_key}" => assoc }
-}
+}
+
+
+# check if zone is available and return the zone if it is available
+locals {
+# zones = try(formatlist("%s", module.regions.regions_by_name[var.location == null ? local.resource_group_location : var.location].zones[(tonumber(count.index) - 1)]), null) 
+ # remove the count and use something else for index
+  zones = try(formatlist("%s", module.regions.regions_by_name[var.location == null ? local.resource_group_location : var.location].zones), null)
+
+}
+

main.tf

@@ -64,19 +64,19 @@ resource "azurerm_management_lock" "this" {
 }
 
 resource "azurerm_kubernetes_cluster_node_pool" "this" {
-  # set max nodepools created to 3
-  for_each = var.node_pools
-
+  # if the region has zone create a node pool per zone
+  # if the region does not have zone create a single node pool with the zone as null
+  count                 = var.node_pools != null ? length(var.node_pools) == 1 ? 3 : length(var.node_pools) : 0
   kubernetes_cluster_id = azurerm_kubernetes_cluster.this.id
-  name                  = "userpool${each.key}"
-  vm_size               = each.value.vm_size
+  name                  = count.index
+  vm_size               = var.node_pools[count.index].vm_size
   enable_auto_scaling   = true
-  max_count             = each.value.max_count
-  min_count             = each.value.min_count
-  node_count            = each.value.node_count
-  os_sku                = each.value.os_sku
+  max_count             = var.node_pools[count.index].max_count
+  min_count             = var.node_pools[count.index].min_count
+  node_count            = var.node_pools[count.index].node_count
+  os_sku                = var.node_pools[count.index].os_sku
   tags                  = var.tags
-  zones                 = try(formatlist("%s", module.regions.regions_by_name[var.location == null ? local.resource_group_location : var.location].zones[(tonumber(each.key) - 1)]), null)
+  zones                 = local.zones[count.index]
 }
 resource "azurerm_role_assignment" "this" {
   for_each = var.role_assignments

variables.tf

@@ -117,32 +117,9 @@ variable "node_pools" {
       node_count          = 2
       os_sku              = "Ubuntu"
       mode                = "User"
-    },
-    "2" = {
-      vm_size             = "Standard_D4d_v5"
-      enable_auto_scaling = true
-      max_count           = 110
-      min_count           = 2
-      node_count          = 2
-      os_sku              = "Ubuntu"
-      mode                = "User"
-    },
-    "3" = {
-      vm_size             = "Standard_D4d_v5"
-      enable_auto_scaling = true
-      max_count           = 110
-      min_count           = 2
-      node_count          = 2
-      os_sku              = "Ubuntu"
-      mode                = "User"
     }
   }
   description = "The node pools to create on the Kubernetes Cluster."
-
-  validation {
-    condition     = var.node_pools != null && length((var.node_pools)) >= 3
-    error_message = "The minimum number of user node pools recommended to users to create is 3"
-  }
 }
 
 variable "private_endpoints" {