Skip to content

Commit ca36cf3

Browse files
ryhudryhud
committed
updating naming convention
1 parent 40caddf commit ca36cf3

2 files changed

Lines changed: 36 additions & 36 deletions

File tree

‎quickstart/201-machine-learning-moderately-secure/network.tf‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,24 @@ resource "azurerm_virtual_network" "default" {
66
resource_group_name = azurerm_resource_group.default.name
77
}
88

9-
resource "azurerm_subnet" "training-subnet" {
10-
name = "training-subnet"
9+
resource "azurerm_subnet" "snet-training" {
10+
name = "snet-training"
1111
resource_group_name = azurerm_resource_group.default.name
1212
virtual_network_name = azurerm_virtual_network.default.name
1313
address_prefixes = var.training_subnet_address_space
1414
enforce_private_link_endpoint_network_policies = true
1515
}
1616

17-
resource "azurerm_subnet" "aks-subnet" {
18-
name = "aks-subnet"
17+
resource "azurerm_subnet" "snet-aks" {
18+
name = "snet-aks"
1919
resource_group_name = azurerm_resource_group.default.name
2020
virtual_network_name = azurerm_virtual_network.default.name
2121
address_prefixes = var.aks_subnet_address_space
2222
enforce_private_link_endpoint_network_policies = true
2323
}
2424

25-
resource "azurerm_subnet" "ml-subnet" {
26-
name = "ml-subnet"
25+
resource "azurerm_subnet" "snet-workspace" {
26+
name = "snet-workspace"
2727
resource_group_name = azurerm_resource_group.default.name
2828
virtual_network_name = azurerm_virtual_network.default.name
2929
address_prefixes = var.ml_subnet_address_space
@@ -106,8 +106,8 @@ resource "azurerm_private_dns_zone_virtual_network_link" "vnetlinknbs" {
106106

107107
# Network Security Groups
108108

109-
resource "azurerm_network_security_group" "training-NSG" {
110-
name = "training-NSG"
109+
resource "azurerm_network_security_group" "nsg-training" {
110+
name = "nsg-training"
111111
location = azurerm_resource_group.default.location
112112
resource_group_name = azurerm_resource_group.default.name
113113

@@ -135,78 +135,78 @@ resource "azurerm_network_security_group" "training-NSG" {
135135
}
136136
}
137137

138-
resource "azurerm_subnet_network_security_group_association" "training-NSG-link" {
139-
subnet_id = azurerm_subnet.training-subnet.id
140-
network_security_group_id = azurerm_network_security_group.training-NSG.id
138+
resource "azurerm_subnet_network_security_group_association" "nsg-training-link" {
139+
subnet_id = azurerm_subnet.snet-training.id
140+
network_security_group_id = azurerm_network_security_group.nsg-training.id
141141
}
142142

143-
resource "azurerm_network_security_group" "aks-NSG" {
144-
name = "aks-NSG"
143+
resource "azurerm_network_security_group" "nsg-aks" {
144+
name = "nsg-aks"
145145
location = azurerm_resource_group.default.location
146146
resource_group_name = azurerm_resource_group.default.name
147147

148148

149149
}
150150

151-
resource "azurerm_subnet_network_security_group_association" "aks-NSG-link" {
152-
subnet_id = azurerm_subnet.aks-subnet.id
153-
network_security_group_id = azurerm_network_security_group.aks-NSG.id
151+
resource "azurerm_subnet_network_security_group_association" "nsg-aks-link" {
152+
subnet_id = azurerm_subnet.snet-aks.id
153+
network_security_group_id = azurerm_network_security_group.nsg-aks.id
154154
}
155155

156156
# User Defined Routes
157157

158158
#UDR for Compute instance and compute clusters
159-
resource "azurerm_route_table" "training-UDR" {
160-
name = "training-UDR"
159+
resource "azurerm_route_table" "rt-training" {
160+
name = "rt-training"
161161
location = azurerm_resource_group.default.location
162162
resource_group_name = azurerm_resource_group.default.name
163163
}
164164

165165
resource "azurerm_route" "training-Internet-Route" {
166166
name = "Internet"
167167
resource_group_name = azurerm_resource_group.default.name
168-
route_table_name = azurerm_route_table.training-UDR.name
168+
route_table_name = azurerm_route_table.rt-training.name
169169
address_prefix = "0.0.0.0/0"
170170
next_hop_type = "Internet"
171171
}
172172

173173
resource "azurerm_route" "training-AzureMLRoute" {
174174
name = "AzureMLRoute"
175175
resource_group_name = azurerm_resource_group.default.name
176-
route_table_name = azurerm_route_table.training-UDR.name
176+
route_table_name = azurerm_route_table.rt-training.name
177177
address_prefix = "AzureMachineLearning"
178178
next_hop_type = "Internet"
179179
}
180180

181181
resource "azurerm_route" "training-BatchRoute" {
182182
name = "BatchRoute"
183183
resource_group_name = azurerm_resource_group.default.name
184-
route_table_name = azurerm_route_table.training-UDR.name
184+
route_table_name = azurerm_route_table.rt-training.name
185185
address_prefix = "BatchNodeManagement"
186186
next_hop_type = "Internet"
187187
}
188188

189-
resource "azurerm_subnet_route_table_association" "training-UDRlink" {
190-
subnet_id = azurerm_subnet.training-subnet.id
191-
route_table_id = azurerm_route_table.training-UDR.id
189+
resource "azurerm_subnet_route_table_association" "rt-training-link" {
190+
subnet_id = azurerm_subnet.snet-training.id
191+
route_table_id = azurerm_route_table.rt-training.id
192192
}
193193
# Inferencing (AKS) Route
194194

195-
resource "azurerm_route_table" "aks-UDR" {
196-
name = "aks-UDR"
195+
resource "azurerm_route_table" "rt-aks" {
196+
name = "rt-aks"
197197
location = azurerm_resource_group.default.location
198198
resource_group_name = azurerm_resource_group.default.name
199199
}
200200

201201
resource "azurerm_route" "aks-Internet-Route" {
202202
name = "Internet"
203203
resource_group_name = azurerm_resource_group.default.name
204-
route_table_name = azurerm_route_table.aks-UDR.name
204+
route_table_name = azurerm_route_table.rt-aks.name
205205
address_prefix = "0.0.0.0/0"
206206
next_hop_type = "Internet"
207207
}
208208

209-
resource "azurerm_subnet_route_table_association" "aks-UDR-link" {
210-
subnet_id = azurerm_subnet.aks-subnet.id
211-
route_table_id = azurerm_route_table.aks-UDR.id
209+
resource "azurerm_subnet_route_table_association" "rt-aks-link" {
210+
subnet_id = azurerm_subnet.snet-aks.id
211+
route_table_id = azurerm_route_table.rt-aks.id
212212
}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ resource "azurerm_private_endpoint" "kv_ple" {
6161
name = "ple-${var.name}-${var.environment}-kv"
6262
location = azurerm_resource_group.default.location
6363
resource_group_name = azurerm_resource_group.default.name
64-
subnet_id = azurerm_subnet.ml-subnet.id
64+
subnet_id = azurerm_subnet.snet-workspace.id
6565

6666
private_dns_zone_group {
6767
name = "private-dns-zone-group"
@@ -80,7 +80,7 @@ resource "azurerm_private_endpoint" "st_ple_blob" {
8080
name = "ple-${var.name}-${var.environment}-st-blob"
8181
location = azurerm_resource_group.default.location
8282
resource_group_name = azurerm_resource_group.default.name
83-
subnet_id = azurerm_subnet.ml-subnet.id
83+
subnet_id = azurerm_subnet.snet-workspace.id
8484

8585
private_dns_zone_group {
8686
name = "private-dns-zone-group"
@@ -99,7 +99,7 @@ resource "azurerm_private_endpoint" "storage_ple_file" {
9999
name = "ple-${var.name}-${var.environment}-st-file"
100100
location = azurerm_resource_group.default.location
101101
resource_group_name = azurerm_resource_group.default.name
102-
subnet_id = azurerm_subnet.ml-subnet.id
102+
subnet_id = azurerm_subnet.snet-workspace.id
103103

104104
private_dns_zone_group {
105105
name = "private-dns-zone-group"
@@ -118,7 +118,7 @@ resource "azurerm_private_endpoint" "cr_ple" {
118118
name = "ple-${var.name}-${var.environment}-cr"
119119
location = azurerm_resource_group.default.location
120120
resource_group_name = azurerm_resource_group.default.name
121-
subnet_id = azurerm_subnet.ml-subnet.id
121+
subnet_id = azurerm_subnet.snet-workspace.id
122122

123123
private_dns_zone_group {
124124
name = "private-dns-zone-group"
@@ -137,7 +137,7 @@ resource "azurerm_private_endpoint" "mlw_ple" {
137137
name = "ple-${var.name}-${var.environment}-mlw"
138138
location = azurerm_resource_group.default.location
139139
resource_group_name = azurerm_resource_group.default.name
140-
subnet_id = azurerm_subnet.ml-subnet.id
140+
subnet_id = azurerm_subnet.snet-workspace.id
141141

142142
private_dns_zone_group {
143143
name = "private-dns-zone-group"
@@ -162,7 +162,7 @@ resource "azurerm_machine_learning_compute_cluster" "image-builder" {
162162
vm_priority = "LowPriority"
163163
vm_size = "Standard_DS2_v2"
164164
machine_learning_workspace_id = azurerm_machine_learning_workspace.default.id
165-
subnet_resource_id = azurerm_subnet.training-subnet.id
165+
subnet_resource_id = azurerm_subnet.snet-training.id
166166

167167
scale_settings {
168168
min_node_count = 0

0 commit comments

Comments
 (0)