Skip to content

Commit 27e463c

Browse files
aamini7aamini7
committed
Fixes
1 parent 13ab276 commit 27e463c

File tree

9 files changed

+93
-91
lines changed

9 files changed

+93
-91
lines changed

‎scenarios/AksOpenAiTerraform/terraform/.terraform.lock.hcl‎

Lines changed: 0 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎scenarios/AksOpenAiTerraform/terraform/main.tf‎

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -15,57 +15,24 @@ data "azurerm_client_config" "current" {
1515
}
1616

1717
locals {
18-
log_analytics_workspace_name = "Workspace"
19-
log_analytics_retention_days = 30
20-
18+
vm_subnet_name = "VmSubnet"
2119
system_node_pool_subnet_name = "SystemSubnet"
2220
user_node_pool_subnet_name = "UserSubnet"
2321
pod_subnet_name = "PodSubnet"
24-
vm_subnet_name = "VmSubnet"
2522

2623
namespace = "magic8ball"
2724
service_account_name = "magic8ball-sa"
2825

29-
subnets = [
30-
{
31-
name : local.system_node_pool_subnet_name
32-
address_prefixes : ["10.240.0.0/16"]
33-
delegation = null
34-
},
35-
{
36-
name : local.user_node_pool_subnet_name
37-
address_prefixes : ["10.241.0.0/16"]
38-
delegation = null
39-
},
40-
{
41-
name : local.vm_subnet_name
42-
address_prefixes : ["10.243.1.0/24"]
43-
delegation = null
44-
},
45-
{
46-
name : "AzureBastionSubnet"
47-
address_prefixes : ["10.243.2.0/24"]
48-
delegation = null
49-
},
50-
{
51-
name : local.pod_subnet_name
52-
address_prefixes : ["10.242.0.0/16"]
53-
delegation = {
54-
name = "delegation"
55-
service_delegation = {
56-
name = "Microsoft.ContainerService/managedClusters"
57-
actions = ["Microsoft.Network/virtualNetworks/subnets/join/action"]
58-
}
59-
}
60-
},
61-
]
26+
log_analytics_workspace_name = "Workspace"
27+
log_analytics_retention_days = 30
6228
}
6329

6430
resource "random_string" "rg_suffix" {
6531
length = 6
6632
special = false
33+
lower = false
6734
upper = false
68-
numeric = false
35+
numeric = true
6936
}
7037

7138
resource "random_string" "storage_account_suffix" {
@@ -77,7 +44,7 @@ resource "random_string" "storage_account_suffix" {
7744
}
7845

7946
resource "azurerm_resource_group" "rg" {
80-
name = "${var.name_prefix}-${random_string.rg_suffix}-rg"
47+
name = "${var.name_prefix}-${random_string.rg_suffix.result}-rg"
8148
location = var.location
8249
}
8350

@@ -115,11 +82,12 @@ module "aks_cluster" {
11582
resource_group_id = azurerm_resource_group.rg.id
11683
tenant_id = data.azurerm_client_config.current.tenant_id
11784

118-
kubernetes_version = "1.32"
119-
sku_tier = "Free"
120-
user_node_pool_subnet_name = local.user_node_pool_subnet_name
121-
system_node_pool_subnet_name = local.system_node_pool_subnet_name
122-
pod_subnet_name = local.pod_subnet_name
85+
kubernetes_version = "1.30.7"
86+
sku_tier = "Free"
87+
88+
system_node_pool_subnet_id = module.virtual_network.subnet_ids[local.system_node_pool_subnet_name]
89+
user_node_pool_subnet_id = module.virtual_network.subnet_ids[local.user_node_pool_subnet_name]
90+
pod_subnet_id = module.virtual_network.subnet_ids[local.pod_subnet_name]
12391

12492
log_analytics_workspace_id = module.log_analytics_workspace.id
12593

@@ -154,7 +122,7 @@ module "storage_account" {
154122

155123
module "key_vault" {
156124
source = "./modules/key_vault"
157-
name = "${var.name_prefix}KeyVault"
125+
name = "${var.name_prefix}Vault"
158126
location = var.location
159127
resource_group_name = azurerm_resource_group.rg.name
160128

@@ -221,7 +189,39 @@ module "virtual_network" {
221189
log_analytics_workspace_id = module.log_analytics_workspace.id
222190

223191
address_space = ["10.0.0.0/8"]
224-
subnets = local.subnets
192+
subnets = [
193+
{
194+
name : local.system_node_pool_subnet_name
195+
address_prefixes : ["10.240.0.0/16"]
196+
delegation = null
197+
},
198+
{
199+
name : local.user_node_pool_subnet_name
200+
address_prefixes : ["10.241.0.0/16"]
201+
delegation = null
202+
},
203+
{
204+
name : local.vm_subnet_name
205+
address_prefixes : ["10.243.1.0/24"]
206+
delegation = null
207+
},
208+
{
209+
name : "AzureBastionSubnet"
210+
address_prefixes : ["10.243.2.0/24"]
211+
delegation = null
212+
},
213+
{
214+
name : local.pod_subnet_name
215+
address_prefixes : ["10.242.0.0/16"]
216+
delegation = {
217+
name = "delegation"
218+
service_delegation = {
219+
name = "Microsoft.ContainerService/managedClusters"
220+
actions = ["Microsoft.Network/virtualNetworks/subnets/join/action"]
221+
}
222+
}
223+
},
224+
]
225225
}
226226

227227
module "nat_gateway" {
@@ -230,7 +230,7 @@ module "nat_gateway" {
230230
location = var.location
231231
resource_group_name = azurerm_resource_group.rg.name
232232

233-
subnet_ids = module.virtual_network.subnet_ids[local.system_node_pool_subnet_name]
233+
subnet_ids = module.virtual_network.subnet_ids
234234
}
235235

236236
module "bastion_host" {
@@ -344,7 +344,7 @@ module "blob_private_endpoint" {
344344
location = var.location
345345
resource_group_name = azurerm_resource_group.rg.name
346346
subnet_id = module.virtual_network.subnet_ids[local.vm_subnet_name]
347-
private_connection_resource_id = module.storage_account.name
347+
private_connection_resource_id = module.storage_account.id
348348
is_manual_connection = false
349349
subresource_name = "blob"
350350
private_dns_zone_group_name = "BlobPrivateDnsZoneGroup"

‎scenarios/AksOpenAiTerraform/terraform/modules/aks/main.tf‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ resource "azurerm_kubernetes_cluster" "aks_cluster" {
2525
name = "system"
2626
node_count = 1
2727
vm_size = var.system_node_pool_vm_size
28-
vnet_subnet_id = var.system_node_pool_subnet_name
29-
pod_subnet_id = var.pod_subnet_name
28+
vnet_subnet_id = var.system_node_pool_subnet_id
29+
pod_subnet_id = var.pod_subnet_id
3030
zones = ["1", "2", "3"]
3131
max_pods = 50
3232
os_disk_type = "Ephemeral"
@@ -50,7 +50,7 @@ resource "azurerm_kubernetes_cluster" "aks_cluster" {
5050
}
5151

5252
azure_active_directory_role_based_access_control {
53-
tenant_id = data.azurerm_client_config.current.tenant_id
53+
tenant_id = var.tenant_id
5454
azure_rbac_enabled = true
5555
}
5656

@@ -66,8 +66,8 @@ resource "azurerm_kubernetes_cluster_node_pool" "node_pool" {
6666
vm_size = var.user_node_pool_vm_size
6767
mode = "User"
6868
zones = ["1", "2", "3"]
69-
vnet_subnet_id = var.user_node_pool_subnet_name
70-
pod_subnet_id = var.pod_subnet_name
69+
vnet_subnet_id = var.user_node_pool_subnet_id
70+
pod_subnet_id = var.pod_subnet_id
7171
orchestrator_version = var.kubernetes_version
7272
max_pods = 50
7373
os_disk_type = "Ephemeral"

‎scenarios/AksOpenAiTerraform/terraform/modules/aks/outputs.tf‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
output "name" {
2+
value = azurerm_kubernetes_cluster.aks_cluster.name
3+
}
4+
5+
output "id" {
6+
value = azurerm_kubernetes_cluster.aks_cluster.id
7+
}
8+
9+
output "aks_identity_principal_id" {
10+
value = azurerm_user_assigned_identity.aks_identity.principal_id
11+
}
12+
13+
output "kubelet_identity_object_id" {
14+
value = azurerm_kubernetes_cluster.aks_cluster.kubelet_identity.0.object_id
15+
}
16+
17+
output "oidc_issuer_url" {
18+
value = azurerm_kubernetes_cluster.aks_cluster.oidc_issuer_url
19+
}

‎scenarios/AksOpenAiTerraform/terraform/modules/aks/variables.tf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,14 @@ variable "log_analytics_workspace_id" {
4040
type = string
4141
}
4242

43-
variable "user_node_pool_subnet_name" {
43+
variable "user_node_pool_subnet_id" {
4444
type = string
4545
}
4646

47-
variable "system_node_pool_subnet_name" {
47+
variable "system_node_pool_subnet_id" {
4848
type = string
4949
}
5050

51-
variable "pod_subnet_name" {
51+
variable "pod_subnet_id" {
5252
type = string
5353
}

‎scenarios/AksOpenAiTerraform/terraform/modules/private_dns_zone/main.tf‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
resource "azurerm_private_dns_zone" "private_dns_zone" {
22
name = var.name
33
resource_group_name = var.resource_group_name
4-
tags = var.tags
5-
6-
lifecycle {
7-
ignore_changes = [
8-
tags
9-
]
10-
}
114
}
125

136
resource "azurerm_private_dns_zone_virtual_network_link" "link" {
@@ -17,10 +10,4 @@ resource "azurerm_private_dns_zone_virtual_network_link" "link" {
1710
resource_group_name = var.resource_group_name
1811
private_dns_zone_name = azurerm_private_dns_zone.private_dns_zone.name
1912
virtual_network_id = "/subscriptions/${each.value.subscription_id}/resourceGroups/${each.value.resource_group_name}/providers/Microsoft.Network/virtualNetworks/${each.key}"
20-
21-
lifecycle {
22-
ignore_changes = [
23-
tags
24-
]
25-
}
2613
}

‎scenarios/AksOpenAiTerraform/terraform/modules/storage_account/outputs.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
output "name" {
2-
value = azurerm_storage_account.storage_account.name
1+
output "id" {
2+
value = azurerm_storage_account.storage_account.id
33
}

‎scenarios/AksOpenAiTerraform/terraform/modules/virtual_network/outputs.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ output "name" {
33
}
44

55
output "subnet_ids" {
6-
value = azurerm_subnet.subnet.*.id
6+
value = { for subnet in azurerm_subnet.subnet : subnet.name => subnet.id }
77
}

‎scenarios/AksOpenAiTerraform/terraform/variables.tf‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,21 @@ variable "location" {
88
default = "westus2"
99
}
1010

11+
variable "kubernetes_version" {
12+
type = string
13+
default = "1.30.7"
14+
}
15+
16+
variable "system_node_pool_vm_size" {
17+
type = string
18+
default = "Standard_D8ds_v5"
19+
}
20+
21+
variable "user_node_pool_vm_size" {
22+
type = string
23+
default = "Standard_D8ds_v5"
24+
}
25+
1126
variable "email" {
1227
type = string
1328
default = "[email protected]"

0 commit comments

Comments
 (0)