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

Jump to bottom

Revise subnet configuration for Machine Learning archetype #254

Merged
merged 8 commits into from
Apr 20, 2022
Merged

Revise subnet configuration for Machine Learning archetype #254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3c55b22
Remove oz, paz, rz, hrz subnets
SenthuranSivananthan Apr 14, 2022
b22d77f
Add branch config
SenthuranSivananthan Apr 14, 2022
53df573
Remove obsolete subnets from test runner
SenthuranSivananthan Apr 14, 2022
353fac3
Update schema changelog
SenthuranSivananthan Apr 14, 2022
23bd3a8
Update parameter descriptions
SenthuranSivananthan Apr 14, 2022
4a047a5
Remove branch config
SenthuranSivananthan Apr 14, 2022
cb30341
Merge branch 'main' of github.com:SenthuranSivananthan/CanadaPubSecAL…
SenthuranSivananthan Apr 20, 2022
b5a0924
Merge branch 'main' of github.com:SenthuranSivananthan/CanadaPubSecAL…
SenthuranSivananthan Apr 20, 2022
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
20 changes: 0 additions & 20 deletions ...dingZones/DevTest/8c6e48a4-4c73-4a1f-9f95-9447804f2c98_machinelearning_canadacentral.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,26 +143,6 @@
"10.6.0.0/16"
],
"subnets": {
"oz": {
"comments": "App Management Zone (OZ)",
"name": "oz",
"addressPrefix": "10.6.1.0/25"
},
"paz": {
"comments": "Presentation Zone (PAZ)",
"name": "paz",
"addressPrefix": "10.6.2.0/25"
},
"rz": {
"comments": "Application Zone (RZ)",
"name": "rz",
"addressPrefix": "10.6.3.0/25"
},
"hrz": {
"comments": "Data Zone (HRZ)",
"name": "hrz",
"addressPrefix": "10.6.4.0/25"
},
"sqlmi": {
"comments": "SQL Managed Instances Delegated Subnet",
"name": "sqlmi",
Expand Down
20 changes: 0 additions & 20 deletions ...dingZones/DevTest/ec6c5689-db04-4f1e-b76d-834a51dd0e27_machinelearning_canadacentral.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,26 +147,6 @@
"10.1.0.0/16"
],
"subnets": {
"oz": {
"comments": "App Management Zone (OZ)",
"name": "oz",
"addressPrefix": "10.1.1.0/25"
},
"paz": {
"comments": "Presentation Zone (PAZ)",
"name": "paz",
"addressPrefix": "10.1.2.0/25"
},
"rz": {
"comments": "Application Zone (RZ)",
"name": "rz",
"addressPrefix": "10.1.3.0/25"
},
"hrz": {
"comments": "Data Zone (HRZ)",
"name": "hrz",
"addressPrefix": "10.1.4.0/25"
},
"sqlmi": {
"comments": "SQL Managed Instances Delegated Subnet",
"name": "sqlmi",
Expand Down
20 changes: 0 additions & 20 deletions ...dingZones/DevTest/f08c3057-1713-4a6f-b7e6-0df355b60c30_machinelearning_canadacentral.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,26 +147,6 @@
"10.3.0.0/16"
],
"subnets": {
"oz": {
"comments": "App Management Zone (OZ)",
"name": "oz",
"addressPrefix": "10.3.1.0/25"
},
"paz": {
"comments": "Presentation Zone (PAZ)",
"name": "paz",
"addressPrefix": "10.3.2.0/25"
},
"rz": {
"comments": "Application Zone (RZ)",
"name": "rz",
"addressPrefix": "10.3.3.0/25"
},
"hrz": {
"comments": "Data Zone (HRZ)",
"name": "hrz",
"addressPrefix": "10.3.4.0/25"
},
"sqlmi": {
"comments": "SQL Managed Instances Delegated Subnet",
"name": "sqlmi",
Expand Down
20 changes: 0 additions & 20 deletions ...dingZones/DevTest/f459218a-e8bb-49c9-b768-ee6828a144aa_machinelearning_canadacentral.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,26 +148,6 @@
"10.4.0.0/16"
],
"subnets": {
"oz": {
"comments": "App Management Zone (OZ)",
"name": "oz",
"addressPrefix": "10.4.1.0/25"
},
"paz": {
"comments": "Presentation Zone (PAZ)",
"name": "paz",
"addressPrefix": "10.4.2.0/25"
},
"rz": {
"comments": "Application Zone (RZ)",
"name": "rz",
"addressPrefix": "10.4.3.0/25"
},
"hrz": {
"comments": "Data Zone (HRZ)",
"name": "hrz",
"addressPrefix": "10.4.4.0/25"
},
"sqlmi": {
"comments": "SQL Managed Instances Delegated Subnet",
"name": "sqlmi",
Expand Down
20 changes: 0 additions & 20 deletions docs/archetypes/machinelearning.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,26 +464,6 @@ This example configures:
"10.4.0.0/16"
],
"subnets": {
"oz": {
"comments": "App Management Zone (OZ)",
"name": "oz",
"addressPrefix": "10.4.1.0/25"
},
"paz": {
"comments": "Presentation Zone (PAZ)",
"name": "paz",
"addressPrefix": "10.4.2.0/25"
},
"rz": {
"comments": "Application Zone (RZ)",
"name": "rz",
"addressPrefix": "10.4.3.0/25"
},
"hrz": {
"comments": "Data Zone (HRZ)",
"name": "hrz",
"addressPrefix": "10.4.4.0/25"
},
"sqlmi": {
"comments": "SQL Managed Instances Delegated Subnet",
"name": "sqlmi",
Expand Down
2 changes: 1 addition & 1 deletion landingzones/lz-machinelearning/lz.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ param aml object
@description('Hub Network configuration that includes virtualNetworkId, rfc1918IPRange, rfc6598IPRange, egressVirtualApplianceIp, privateDnsManagedByHub flag, privateDnsManagedByHubSubscriptionId and privateDnsManagedByHubResourceGroupName.')
param hubNetwork object

@description('Network configuration. Includes peerToHubVirtualNetwork flag, useRemoteGateway flag, name, dnsServers, addressPrefixes and subnets (oz, paz, rz, hrz, privateEndpoints, sqlmi, databricksPublic, databricksPrivate, aks, appService) ')
@description('Network configuration. Includes peerToHubVirtualNetwork flag, useRemoteGateway flag, name, dnsServers, addressPrefixes and subnets (privateEndpoints, sqlmi, databricksPublic, databricksPrivate, aks, appService) ')
param network object

var sqldbPassword = sqldb.enabled && !sqldb.aadAuthenticationOnly ? '${uniqueString(rgStorage.id)}*${toUpper(uniqueString(sqldb.sqlAuthenticationUsername))}' : ''
Expand Down
2 changes: 1 addition & 1 deletion landingzones/lz-machinelearning/main.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ param aml object
param hubNetwork object

// Example (JSON)
@description('Network configuration. Includes peerToHubVirtualNetwork flag, useRemoteGateway flag, name, dnsServers, addressPrefixes and subnets (oz, paz, rz, hrz, privateEndpoints, sqlmi, databricksPublic, databricksPrivate, aks, appService) ')
@description('Network configuration. Includes peerToHubVirtualNetwork flag, useRemoteGateway flag, name, dnsServers, addressPrefixes and subnets (privateEndpoints, sqlmi, databricksPublic, databricksPrivate, aks, appService) ')
param network object

// Telemetry - Azure customer usage attribution
Expand Down
163 changes: 3 additions & 160 deletions landingzones/lz-machinelearning/networking.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,26 +53,6 @@ param hubNetwork object
// "10.2.0.0/16"
// ],
// "subnets": {
// "oz": {
// "comments": "App Management Zone (OZ)",
// "name": "oz",
// "addressPrefix": "10.2.1.0/25"
// },
// "paz": {
// "comments": "Presentation Zone (PAZ)",
// "name": "paz",
// "addressPrefix": "10.2.2.0/25"
// },
// "rz": {
// "comments": "Application Zone (RZ)",
// "name": "rz",
// "addressPrefix": "10.2.3.0/25"
// },
// "hrz": {
// "comments": "Data Zone (HRZ)",
// "name": "hrz",
// "addressPrefix": "10.2.4.0/25"
// },
// "privateEndpoints": {
// "comments": "Private Endpoints Subnet",
// "name": "privateendpoints",
Expand Down Expand Up @@ -120,26 +100,6 @@ param hubNetwork object
// '10.2.0.0/16'
// ]
// subnets: {
// oz: {
// comments: 'App Management Zone (OZ)'
// name: 'oz'
// addressPrefix: '10.2.1.0/25'
// }
// paz: {
// comments: 'Presentation Zone (PAZ)'
// name: 'paz'
// addressPrefix: '10.2.2.0/25'
// }
// rz: {
// comments: 'Application Zone (RZ)'
// name: 'rz'
// addressPrefix: '10.2.3.0/25'
// }
// hrz: {
// comments: 'Data Zone (HRZ)'
// name: 'hrz'
// addressPrefix: '10.2.4.0/25'
// }
// privateEndpoints: {
// comments: 'Private Endpoints Subnet'
// name: 'privateendpoints'
Expand Down Expand Up @@ -172,7 +132,7 @@ param hubNetwork object
// }
// }
// }
@description('Network configuration. Includes peerToHubVirtualNetwork flag, useRemoteGateway flag, name, dnsServers, addressPrefixes and subnets (oz, paz, rz, hrz, privateEndpoints, sqlmi, databricksPublic, databricksPrivate, aks, appService) ')
@description('Network configuration. Includes peerToHubVirtualNetwork flag, useRemoteGateway flag, name, dnsServers, addressPrefixes and subnets (privateEndpoints, sqlmi, databricksPublic, databricksPrivate, aks, appService) ')
param network object

var hubVnetIdSplit = split(hubNetwork.virtualNetworkId, '/')
Expand All @@ -181,7 +141,7 @@ var usingCustomDNSServers = length(network.dnsServers) > 0
var routesToHub = [
// Force Routes to Hub IPs (RFC1918 range) via FW despite knowing that route via peering
{
name: 'PrdSpokesUdrHubRFC1918FWRoute'
name: 'SpokeUdrHubRFC1918FWRoute'
properties: {
addressPrefix: hubNetwork.rfc1918IPRange
nextHopType: 'VirtualAppliance'
Expand All @@ -190,7 +150,7 @@ var routesToHub = [
}
// Force Routes to Hub IPs (CGNAT range) via FW despite knowing that route via peering
{
name: 'PrdSpokesUdrHubRFC6598FWRoute'
name: 'SpokeUdrHubRFC6598FWRoute'
properties: {
addressPrefix: hubNetwork.rfc6598IPRange
nextHopType: 'VirtualAppliance'
Expand All @@ -208,38 +168,6 @@ var routesToHub = [
]

// Network Security Groups
resource nsgOZ 'Microsoft.Network/networkSecurityGroups@2021-02-01' = {
name: '${network.subnets.oz.name}Nsg'
location: location
properties: {
securityRules: []
}
}

resource nsgPAZ 'Microsoft.Network/networkSecurityGroups@2021-02-01' = {
name: '${network.subnets.paz.name}Nsg'
location: location
properties: {
securityRules: []
}
}

resource nsgRZ 'Microsoft.Network/networkSecurityGroups@2021-02-01' = {
name: '${network.subnets.rz.name}Nsg'
location: location
properties: {
securityRules: []
}
}

resource nsgHRZ 'Microsoft.Network/networkSecurityGroups@2021-02-01' = {
name: '${network.subnets.hrz.name}Nsg'
location: location
properties: {
securityRules: []
}
}

module nsgDatabricks '../../azresources/network/nsg/nsg-databricks.bicep' = {
name: 'deploy-nsg-databricks'
params: {
Expand All @@ -265,40 +193,7 @@ module nsgAppService '../../azresources/network/nsg/nsg-empty.bicep' = {
}
}


// Route Tables
resource udrOZ 'Microsoft.Network/routeTables@2021-02-01' = {
name: '${network.subnets.oz.name}Udr'
location: location
properties: {
routes: network.peerToHubVirtualNetwork ? routesToHub : null
}
}

resource udrPAZ 'Microsoft.Network/routeTables@2021-02-01' = {
name: '${network.subnets.paz.name}Udr'
location: location
properties: {
routes: network.peerToHubVirtualNetwork ? routesToHub : null
}
}

resource udrRZ 'Microsoft.Network/routeTables@2021-02-01' = {
name: '${network.subnets.rz.name}Udr'
location: location
properties: {
routes: network.peerToHubVirtualNetwork ? routesToHub : null
}
}

resource udrHRZ 'Microsoft.Network/routeTables@2021-02-01' = {
name: '${network.subnets.hrz.name}Udr'
location: location
properties: {
routes: network.peerToHubVirtualNetwork ? routesToHub : null
}
}

resource udrAKS 'Microsoft.Network/routeTables@2021-02-01' = {
name: '${network.subnets.aks.name}Udr'
location: location
Expand Down Expand Up @@ -351,54 +246,6 @@ resource vnet 'Microsoft.Network/virtualNetworks@2021-02-01' = {
addressPrefixes: network.addressPrefixes
}
subnets: [
{
name: network.subnets.oz.name
properties: {
addressPrefix: network.subnets.oz.addressPrefix
routeTable: {
id: udrOZ.id
}
networkSecurityGroup: {
id: nsgOZ.id
}
}
}
{
name: network.subnets.paz.name
properties: {
addressPrefix: network.subnets.paz.addressPrefix
routeTable: {
id: udrPAZ.id
}
networkSecurityGroup: {
id: nsgPAZ.id
}
}
}
{
name: network.subnets.rz.name
properties: {
addressPrefix: network.subnets.rz.addressPrefix
routeTable: {
id: udrRZ.id
}
networkSecurityGroup: {
id: nsgRZ.id
}
}
}
{
name: network.subnets.hrz.name
properties: {
addressPrefix: network.subnets.hrz.addressPrefix
routeTable: {
id: udrHRZ.id
}
networkSecurityGroup: {
id: nsgHRZ.id
}
}
}
{
name: network.subnets.privateEndpoints.name
properties: {
Expand Down Expand Up @@ -701,10 +548,6 @@ module privatezone_aks '../../azresources/network/private-dns-zone.bicep' = {

output vnetId string = vnet.id

output ozSubnetId string = '${vnet.id}/subnets/${network.subnets.oz.name}'
output pazSubnetId string = '${vnet.id}/subnets/${network.subnets.paz.name}'
output rzSubnetId string = '${vnet.id}/subnets/${network.subnets.rz.name}'
output hrzId string = '${vnet.id}/subnets/${network.subnets.hrz.name}'
output privateEndpointSubnetId string = '${vnet.id}/subnets/${network.subnets.privateEndpoints.name}'
output sqlMiSubnetId string = '${vnet.id}/subnets/${network.subnets.sqlmi.name}'
output aksSubnetId string = '${vnet.id}/subnets/${network.subnets.aks.name}'
Expand Down
Loading