From 9a52e9aa55136dd57b9c9be1eb72c87a81f1e252 Mon Sep 17 00:00:00 2001 From: ryhud Date: Fri, 24 Sep 2021 14:21:54 -0400 Subject: [PATCH 1/6] updating minimum TF version --- quickstart/201-machine-learning-moderately-secure/main.tf | 2 +- .../main.tf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/quickstart/201-machine-learning-moderately-secure/main.tf b/quickstart/201-machine-learning-moderately-secure/main.tf index 67dea407..b5e0c3a8 100644 --- a/quickstart/201-machine-learning-moderately-secure/main.tf +++ b/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" } } } diff --git a/quickstart/202-machine-learning-moderately-secure-existing-VNet/main.tf b/quickstart/202-machine-learning-moderately-secure-existing-VNet/main.tf index 67dea407..b5e0c3a8 100644 --- a/quickstart/202-machine-learning-moderately-secure-existing-VNet/main.tf +++ b/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" } } } From e814b48966a695b0ed9e2964b57520d9b4c39299 Mon Sep 17 00:00:00 2001 From: ryhud Date: Fri, 24 Sep 2021 14:25:06 -0400 Subject: [PATCH 2/6] adding resource dependency to compute instance --- .../compute.tf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/quickstart/202-machine-learning-moderately-secure-existing-VNet/compute.tf b/quickstart/202-machine-learning-moderately-secure-existing-VNet/compute.tf index aa16e3b5..026c21a1 100644 --- a/quickstart/202-machine-learning-moderately-secure-existing-VNet/compute.tf +++ b/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 From 44955e34222c1a25350e15f70247515df880cc0a Mon Sep 17 00:00:00 2001 From: ryhud Date: Fri, 24 Sep 2021 14:30:07 -0400 Subject: [PATCH 3/6] adding TF native image_build_compute setting --- .../workspace.tf | 15 +++------------ .../workspace.tf | 15 +++------------ 2 files changed, 6 insertions(+), 24 deletions(-) diff --git a/quickstart/201-machine-learning-moderately-secure/workspace.tf b/quickstart/201-machine-learning-moderately-secure/workspace.tf index deb00941..28ddee0a 100644 --- a/quickstart/201-machine-learning-moderately-secure/workspace.tf +++ b/quickstart/201-machine-learning-moderately-secure/workspace.tf @@ -59,6 +59,8 @@ resource "azurerm_machine_learning_workspace" "default" { identity { type = "SystemAssigned" } + + image_build_compute_name = var.image_build_compute_name } # Private endpoints @@ -176,15 +178,4 @@ resource "azurerm_machine_learning_compute_cluster" "image-builder" { identity { type = "SystemAssigned" } -} - -# Update workspace for image-build-compute -resource "null_resource" "ws_image_build_compute"{ - provisioner "local-exec" { - command = < Date: Fri, 24 Sep 2021 14:33:46 -0400 Subject: [PATCH 4/6] updating aks subnetvar default to larger cidr --- .../201-machine-learning-moderately-secure/variables.tf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/quickstart/201-machine-learning-moderately-secure/variables.tf b/quickstart/201-machine-learning-moderately-secure/variables.tf index bc226931..6a67c802 100644 --- a/quickstart/201-machine-learning-moderately-secure/variables.tf +++ b/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" { From 8d25835eab58a62407419a36e1aa2d01bddc975a Mon Sep 17 00:00:00 2001 From: Dennis Eikelenboom Date: Fri, 24 Sep 2021 12:15:24 -0700 Subject: [PATCH 5/6] Include public mode arg for completeness --- .../201-machine-learning-moderately-secure/workspace.tf | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/quickstart/201-machine-learning-moderately-secure/workspace.tf b/quickstart/201-machine-learning-moderately-secure/workspace.tf index 28ddee0a..a39982e9 100644 --- a/quickstart/201-machine-learning-moderately-secure/workspace.tf +++ b/quickstart/201-machine-learning-moderately-secure/workspace.tf @@ -55,12 +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 @@ -178,4 +181,4 @@ resource "azurerm_machine_learning_compute_cluster" "image-builder" { identity { type = "SystemAssigned" } -} \ No newline at end of file +} From 71e22e1e3b61e5ba77fc8189541a2b0c0dc312a0 Mon Sep 17 00:00:00 2001 From: Dennis Eikelenboom Date: Fri, 24 Sep 2021 12:16:23 -0700 Subject: [PATCH 6/6] Include public network access arg --- .../workspace.tf | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/quickstart/202-machine-learning-moderately-secure-existing-VNet/workspace.tf b/quickstart/202-machine-learning-moderately-secure-existing-VNet/workspace.tf index 79ede245..56bf85ba 100644 --- a/quickstart/202-machine-learning-moderately-secure-existing-VNet/workspace.tf +++ b/quickstart/202-machine-learning-moderately-secure-existing-VNet/workspace.tf @@ -59,7 +59,9 @@ 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 } @@ -181,4 +183,4 @@ resource "azurerm_machine_learning_compute_cluster" "image-builder" { identity { type = "SystemAssigned" } -} \ No newline at end of file +}