Skip to content

Commit

Permalink
Revise subnet configuration for Healthcare archetype (Azure#256)
Browse files Browse the repository at this point in the history
  • Loading branch information
@SenthuranSivananthan
SenthuranSivananthan authored Apr 20, 2022
1 parent 72fe50d commit 1ee5b9e
Show file tree
Hide file tree
Showing 23 changed files with 10 additions and 538 deletions.
20 changes: 0 additions & 20 deletions ...c/LandingZones/DevTest/82f7705e-3386-427b-95b7-cbed91ab29a7_healthcare_canadacentral.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,26 +125,6 @@
"10.5.0.0/16"
],
"subnets": {
"oz": {
"comments": "App Management Zone (OZ)",
"name": "oz",
"addressPrefix": "10.5.1.0/25"
},
"paz": {
"comments": "Presentation Zone (PAZ)",
"name": "paz",
"addressPrefix": "10.5.2.0/25"
},
"rz": {
"comments": "Application Zone (RZ)",
"name": "rz",
"addressPrefix": "10.5.3.0/25"
},
"hrz": {
"comments": "Data Zone (HRZ)",
"name": "hrz",
"addressPrefix": "10.5.4.0/25"
},
"databricksPublic": {
"comments": "Databricks Public Delegated Subnet",
"name": "databrickspublic",
Expand Down
22 changes: 1 addition & 21 deletions docs/archetypes/healthcare.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ The scripts are:
2. Set up a compute instance and import the provided tests to the workspace
3. Run the test script, which will build a Docker Azure ML model image, push it to ACR, and then AKS to pull and run the ML model

### Azure Deployment
## Azure Deployment

### Schema Definition

Expand Down Expand Up @@ -435,26 +435,6 @@ This example configures:
"10.5.0.0/16"
],
"subnets": {
"oz": {
"comments": "App Management Zone (OZ)",
"name": "oz",
"addressPrefix": "10.5.1.0/25"
},
"paz": {
"comments": "Presentation Zone (PAZ)",
"name": "paz",
"addressPrefix": "10.5.2.0/25"
},
"rz": {
"comments": "Application Zone (RZ)",
"name": "rz",
"addressPrefix": "10.5.3.0/25"
},
"hrz": {
"comments": "Data Zone (HRZ)",
"name": "hrz",
"addressPrefix": "10.5.4.0/25"
},
"databricksPublic": {
"comments": "Databricks Public Delegated Subnet",
"name": "databrickspublic",
Expand Down
2 changes: 1 addition & 1 deletion landingzones/lz-healthcare/lz.bicep
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ param synapse 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, databricksPublic, databricksPrivate, web) ')
@description('Network configuration. Includes peerToHubVirtualNetwork flag, useRemoteGateway flag, name, dnsServers, addressPrefixes and subnets (privateEndpoints, databricksPublic, databricksPrivate, web) ')
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-healthcare/main.bicep
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ param synapse 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, databricksPublic, databricksPrivate, web) ')
@description('Network configuration. Includes peerToHubVirtualNetwork flag, useRemoteGateway flag, name, dnsServers, addressPrefixes and subnets (privateEndpoints, databricksPublic, databricksPrivate, web) ')
param network object

// Telemetry - Azure customer usage attribution
Expand Down
164 changes: 5 additions & 159 deletions landingzones/lz-healthcare/networking.bicep
View file
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 @@ -109,26 +89,6 @@ param hubNetwork object
// '10.2.0.0/16'
// ]
// subnets: {
// oz: {
// comments: 'App Management Zone (OZ)'
// name: 'oz'
// addressPrefix: '10.21.0/25'
// }
// paz: {
// comments: 'Presentation Zone (PAZ)'
// name: 'paz'
// addressPrefix: '10.22.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'
// }
// databricksPublic: {
// comments: 'Databricks Public Delegated Subnet'
// name: 'databrickspublic'
Expand All @@ -151,16 +111,17 @@ param hubNetwork object
// }
// }
// }
@description('Network configuration. Includes peerToHubVirtualNetwork flag, useRemoteGateway flag, name, dnsServers, addressPrefixes and subnets (oz, paz, rz, hrz, privateEndpoints, databricksPublic, databricksPrivate, web) ')
@description('Network configuration. Includes peerToHubVirtualNetwork flag, useRemoteGateway flag, name, dnsServers, addressPrefixes and subnets (privateEndpoints, databricksPublic, databricksPrivate, web) ')
param network object

var hubVnetIdSplit = split(hubNetwork.virtualNetworkId, '/')
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 @@ -169,7 +130,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 @@ -185,40 +146,9 @@ 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 @@ -241,38 +171,6 @@ module nsgWebApp '../../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
}
}

module udrDatabricksPublic '../../azresources/network/udr/udr-databricks-public.bicep' = {
name: 'deploy-route-table-databricks-public'
params: {
Expand Down Expand Up @@ -313,54 +211,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 @@ -678,10 +528,6 @@ module privatezone_synapse_sql '../../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 webAppSubnetId string = '${vnet.id}/subnets/${network.subnets.web.name}'

Expand Down
16 changes: 0 additions & 16 deletions schemas/latest/landingzones/lz-healthcare.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -218,18 +218,6 @@
"type": "object",
"additionalProperties": false,
"properties": {
"oz": {
"$ref": "#/definitions/Subnet"
},
"paz": {
"$ref": "#/definitions/Subnet"
},
"rz": {
"$ref": "#/definitions/Subnet"
},
"hrz": {
"$ref": "#/definitions/Subnet"
},
"databricksPublic": {
"$ref": "#/definitions/Subnet"
},
Expand All @@ -244,10 +232,6 @@
}
},
"required": [
"oz",
"paz",
"rz",
"hrz",
"databricksPublic",
"databricksPrivate",
"privateEndpoints",
Expand Down
2 changes: 2 additions & 0 deletions schemas/latest/readme.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@

* Removed 4 subnets from Machine Learning archetype's virtual network: `oz`, `paz`, `rz` and `hrz`.

* Removed 4 subnets from Healthcare archetype's virtual network: `oz`, `paz`, `rz` and `hrz`.

* Schema definition for Hub Networking archetypes (Azure Firewall & NVA). See documentation:

* [Hub Networking with Azure Firewall](../../docs/archetypes/hubnetwork-azfw.md)
Expand Down
20 changes: 0 additions & 20 deletions tests/landingzones/lz-healthcare/deployment-tests/test-runner.bicep
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,26 +125,6 @@ module test '../../../../landingzones/lz-healthcare/main.bicep' = {
'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'
}
databricksPublic: {
comments: 'Databricks Public Delegated Subnet'
name: 'databrickspublic'
Expand Down
Loading

0 comments on commit 1ee5b9e

Please sign in to comment.