[terraform/aks] break out separate node pools for services, regular-workspaces, and headless-workspaces

Author: adrienthebo

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

@@ -26,7 +26,7 @@ resource "azurerm_kubernetes_cluster" "k8s" {
   http_application_routing_enabled = false
 
   default_node_pool {
-    name    = local.nodes.0.name
+    name    = "services"
     vm_size = local.machine
 
 
@@ -38,7 +38,11 @@ resource "azurerm_kubernetes_cluster" "k8s" {
     min_count            = 1
     max_count            = 10
     orchestrator_version = var.cluster_version
-    node_labels          = local.nodes.0.labels
+    node_labels = {
+      "gitpod.io/workload_meta"               = true
+      "gitpod.io/workload_ide"                = true
+      "gitpod.io/workload_workspace_services" = true
+    }
 
     type           = "VirtualMachineScaleSets"
     vnet_subnet_id = azurerm_subnet.network.id
@@ -59,18 +63,29 @@ resource "azurerm_kubernetes_cluster" "k8s" {
   }
 }
 
-resource "azurerm_kubernetes_cluster_node_pool" "pools" {
-  count = length(local.nodes) - 1
+resource "azurerm_kubernetes_cluster_node_pool" "regularws" {
+  kubernetes_cluster_id = azurerm_kubernetes_cluster.k8s.id
+  name                  = "regularws"
+  vm_size               = local.machine
+
+  enable_auto_scaling  = true
+  min_count            = 1
+  max_count            = 10
+  orchestrator_version = var.cluster_version
+  node_labels          = { "gitpod.io/workload_workspace_regular" = true }
+  vnet_subnet_id       = azurerm_subnet.network.id
+}
 
+resource "azurerm_kubernetes_cluster_node_pool" "headlessws" {
   kubernetes_cluster_id = azurerm_kubernetes_cluster.k8s.id
-  name                  = local.nodes[count.index + 1].name
+  name                  = "headlessws"
   vm_size               = local.machine
 
   enable_auto_scaling  = true
   min_count            = 1
   max_count            = 10
   orchestrator_version = var.cluster_version
-  node_labels          = local.nodes[count.index + 1].labels
+  node_labels          = { "gitpod.io/workload_workspace_headless" = true }
   vnet_subnet_id       = azurerm_subnet.network.id
 }
 
@@ -82,7 +97,8 @@ data "azurerm_resources" "k8s" {
 
   depends_on = [
     azurerm_kubernetes_cluster.k8s,
-    azurerm_kubernetes_cluster_node_pool.pools
+    azurerm_kubernetes_cluster_node_pool.regularws,
+    azurerm_kubernetes_cluster_node_pool.headlessws,
   ]
 }
 
@@ -107,7 +123,8 @@ resource "azurerm_network_security_rule" "k8s" {
 
 resource "local_file" "kubeconfig" {
   depends_on = [
-    resource.azurerm_kubernetes_cluster_node_pool.pools,
+    resource.azurerm_kubernetes_cluster_node_pool.regularws,
+    resource.azurerm_kubernetes_cluster_node_pool.headlessws,
   ]
   filename = var.kubeconfig
   content  = azurerm_kubernetes_cluster.k8s.kube_config_raw

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

@@ -1,11 +1,4 @@
 locals {
-  labels = tomap({
-    workload_meta : "gitpod.io/workload_meta"
-    workload_ide : "gitpod.io/workload_ide"
-    workspace_services : "gitpod.io/workload_workspace_services"
-    workspace_regular : "gitpod.io/workload_workspace_regular"
-    workspace_headless : "gitpod.io/workload_workspace_headless"
-  })
   dns_enabled = var.domain_name != null
 
   name_format = join("-", [
@@ -75,16 +68,4 @@ locals {
       priority                   = 4096
     }
   ] : []
-  nodes = [
-    {
-      name = "services"
-       labels = {
-        lookup(local.labels, "workload_meta")      = true
-        lookup(local.labels, "workload_ide")       = true
-        lookup(local.labels, "workspace_services") = true
-        lookup(local.labels, "workspace_regular")  = true
-        lookup(local.labels, "workspace_headless") = true
-      }
-    }
-  ]
 }