Merge pull request #79 from kbst/aksdefaultnodepool

Aksdefaultnodepool

Author: pst

azurerm/_modules/aks/main.tf

@@ -12,12 +12,21 @@ resource "azurerm_kubernetes_cluster" "current" {
     enabled = true
   }
 
-  agent_pool_profile {
-    name            = var.agent_pool_profile_name
-    count           = var.agent_pool_profile_count
-    vm_size         = var.agent_pool_profile_vm_size
-    os_type         = var.agent_pool_profile_os_type
-    os_disk_size_gb = var.agent_pool_profile_os_disk_size_gb
+  default_node_pool {
+    name = var.default_node_pool_name
+    type = var.default_node_pool_type
+
+    enable_auto_scaling = var.default_node_pool_enable_auto_scaling
+
+    # set min and max count only if autoscaling is _enabled_
+    min_count = var.default_node_pool_enable_auto_scaling ? var.default_node_pool_min_count : null
+    max_count = var.default_node_pool_enable_auto_scaling ? var.default_node_pool_max_count : null
+
+    # set node count only if auto scaling is _disabled_
+    node_count = var.default_node_pool_enable_auto_scaling ? null : var.default_node_pool_node_count
+
+    vm_size         = var.default_node_pool_vm_size
+    os_disk_size_gb = var.default_node_pool_os_disk_size_gb
   }
 
   service_principal {
@@ -34,4 +43,3 @@ resource "azurerm_kubernetes_cluster" "current" {
 
   tags = var.metadata_labels
 }
-

azurerm/_modules/aks/variables.tf

@@ -29,33 +29,50 @@ variable "dns_prefix" {
   default     = "api"
 }
 
-variable "agent_pool_profile_name" {
+variable "default_node_pool_name" {
   type        = string
-  description = "Name of agent pool profile."
+  description = "Name of default node pool."
   default     = "default"
 }
 
-variable "agent_pool_profile_count" {
+variable "default_node_pool_type" {
   type        = string
-  description = "Number of worker nodes"
+  description = "Type of default node pool. Defaults to VirtualMachineScaleSets, use AvailabilitySet for backwards compatibility with older clusters."
+  default     = "VirtualMachineScaleSets"
+}
+
+variable "default_node_pool_enable_auto_scaling" {
+  type        = bool
+  description = "Wether to enable auto scaling for the default node pool. Defaults to true."
+  default     = true
+}
+
+variable "default_node_pool_min_count" {
+  type        = string
+  description = "Min number of worker nodes"
   default     = "1"
 }
 
-variable "agent_pool_profile_vm_size" {
+variable "default_node_pool_max_count" {
   type        = string
-  description = "VM size of worker nodes"
-  default     = "Standard_D1_v2"
+  description = "Max number of worker nodes"
+  default     = "1"
 }
 
-variable "agent_pool_profile_os_type" {
+variable "default_node_pool_node_count" {
   type        = string
-  description = "OS type of worker nodes"
-  default     = "Linux"
+  description = "Static number of worker nodes"
+  default     = "1"
 }
 
-variable "agent_pool_profile_os_disk_size_gb" {
+variable "default_node_pool_vm_size" {
+  type        = string
+  description = "VM size of worker nodes"
+  default     = "Standard_D1_v2"
+}
+
+variable "default_node_pool_os_disk_size_gb" {
   type        = string
   description = "Disk size of worker nodes (in GB)"
   default     = "30"
 }
-

azurerm/cluster/configuration.tf

@@ -16,14 +16,15 @@ locals {
 
   dns_prefix = lookup(local.cfg, "dns_prefix", "api")
 
-  agent_pool_profile_name = lookup(local.cfg, "agent_pool_profile_name", "default")
+  default_node_pool_name = lookup(local.cfg, "default_node_pool_name", "default")
+  default_node_pool_type = lookup(local.cfg, "default_node_pool_type", "VirtualMachineScaleSets")
 
-  agent_pool_profile_count = lookup(local.cfg, "agent_pool_profile_count", "1")
+  default_node_pool_enable_auto_scaling = lookup(local.cfg, "default_node_pool_enable_auto_scaling", true)
+  default_node_pool_min_count           = lookup(local.cfg, "default_node_pool_min_count", "1")
+  default_node_pool_max_count           = lookup(local.cfg, "default_node_pool_max_count", "1")
+  default_node_pool_node_count          = lookup(local.cfg, "default_node_pool_node_count", "1")
 
-  agent_pool_profile_vm_size = lookup(local.cfg, "agent_pool_profile_vm_size", "Standard_D1_v2")
+  default_node_pool_vm_size = lookup(local.cfg, "default_node_pool_vm_size", "Standard_D1_v2")
 
-  agent_pool_profile_os_type = lookup(local.cfg, "agent_pool_profile_os_type", "Linux")
-
-  agent_pool_profile_os_disk_size_gb = lookup(local.cfg, "agent_pool_profile_os_disk_size_gb", "30")
+  default_node_pool_os_disk_size_gb = lookup(local.cfg, "default_node_pool_os_disk_size_gb", "30")
 }
-

azurerm/cluster/main.tf

@@ -27,10 +27,14 @@ module "cluster" {
 
   dns_prefix = local.dns_prefix
 
-  agent_pool_profile_name            = local.agent_pool_profile_name
-  agent_pool_profile_count           = local.agent_pool_profile_count
-  agent_pool_profile_vm_size         = local.agent_pool_profile_vm_size
-  agent_pool_profile_os_type         = local.agent_pool_profile_os_type
-  agent_pool_profile_os_disk_size_gb = local.agent_pool_profile_os_disk_size_gb
-}
+  default_node_pool_name = local.default_node_pool_name
+  default_node_pool_type = local.default_node_pool_type
+
+  default_node_pool_enable_auto_scaling = local.default_node_pool_enable_auto_scaling
+  default_node_pool_min_count           = local.default_node_pool_min_count
+  default_node_pool_max_count           = local.default_node_pool_max_count
+  default_node_pool_node_count          = local.default_node_pool_node_count
 
+  default_node_pool_vm_size         = local.default_node_pool_vm_size
+  default_node_pool_os_disk_size_gb = local.default_node_pool_os_disk_size_gb
+}

tests/config.auto.tfvars

@@ -24,7 +24,7 @@ clusters = {
       project_id                 = "terraform-kubestack-testing"
       name_prefix                = "kbstacctest"
       base_domain                = "infra.serverwolken.de"
-      cluster_min_master_version = "1.13.11"
+      cluster_min_master_version = "1.13"
       cluster_min_node_count     = 1
       cluster_max_node_count     = 1
       region                     = "europe-west1"