Merge pull request microsoft#9 from denniseik/ml-updates

Ml updates

Author: deeikele

quickstart/201-machine-learning-moderately-secure/main.tf

@@ -4,7 +4,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "=2.76.0"
+      version = "=2.78.0"
     }
   }
 }

quickstart/201-machine-learning-moderately-secure/variables.tf

@@ -24,19 +24,19 @@ variable "vnet_address_space" {
 variable "training_subnet_address_space" {
   type        = list(string)
   description = "Address space of the training subnet"
-  default     = ["10.0.0.0/24"]
+  default     = ["10.0.1.0/24"]
 }
 
 variable "aks_subnet_address_space" {
   type        = list(string)
   description = "Address space of the aks subnet"
-  default     = ["10.0.1.0/24"]
+  default     = ["10.0.2.0/23"]
 }
 
 variable "ml_subnet_address_space" {
   type        = list(string)
   description = "Address space of the ML workspace subnet"
-  default     = ["10.0.2.0/24"]
+  default     = ["10.0.0.0/24"]
 }
 
 variable "image_build_compute_name" {

quickstart/201-machine-learning-moderately-secure/workspace.tf

@@ -55,10 +55,15 @@ resource "azurerm_machine_learning_workspace" "default" {
   key_vault_id            = azurerm_key_vault.default.id
   storage_account_id      = azurerm_storage_account.default.id
   container_registry_id   = azurerm_container_registry.default.id
-
+  
   identity {
     type = "SystemAssigned"
   }
+  
+  # Args of use when using an Azure Private Link configuration
+  public_network_access_enabled = false
+  image_build_compute_name = var.image_build_compute_name
+  
 }
 
 # Private endpoints
@@ -177,14 +182,3 @@ resource "azurerm_machine_learning_compute_cluster" "image-builder" {
     type = "SystemAssigned"
   }
 }
-
-# Update workspace for image-build-compute
-resource "null_resource" "ws_image_build_compute"{
-  provisioner "local-exec" {
-    command = <<EOF
-    az ml workspace update --resource-group ${azurerm_resource_group.default.name} --workspace-name ${azurerm_machine_learning_workspace.default.name} --image-build-compute ${azurerm_machine_learning_compute_cluster.image-builder.name}
-    
-    EOF
-  }
-  depends_on = [azurerm_machine_learning_compute_cluster.image-builder]
-}

quickstart/202-machine-learning-moderately-secure-existing-VNet/compute.tf

@@ -13,6 +13,10 @@ resource "azurerm_machine_learning_compute_instance" "compute_instance" {
   machine_learning_workspace_id = azurerm_machine_learning_workspace.default.id
   virtual_machine_size          = "STANDARD_DS2_V2"
   subnet_resource_id            = var.training_subnet_resource_id
+
+  depends_on = [
+    azurerm_private_endpoint.mlw_ple
+  ]
 }
 
 # Compute cluster

quickstart/202-machine-learning-moderately-secure-existing-VNet/main.tf

@@ -4,7 +4,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "=2.76.0"
+      version = "=2.78.0"
     }
   }
 }

quickstart/202-machine-learning-moderately-secure-existing-VNet/workspace.tf

@@ -59,6 +59,10 @@ resource "azurerm_machine_learning_workspace" "default" {
   identity {
     type = "SystemAssigned"
   }
+  
+  # Args of use when using an Azure Private Link configuration
+  public_network_access_enabled = false
+  image_build_compute_name = var.image_build_compute_name
 }
 
 # Private endpoints
@@ -180,14 +184,3 @@ resource "azurerm_machine_learning_compute_cluster" "image-builder" {
     type = "SystemAssigned"
   }
 }
-
-# Update workspace for image-build-compute
-resource "null_resource" "ws_image_build_compute"{
-  provisioner "local-exec" {
-    command = <<EOF
-    az ml workspace update --resource-group ${azurerm_resource_group.default.name} --workspace-name ${azurerm_machine_learning_workspace.default.name} --image-build-compute ${azurerm_machine_learning_compute_cluster.image-builder.name}
-    
-    EOF
-  }
-  depends_on = [azurerm_machine_learning_compute_cluster.image-builder]
-}