Skip to content

Commit be2da81

Browse files
committed
Merge branch 'ryhud' of https://github.com/denniseik/terraform into ryhud
2 parents b52527c + 1631260 commit be2da81

File tree

2 files changed

+23
-4
lines changed

2 files changed

+23
-4
lines changed

quickstart/202-machine-learning-moderately-secure-existing-VNet/readme.md

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ To learn more about security configurations in Azure Machine Learning, see [Ente
2525
| `azurerm_private_dns_zone` | Private DNS Zones for FQDNs required for Azure Machine Learning and associated resources |
2626
| `azurerm_private_dns_zone_virtual_network_link` | Virtual network links of the Private DNS Zones to the virtual network resource |
2727
| `azurerm_private_endpoint` | Private Endpoints for the Azure Machine Learning workspace and associated resources |
28+
| `azurerm_machine_learning_compute_instance` | An Azure Machine Learning compute instance a single-node managed compute. |
29+
| `azurerm_machine_learning_compute_cluster` | An Azure Machine Learning compute cluster as multi-node shared and managed compute. |
30+
| `azurerm_network_security_group` | Network security group with required inbound and outbound rules for Azure Machine Learning. |
31+
2832

2933
## Variables
3034

@@ -33,7 +37,16 @@ To learn more about security configurations in Azure Machine Learning, see [Ente
3337
| name | Name of the deployment |
3438
| environment | The deployment environment name (used for pre- and postfixing resource names) |
3539
| location | The Azure region used for deployments |
36-
40+
| image_build_compute_name | Name of the compute cluster to be created and set to build docker images |
41+
| training_subnet_resource_id | Resource ID of the existing training subnet |
42+
| aks_subnet_resource_id | Resource ID of the existing aks subnet |
43+
| ml_subnet_resource_id | Resource ID of the existing ML workspace subnet |
44+
| privatelink_api_azureml_ms_resource_id | Resource ID of the existing privatelink.api.azureml.ms private dns zone |
45+
| privatelink_azurecr_io_resource_id | Resource ID of the existing privatelink.azurecr.io private dns zone |
46+
| privatelink_notebooks_azure_net_resource_id | Resource ID of the existing privatelink.notebooks.azure.net private dns zone |
47+
| privatelink_blob_core_windows_net_resource_id | Resource ID of the existing privatelink.blob.core.windows.net private dns zone |
48+
| privatelink_file_core_windows_net_resource_id | Resource ID of the existing privatelink.file.core.windows.net private dns zone |
49+
| privatelink_vaultcore_azure_net_resource_id | Resource ID of the existing privatelink.vaultcore.azure.net private dns zone |
3750

3851
## Usage
3952

@@ -42,3 +55,9 @@ terraform plan -var name=azureml567 -out demo.tfplan
4255

4356
terraform apply "demo.tfplan"
4457
```
58+
59+
## Learn more
60+
61+
- If you are new to Azure Machine Learning, see [Azure Machine Learning service](https://azure.microsoft.com/services/machine-learning-service/) and [Azure Machine Learning documentation](https://docs.microsoft.com/azure/machine-learning/).
62+
- To learn more about security configurations in Azure Machine Learning, see [Enterprise security and governance for Azure Machine Learning](https://docs.microsoft.com/en-us/azure/machine-learning/concept-enterprise-security).
63+
- For all configurations of Azure Machine Learning in Terraform, see [Terraform Hashicorp AzureRM provider documentation](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/machine_learning_workspace).

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,9 @@ resource "azurerm_private_endpoint" "mlw_ple" {
159159
is_manual_connection = false
160160
}
161161
}
162-
#Compute cluster for image building https://docs.microsoft.com/en-us/azure/machine-learning/tutorial-create-secure-workspace#configure-image-builds
163162

163+
# Compute cluster for image building required since the workspace is behind a vnet.
164+
# For more details, see https://docs.microsoft.com/en-us/azure/machine-learning/tutorial-create-secure-workspace#configure-image-builds.
164165
resource "azurerm_machine_learning_compute_cluster" "image-builder" {
165166
name = "${var.image_build_compute_name}"
166167
location = azurerm_resource_group.default.location
@@ -172,7 +173,7 @@ resource "azurerm_machine_learning_compute_cluster" "image-builder" {
172173
scale_settings {
173174
min_node_count = 0
174175
max_node_count = 1
175-
scale_down_nodes_after_idle_duration = "PT30S" # 30 seconds
176+
scale_down_nodes_after_idle_duration = "PT15M" # 15 minutes
176177
}
177178

178179
identity {
@@ -181,7 +182,6 @@ resource "azurerm_machine_learning_compute_cluster" "image-builder" {
181182
}
182183

183184
# Update workspace for image-build-compute
184-
185185
resource "null_resource" "ws_image_build_compute"{
186186
provisioner "local-exec" {
187187
command = <<EOF

0 commit comments

Comments
 (0)