Fix for ACI connector

liatrio · Aug 15, 2023 · e2735f3 · e2735f3
1 parent d037816
commit e2735f3
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 5 deletions.
diff --git a/infra/live/azure/linux-public/terragrunt.hcl b/infra/live/azure/linux-public/terragrunt.hcl
@@ -72,7 +72,7 @@ inputs = {
       priority = {
         spot_enabled = false
       }
-      labels = {
+      node_labels = {
         "environment" = "build"
       }
     }

diff --git a/infra/modules/azure/aks/main.tf b/infra/modules/azure/aks/main.tf
@@ -80,7 +80,7 @@ resource "azurerm_kubernetes_cluster_node_pool" "self" {
   node_count            = each.value.auto_scaler_profile.enabled ? null : each.value.node_count
   max_count             = each.value.auto_scaler_profile.enabled ? each.value.auto_scaler_profile.max_node_count : null
   zones                 = each.value.zones
-  node_labels           = each.value.labels
+  node_labels           = each.value.node_labels
   # enable_host_encryption = true <- not enabled at the subscription level
   priority              = each.value.priority.spot_enabled ? "Spot" : "Regular"
   spot_max_price        = each.value.priority.spot_enabled ? each.value.priority.spot_price : null

diff --git a/infra/modules/azure/aks/variables.tf b/infra/modules/azure/aks/variables.tf
@@ -71,8 +71,8 @@ variable "additional_node_pools" {
       spot_enabled = bool
       spot_price   = optional(number, -1)
     })
-    zones  = optional(list(string), ["1", "2", "3"])
-    labels = optional(map(string), {})
+    zones       = optional(list(string), ["1", "2", "3"])
+    node_labels = map(string)
   }))
   default = {}
 }

diff --git a/infra/modules/azure/network/main.tf b/infra/modules/azure/network/main.tf
@@ -24,6 +24,18 @@ resource "azurerm_subnet" "self" {
   resource_group_name  = data.azurerm_resource_group.self.name
   virtual_network_name = azurerm_virtual_network.self.name
   address_prefixes     = [var.subnets[count.index].address_prefix]
+
+  dynamic "delegation" {
+    for_each = var.subnets[count.index].name == "aci" ? [1] : []
+
+    content {
+      name = "aciDelegation"
+      service_delegation {
+        name    = "Microsoft.ContainerInstance/containerGroups"
+        actions = ["Microsoft.Network/virtualNetworks/subnets/action"]
+      }
+    }
+  }
 }
 
 locals{ #ignore firewall and gateway subnets for security group association

diff --git a/infra/src/azure/variables.tf b/infra/src/azure/variables.tf
@@ -58,7 +58,8 @@ variable "additional_node_pools" {
       spot_enabled = bool
       spot_price   = optional(number, -1)
     })
-    zones = optional(list(string), ["1", "2", "3"])
+    zones       = optional(list(string), ["1", "2", "3"])
+    node_labels = map(string)
   }))
   description = "Additional node pools to create"