[terraform/aks] Implement machine type, nodepool max size variables

Author: adrienthebo

Diff for: install/infra/modules/aks/kubernetes.tf

@@ -27,7 +27,7 @@ resource "azurerm_kubernetes_cluster" "k8s" {
 
   default_node_pool {
     name    = "services"
-    vm_size = local.machine
+    vm_size = var.services_machine_type
 
 
     node_taints = []
@@ -36,7 +36,7 @@ resource "azurerm_kubernetes_cluster" "k8s" {
 
     enable_auto_scaling  = true
     min_count            = 1
-    max_count            = 10
+    max_count            = var.max_node_count_services
     orchestrator_version = var.cluster_version
     node_labels = {
       "gitpod.io/workload_meta"               = true
@@ -66,11 +66,11 @@ resource "azurerm_kubernetes_cluster" "k8s" {
 resource "azurerm_kubernetes_cluster_node_pool" "regularws" {
   kubernetes_cluster_id = azurerm_kubernetes_cluster.k8s.id
   name                  = "regularws"
-  vm_size               = local.machine
+  vm_size               = var.workspaces_machine_type
 
   enable_auto_scaling  = true
   min_count            = 1
-  max_count            = 10
+  max_count            = var.max_node_count_regular_workspaces
   orchestrator_version = var.cluster_version
   node_labels          = { "gitpod.io/workload_workspace_regular" = true }
   vnet_subnet_id       = azurerm_subnet.network.id
@@ -79,11 +79,11 @@ resource "azurerm_kubernetes_cluster_node_pool" "regularws" {
 resource "azurerm_kubernetes_cluster_node_pool" "headlessws" {
   kubernetes_cluster_id = azurerm_kubernetes_cluster.k8s.id
   name                  = "headlessws"
-  vm_size               = local.machine
+  vm_size               = var.workspaces_machine_type
 
   enable_auto_scaling  = true
   min_count            = 1
-  max_count            = 10
+  max_count            = var.max_node_count_headless_workspaces
   orchestrator_version = var.cluster_version
   node_labels          = { "gitpod.io/workload_workspace_headless" = true }
   vnet_subnet_id       = azurerm_subnet.network.id

Diff for: install/infra/modules/aks/variables.tf

@@ -1,23 +1,62 @@
 // Common variables
 variable "kubeconfig" {
+  description = "Path to write the kubeconfig output to"
   default = "./kubeconfig"
 }
 
 variable "cluster_version" {
-  description = "kubernetes version of to create the cluster with"
+  description = "The AKS Kubernetes version"
+}
+
+variable "domain_name" {
+  description = "The domain name where Gitpod will create DNS records. Leave blank to disable DNS management."
+  type = string
 }
 
-variable "domain_name" {}
 variable "enable_airgapped" {
   default = false
 }
 
 variable "create_external_database" {}
 variable "create_external_registry" {}
 variable "create_external_storage" {}
-variable "resource_group_name" {}
+
+variable "resource_group_name" {
+  description = "The resource group where Gitpod resources will be created."
+  type = string
+}
 
 // Azure-specific variables
 variable "location" {
   default = "northeurope"
 }
+
+variable "max_node_count_regular_workspaces" {
+  type        = number
+  description = "Maximum number of nodes in the regular workspaces NodePool. Must be >= 1."
+  default     = 50
+}
+
+variable "max_node_count_headless_workspaces" {
+  type        = number
+  description = "Maximum number of nodes in the headless workspaces NodePool. Must be >= 1."
+  default     = 50
+}
+
+variable "max_node_count_services" {
+  type        = number
+  description = "Maximum number of nodes in the services NodePool. Must be >= 1."
+  default     = 4
+}
+
+variable "workspaces_machine_type" {
+  type        = string
+  description = "The regular and headless node machine type."
+  default     = "Standard_D8_v4"
+}
+
+variable "services_machine_type" {
+  type        = string
+  description = "The services node machine type."
+  default     = "Standard_D4_v4"
+}