Merge pull request #4 from adamrushuk/fix-nodepool-version

Fixed nodepool version
adamrushuk · Sep 27, 2021 · 8d37782 · 8d37782
2 parents 3c1ac9e + a32bcb4
commit 8d37782
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 20 deletions.
diff --git a/main.tf b/main.tf
@@ -50,17 +50,18 @@ resource "azurerm_kubernetes_cluster" "aks" {
   sku_tier            = var.sla_sku
 
   default_node_pool {
-    name                = local.default_node_pool.name
-    node_count          = local.default_node_pool.count
-    vm_size             = local.default_node_pool.vm_size
-    availability_zones  = local.default_node_pool.availability_zones
-    enable_auto_scaling = local.default_node_pool.enable_auto_scaling
-    min_count           = local.default_node_pool.min_count
-    max_count           = local.default_node_pool.max_count
-    max_pods            = local.default_node_pool.max_pods
-    os_disk_size_gb     = local.default_node_pool.os_disk_size_gb
-    type                = local.default_node_pool.type
-    node_taints         = local.default_node_pool.node_taints
+    name                 = local.default_node_pool.name
+    orchestrator_version = local.default_node_pool.orchestrator_version
+    vm_size              = local.default_node_pool.vm_size
+    node_count           = local.default_node_pool.count
+    availability_zones   = local.default_node_pool.availability_zones
+    enable_auto_scaling  = local.default_node_pool.enable_auto_scaling
+    min_count            = local.default_node_pool.min_count
+    max_count            = local.default_node_pool.max_count
+    max_pods             = local.default_node_pool.max_pods
+    os_disk_size_gb      = local.default_node_pool.os_disk_size_gb
+    type                 = local.default_node_pool.type
+    node_taints          = local.default_node_pool.node_taints
     # TODO: add custom vnet support
     # vnet_subnet_id      = local.default_node_pool.vnet_subnet_id
   }
@@ -105,12 +106,6 @@ resource "azurerm_kubernetes_cluster" "aks" {
       enabled = var.azure_policy_enabled
     }
 
-    # cannot remove this deprecated block yet, due to this issue:
-    # https://github.com/terraform-providers/terraform-provider-azurerm/issues/7716
-    kube_dashboard {
-      enabled = false
-    }
-
     oms_agent {
       enabled                    = var.log_analytics_workspace_id != "" ? true : false
       log_analytics_workspace_id = var.log_analytics_workspace_id != "" ? var.log_analytics_workspace_id : null

diff --git a/test/main.tf b/test/main.tf
@@ -35,8 +35,9 @@ module "aks" {
 
   # override defaults
   default_node_pool = {
-    count    = 1
-    max_pods = 99
+    count                = 1
+    max_pods             = 99
+    orchestrator_version = local.kubernetes_version
   }
 
   # Add existing "AKS-Admins" group to the new AKS cluster admin group

diff --git a/test/versions.tf b/test/versions.tf
@@ -5,7 +5,7 @@ terraform {
     # https://github.com/terraform-providers/terraform-provider-azurerm/releases
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "2.76.0"
+      version = "2.78.0"
     }
   }
 }