Fixes

Author: aamini7

scenarios/AksOpenAiTerraform/scripts/01-push-app-image.sh

@@ -1,5 +1,9 @@
 #!/bin/bash
 
+cd terraform
+
+ACR_NAME=$(terraform output acr_url)
+
 # Login
 az acr login --name $ACR_NAME
 ACR_URL=$(az acr show --name $ACR_NAME --query loginServer --output tsv)

scenarios/AksOpenAiTerraform/terraform/main.tf

@@ -72,8 +72,8 @@ module "aks_cluster" {
 
   kubernetes_version       = var.kubernetes_version
   sku_tier                 = "Free"
-  system_node_pool_vm_size = "Standard_D8ds_v5"
-  user_node_pool_vm_size   = "Standard_D8ds_v5"
+  system_node_pool_vm_size = "Standard_DS2_v2"
+  user_node_pool_vm_size   = "Standard_DS2_v2"
 
   system_node_pool_subnet_id = module.virtual_network.subnet_ids["SystemSubnet"]
   user_node_pool_subnet_id   = module.virtual_network.subnet_ids["UserSubnet"]

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

@@ -1,3 +1,7 @@
+locals {
+    zones = ["2", "3"]
+}
+
 resource "azurerm_user_assigned_identity" "aks_identity" {
   name                = "${var.name}Identity"
   resource_group_name = var.resource_group_name
@@ -27,9 +31,8 @@ resource "azurerm_kubernetes_cluster" "aks_cluster" {
     vm_size        = var.system_node_pool_vm_size
     vnet_subnet_id = var.system_node_pool_subnet_id
     pod_subnet_id  = var.pod_subnet_id
-    zones          = ["1", "2", "3"]
+    zones          = local.zones
     max_pods       = 50
-    os_disk_type   = "Ephemeral"
 
     upgrade_settings {
       drain_timeout_in_minutes      = 0
@@ -75,12 +78,11 @@ resource "azurerm_kubernetes_cluster_node_pool" "node_pool" {
   name                  = "user"
   vm_size               = var.user_node_pool_vm_size
   mode                  = "User"
-  zones                 = ["1", "2", "3"]
+  zones                 = local.zones
   vnet_subnet_id        = var.user_node_pool_subnet_id
   pod_subnet_id         = var.pod_subnet_id
   orchestrator_version  = var.kubernetes_version
   max_pods              = 50
-  os_disk_type          = "Ephemeral"
   os_type               = "Linux"
   priority              = "Regular"
 }

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

@@ -2,29 +2,29 @@ locals {
   zones = ["1"]
 }
 
-resource "azurerm_public_ip" "nat_gategay_public_ip" {
-  name                = "${var.name}PublicIp"
-  location            = var.location
-  resource_group_name = var.resource_group_name
-  allocation_method   = "Static"
-  zones               = local.zones
-}
-
-resource "azurerm_nat_gateway" "nat_gateway" {
+resource "azurerm_nat_gateway" "this" {
   name                    = var.name
   location                = var.location
   resource_group_name     = var.resource_group_name
   idle_timeout_in_minutes = 4
   zones                   = local.zones
 }
 
+resource "azurerm_public_ip" "nat_gateway" {
+  name                = "${var.name}PublicIp"
+  location            = var.location
+  resource_group_name = var.resource_group_name
+  allocation_method   = "Static"
+  zones               = local.zones
+}
+
 resource "azurerm_nat_gateway_public_ip_association" "nat_gategay_public_ip_association" {
-  nat_gateway_id       = azurerm_nat_gateway.nat_gateway.id
-  public_ip_address_id = azurerm_public_ip.nat_gategay_public_ip.id
+  nat_gateway_id       = azurerm_nat_gateway.this.id
+  public_ip_address_id = azurerm_public_ip.nat_gateway.id
 }
 
 resource "azurerm_subnet_nat_gateway_association" "nat-avd-sessionhosts" {
   for_each       = var.subnet_ids
   subnet_id      = each.value
-  nat_gateway_id = azurerm_nat_gateway.nat_gateway.id
+  nat_gateway_id = azurerm_nat_gateway.this.id
 }

scenarios/AksOpenAiTerraform/terraform/variables.tf

@@ -5,7 +5,7 @@ variable "resource_group_name_prefix" {
 
 variable "location" {
   type    = string
-  default = "westus"
+  default = "westus3"
 }
 
 variable "kubernetes_version" {