Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Try to fix 301-machine-learning-hub-spoke-secure #308

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Try to fix 301-machine-learning-hub-spoke-secure #308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d22be1d
Fix 301-machine-learning-hub-spoke-secure
neil-yechenwei Nov 14, 2023
1c87d07
update code
neil-yechenwei Nov 15, 2023
8e04382
update code
neil-yechenwei Nov 15, 2023
5df4e97
update code
neil-yechenwei Nov 15, 2023
a7dac1f
update code
neil-yechenwei Nov 16, 2023
2b0832a
Merge remote-tracking branch 'upstream/master' into fixtfexamplemachi…
neil-yechenwei Jan 5, 2024
81b87ca
try to fix
lonegunmanb Jan 5, 2024
41b6e0d
add random suffix, change rg name
lonegunmanb Jan 5, 2024
e99a105
add random suffix, change rg name
lonegunmanb Jan 5, 2024
419557b
downgrade vm disk type
lonegunmanb Jan 5, 2024
1aa4dfd
try to fix
Jan 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions quickstart/301-machine-learning-hub-spoke-secure/azure-firewall.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ resource "random_string" "fw_diag_prefix" {
length = 8
upper = false
special = false
number = false
numeric = false
}
resource "azurerm_ip_group" "ip_group_hub" {
name = "hub-ipgroup"
Expand Down Expand Up @@ -48,6 +48,8 @@ resource "azurerm_firewall" "azure_firewall_instance" {
location = azurerm_resource_group.default.location
resource_group_name = azurerm_resource_group.hub_rg.name
firewall_policy_id = azurerm_firewall_policy.base_policy.id
sku_name = "AZFW_VNet"
sku_tier = "Standard"

ip_configuration {
name = "configuration"
Expand Down Expand Up @@ -158,10 +160,12 @@ resource "azurerm_firewall_policy_rule_collection_group" "azure_firewall_rules_c
port = 80
}
source_ip_groups = [azurerm_ip_group.ip_group_spoke.id]
destination_fqdns = ["crl.microsoft.com",
destination_fqdns = [
"crl.microsoft.com",
"mscrl.microsoft.com",
"crl3.digicert.com",
"ocsp.digicert.com"]
"ocsp.digicert.com"
]
}

rule {
Expand Down Expand Up @@ -205,10 +209,12 @@ resource "azurerm_firewall_policy_rule_collection_group" "azure_firewall_rules_c
port = 443
}
source_ip_groups = [azurerm_ip_group.ip_group_spoke.id]
destination_fqdns = ["acs-mirror.azureedge.net",
destination_fqdns = [
"acs-mirror.azureedge.net",
"*.docker.io",
"production.cloudflare.docker.com",
"*.azurecr.io"]
"*.azurecr.io"
]
}

rule {
Expand Down Expand Up @@ -487,4 +493,4 @@ resource "azurerm_firewall_policy_rule_collection_group" "azure_firewall_rules_c
azurerm_ip_group.ip_group_hub,
azurerm_ip_group.ip_group_spoke
]
}
}
2 changes: 1 addition & 1 deletion quickstart/301-machine-learning-hub-spoke-secure/compute.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ resource "azurerm_machine_learning_compute_instance" "compute_instance" {
name = "${random_string.ci_prefix.result}instance"
location = azurerm_resource_group.default.location
machine_learning_workspace_id = azurerm_machine_learning_workspace.default.id
virtual_machine_size = "STANDARD_DS2_V2"
virtual_machine_size = "STANDARD_D2_V2"
subnet_resource_id = azurerm_subnet.snet-training.id

depends_on = [
Expand Down
4 changes: 2 additions & 2 deletions quickstart/301-machine-learning-hub-spoke-secure/dsvm.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ resource "azurerm_windows_virtual_machine" "dsvm" {
network_interface_ids = [
azurerm_network_interface.dsvm.id
]
size = "Standard_DS3_v2"
size = "Standard_D1_v2"

source_image_reference {
publisher = "microsoft-dsvm"
Expand All @@ -29,7 +29,7 @@ resource "azurerm_windows_virtual_machine" "dsvm" {
os_disk {
name = "osdisk-${var.dsvm_name}"
caching = "ReadWrite"
storage_account_type = "Premium_LRS"
storage_account_type = "Standard_LRS"
}

identity {
Expand Down
18 changes: 12 additions & 6 deletions quickstart/301-machine-learning-hub-spoke-secure/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,29 +4,35 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "=2.78.0"
version = ">=2.78.0"
}

azureml = {
source = "registry.terraform.io/Telemaco019/azureml"
source = "registry.terraform.io/orobix/azureml"
}
}
}

provider "azurerm" {
features {}
features {
resource_group {
prevent_deletion_if_contains_resources = false
}
}
}

data "azurerm_client_config" "current" {}

resource "random_pet" "pet" {}

resource "azurerm_resource_group" "default" {
name = "rg-${var.name}-${var.environment}"
name = "301mlhss-${var.name}-${var.environment}-${random_pet.pet.id}"
location = var.location
}

#Hub Resource Group
resource "azurerm_resource_group" "hub_rg" {
name = "rg-hub-${var.name}-${var.environment}"
name = "301mlhss-hub-${var.name}-${var.environment}-${random_pet.pet.id}"
location = var.location

}
}
4 changes: 3 additions & 1 deletion quickstart/301-machine-learning-hub-spoke-secure/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
variable "name" {
type = string
description = "Name of the deployment"
default = "exampleml"
}

variable "environment" {
Expand Down Expand Up @@ -89,5 +90,6 @@ variable "dsvm_admin_username" {
variable "dsvm_host_password" {
type = string
description = "Password for the admin username of the Data Science VM"
default = "ChangeMe123!"
sensitive = true
}
}
16 changes: 11 additions & 5 deletions quickstart/301-machine-learning-hub-spoke-secure/workspace.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ resource "azurerm_application_insights" "default" {
}

resource "azurerm_key_vault" "default" {
name = "kv-${var.name}-${var.environment}"
name = substr("kv-${var.name}-${var.environment}-${random_pet.pet.id}", 0, 24)
location = azurerm_resource_group.default.location
resource_group_name = azurerm_resource_group.default.name
tenant_id = data.azurerm_client_config.current.tenant_id
Expand All @@ -21,8 +21,14 @@ resource "azurerm_key_vault" "default" {
}
}

resource "random_string" "suffix" {
length = 6
upper = false
special = false
}

resource "azurerm_storage_account" "default" {
name = "st${var.name}${var.environment}"
name = "st${var.name}${var.environment}${random_string.suffix.result}"
location = azurerm_resource_group.default.location
resource_group_name = azurerm_resource_group.default.name
account_tier = "Standard"
Expand All @@ -36,7 +42,7 @@ resource "azurerm_storage_account" "default" {
}

resource "azurerm_container_registry" "default" {
name = "cr${var.name}${var.environment}"
name = "cr${var.name}${var.environment}${random_string.suffix.result}"
location = azurerm_resource_group.default.location
resource_group_name = azurerm_resource_group.default.name
sku = "Premium"
Expand All @@ -50,7 +56,7 @@ resource "azurerm_container_registry" "default" {

# Machine Learning workspace
resource "azurerm_machine_learning_workspace" "default" {
name = "mlw-${var.name}-${var.environment}"
name = "mlw-${var.name}-${var.environment}${random_string.suffix.result}"
location = azurerm_resource_group.default.location
resource_group_name = azurerm_resource_group.default.name
application_insights_id = azurerm_application_insights.default.id
Expand All @@ -65,7 +71,7 @@ resource "azurerm_machine_learning_workspace" "default" {
# Args of use when using an Azure Private Link configuration
public_network_access_enabled = false
image_build_compute_name = var.image_build_compute_name
depends_on = [
depends_on = [
azurerm_firewall.azure_firewall_instance,
azurerm_private_endpoint.kv_ple,
azurerm_private_endpoint.st_ple_blob,
Expand Down
Loading