Skip to content

Commit 5e9d165

Browse files
committed
Fix vnet
1 parent 978325f commit 5e9d165

File tree

3 files changed

+23
-10
lines changed

3 files changed

+23
-10
lines changed

scenarios/AksOpenAiTerraform/terraform/main.tf

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,35 +61,41 @@ module "virtual_network" {
6161
{
6262
name : var.system_node_pool_subnet_name
6363
address_prefixes : var.system_node_pool_subnet_address_prefix
64-
private_endpoint_network_policies_enabled : true
64+
private_endpoint_network_policies : "Enabled"
6565
private_link_service_network_policies_enabled : false
6666
delegation: null
6767
},
6868
{
6969
name : var.user_node_pool_subnet_name
7070
address_prefixes : var.user_node_pool_subnet_address_prefix
71-
private_endpoint_network_policies_enabled : true
71+
private_endpoint_network_policies : "Enabled"
7272
private_link_service_network_policies_enabled : false
7373
delegation: null
7474
},
7575
{
7676
name : var.pod_subnet_name
7777
address_prefixes : var.pod_subnet_address_prefix
78-
private_endpoint_network_policies_enabled : true
78+
private_endpoint_network_policies : "Enabled"
7979
private_link_service_network_policies_enabled : false
80-
delegation: "Microsoft.ContainerService/managedClusters"
80+
delegation = {
81+
name = "delegation"
82+
service_delegation = {
83+
name = "Microsoft.ContainerService/managedClusters"
84+
actions = ["Microsoft.Network/virtualNetworks/subnets/join/action"]
85+
}
86+
}
8187
},
8288
{
8389
name : var.vm_subnet_name
8490
address_prefixes : var.vm_subnet_address_prefix
85-
private_endpoint_network_policies_enabled : true
91+
private_endpoint_network_policies : "Enabled"
8692
private_link_service_network_policies_enabled : false
8793
delegation: null
8894
},
8995
{
9096
name : "AzureBastionSubnet"
9197
address_prefixes : var.bastion_subnet_address_prefix
92-
private_endpoint_network_policies_enabled : true
98+
private_endpoint_network_policies : "Enabled"
9399
private_link_service_network_policies_enabled : false
94100
delegation: null
95101
}
@@ -106,6 +112,9 @@ module "nat_gateway" {
106112
zones = var.nat_gateway_zones
107113
tags = var.tags
108114
subnet_ids = module.virtual_network.subnet_ids
115+
depends_on = [
116+
module.virtual_network
117+
]
109118
}
110119

111120
module "container_registry" {

scenarios/AksOpenAiTerraform/terraform/modules/virtual_network/main.tf

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ resource "azurerm_subnet" "subnet" {
1919
resource_group_name = var.resource_group_name
2020
virtual_network_name = azurerm_virtual_network.vnet.name
2121
address_prefixes = each.value.address_prefixes
22-
private_endpoint_network_policies_enabled = each.value.private_endpoint_network_policies_enabled
22+
private_endpoint_network_policies = each.value.private_endpoint_network_policies
2323
private_link_service_network_policies_enabled = each.value.private_link_service_network_policies_enabled
2424

2525
dynamic "delegation" {
@@ -28,7 +28,8 @@ resource "azurerm_subnet" "subnet" {
2828
name = "delegation"
2929

3030
service_delegation {
31-
name = delegation.value
31+
name = delegation.value.service_delegation.name
32+
actions = delegation.value.service_delegation.actions
3233
}
3334
}
3435
}

scenarios/AksOpenAiTerraform/terraform/modules/virtual_network/variables.tf

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,12 @@ variable "subnets" {
2323
type = list(object({
2424
name = string
2525
address_prefixes = list(string)
26-
private_endpoint_network_policies_enabled = bool
26+
private_endpoint_network_policies = string
2727
private_link_service_network_policies_enabled = bool
28-
delegation = string
28+
delegation = object({name = string, service_delegation = object({
29+
name = string
30+
actions = list(string)
31+
})})
2932
}))
3033
}
3134

0 commit comments

Comments
 (0)