rollup to azurerm 3.0

Justin-DynamicD · Mar 25, 2022 · ff39bdc · ff39bdc
1 parent b677834
commit ff39bdc
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 14 deletions.
diff --git a/agw.tf b/agw.tf
@@ -6,7 +6,7 @@ resource "azurerm_public_ip" "main" {
   location            = local.global_settings.location
   allocation_method   = "Static"
   sku                 = "Standard"
-  availability_zone   = "Zone-Redundant"
+  zones               = local.zones != [] ? local.zones : null
   tags                = var.tags
 }
 

diff --git a/aks.tf b/aks.tf
@@ -40,12 +40,12 @@ resource "azurerm_kubernetes_cluster" "main" {
     os_disk_size_gb     = local.aks.os_disk_size_gb
     os_disk_type        = local.aks.os_disk_type
     vnet_subnet_id      = local.aks.subnet_id
-    availability_zones  = local.zones != [] ? local.zones : null
+    zones               = local.zones != [] ? local.zones : null
     tags                = local.tags
   }
   identity {
-    type                      = "UserAssigned"
-    user_assigned_identity_id = azurerm_user_assigned_identity.main.id
+    type         = "UserAssigned"
+    identity_ids = [azurerm_user_assigned_identity.main.id]
   }
   network_profile {
     network_plugin     = "azure"

diff --git a/identity.tf b/identity.tf
@@ -36,12 +36,12 @@ resource "azurerm_role_assignment" "agwaks" {
   count                = local.app_gateway.enabled ? 1 : 0
   scope                = azurerm_application_gateway.main[0].id
   role_definition_name = "Contributor"
-  principal_id         = azurerm_kubernetes_cluster.main.addon_profile[0].ingress_application_gateway[0].ingress_application_gateway_identity[0].object_id
+  principal_id         = azurerm_kubernetes_cluster.main.ingress_application_gateway[0].ingress_application_gateway_identity[0].object_id
 }
 
 resource "azurerm_role_assignment" "agwaksrg" {
   count                = local.app_gateway.enabled ? 1 : 0
   scope                = data.azurerm_resource_group.source.id
   role_definition_name = "Reader"
-  principal_id         = azurerm_kubernetes_cluster.main.addon_profile[0].ingress_application_gateway[0].ingress_application_gateway_identity[0].object_id
+  principal_id         = azurerm_kubernetes_cluster.main.ingress_application_gateway[0].ingress_application_gateway_identity[0].object_id
 }
diff --git a/main.tf b/main.tf
@@ -8,14 +8,14 @@ locals {
     automatic_channel_upgrade = ""
     azure_policy              = true
     docker_bridge_cidr        = "172.17.0.1/16"
-    max_count                 = 3
-    min_count                 = 1
+    max_count                 = 4
+    min_count                 = 3
     name                      = ""
-    node_count                = 2
-    os_disk_size_gb           = 128
+    node_count                = 3
+    os_disk_size_gb           = 70
     os_disk_type              = "Ephemeral"
     sku_tier                  = "Free"
-    vm_size                   = "Standard_DS3_v2"
+    vm_size                   = "Standard_D2ds_v5"
   })
   app_gateway = defaults(var.app_gateway, {
     enabled      = false
@@ -29,6 +29,17 @@ locals {
   global_settings = defaults(var.global_settings, {
     name_prefix = "aks-baseline"
   })
+  # node_pools = defaults(var.node_pools, {
+  #   {
+  #     enable_auto_scaling       = true
+  #     max_count                 = 4
+  #     min_count                 = 3
+  #     node_count                = 3
+  #     os_disk_size_gb           = 70
+  #     os_disk_type              = "Ephemeral"
+  #     vm_size                   = "Standard_D2ds_v5"
+  #   }
+  # })
   oms = defaults(var.oms, {
     enabled            = false
     storage_account_id = ""

diff --git a/test/main.tf b/test/main.tf
@@ -47,9 +47,7 @@ module "aks" {
     resource_group_name = azurerm_resource_group.test.name
   }
   aks = {
-    os_disk_size_gb = 70
     subnet_id       = module.myvnet.vnet_subnets["aks_nodes"].id
-    vm_size         = "Standard_D2ds_v5"
   }
   app_gateway = {
     enabled   = true

diff --git a/variables.tf b/variables.tf
@@ -43,6 +43,21 @@ variable aks {
   description = "map of all aks variables"
 }
 
+variable node_pools {
+  type = map(object({
+    vm_size = string
+    enable_auto_scaling = optional(bool)
+    max_count           = optional(number)
+    min_count           = optional(number)
+    node_count          = optional(number)
+    os_disk_size_gb     = optional(number)
+    os_disk_type        = optional(string)
+    vm_size             = optional(string)
+  }))
+  description = "map of node pools for aks to create"
+  default     = {}
+}
+
 variable oms {
   type = object({
     enabled              = optional(bool)

diff --git a/versions.tf b/versions.tf
@@ -5,7 +5,7 @@ terraform {
   required_version = ">= 1.0.0"
   experiments = [module_variable_optional_attrs]
   required_providers {
-    azurerm = ">= 2.90"
+    azurerm = ">= 3.0.1"
     #azuread = ">= 1.0.0"
   }
 }