Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
29 changes: 28 additions & 1 deletion .github/workflows/platform.dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -340,6 +340,33 @@ jobs:
managementGroupId: '${{ secrets.ARM_MGMTGROUP_ID }}'
removeDeployment: '${{ env.removeDeployment }}'

job_deploy_udr:
runs-on: ubuntu-20.04
name: 'Deploy sqlmi route tables'
env:
namespace: 'Microsoft.Network\routeTables'
needs:
- job_deploy_rg
strategy:
fail-fast: false
matrix:
parameterFilePaths: ['parameters.json']
steps:
- name: 'Checkout'
uses: actions/checkout@v2
with:
fetch-depth: 0
- name: 'Deploy module'
uses: ./.github/actions/templates/deployModule
with:
templateFilePath: 'arm/${{ env.namespace }}/deploy.bicep'
parameterFilePath: '${{ env.dependencyPath }}/${{ env.namespace }}/parameters/${{ matrix.parameterFilePaths }}'
location: '${{ env.defaultLocation }}'
resourceGroupName: '${{ env.resourceGroupName }}'
subscriptionId: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
managementGroupId: '${{ secrets.ARM_MGMTGROUP_ID }}'
removeDeployment: '${{ env.removeDeployment }}'

job_deploy_sqlmi_udr:
runs-on: ubuntu-20.04
name: 'Deploy sqlmi route tables'
Expand All @@ -351,7 +378,7 @@ jobs:
strategy:
fail-fast: false
matrix:
parameterFilePaths: ['parameters.json']
parameterFilePaths: ['sqlMi.parameters.json']
steps:
- name: 'Checkout'
uses: actions/checkout@v2
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
"contentVersion": "1.0.0.0",
"parameters": {
"name": {
"value": "sxx-az-vnet-min-001"
},
"addressPrefixes": {
"value": [
"10.0.0.0/16"
]
},
"subnets": {
"value": [
{
"name": "default",
"addressPrefix": "10.0.0.0/16"
}
]
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,66 +19,18 @@
{
"name": "sxx-az-subnet-x-001",
"addressPrefix": "10.0.0.0/24",
"networkSecurityGroupName": "",
"routeTableName": "",
"networkSecurityGroupName": "adp-sxx-az-nsg-x-001",
"serviceEndpoints": [
{
"service": "Microsoft.EventHub"
},
{
"service": "Microsoft.Sql"
},
{
"service": "Microsoft.Storage"
},
{
"service": "Microsoft.KeyVault"
}
"Microsoft.EventHub",
"Microsoft.Sql",
"Microsoft.Storage",
"Microsoft.KeyVault"
],
"delegations": []
"routeTableName": "adp-sxx-az-udr-x-001"
},
{
"name": "sxx-az-subnet-x-002",
"addressPrefix": "10.0.1.0/24",
"networkSecurityGroupName": "",
"routeTableName": "",
"serviceEndpoints": [
{
"service": "Microsoft.EventHub"
},
{
"service": "Microsoft.Sql"
},
{
"service": "Microsoft.Storage"
},
{
"service": "Microsoft.KeyVault"
}
],
"delegations": []
},
{
"name": "sxx-az-subnet-x-003",
"addressPrefix": "10.0.2.0/24",
"networkSecurityGroupName": "",
"routeTableName": "",
"serviceEndpoints": [],
"delegations": [
{
"name": "sqlMiDel",
"properties": {
"serviceName": "Microsoft.Sql/managedInstances"
}
}
]
},
{
"name": "sxx-az-subnet-x-004",
"addressPrefix": "10.0.3.0/24",
"networkSecurityGroupName": "",
"routeTableName": "",
"serviceEndpoints": [],
"delegations": [
{
"name": "netappDel",
Expand All @@ -89,29 +41,9 @@
]
},
{
"name": "AzureFirewallSubnet",
"addressPrefix": "10.0.4.0/24",
"networkSecurityGroupName": "",
"routeTableName": "",
"serviceEndpoints": [],
"delegations": []
},
{
"name": "AzureBastionSubnet",
"addressPrefix": "10.0.5.0/24",
"networkSecurityGroupName": "",
"routeTableName": "",
"serviceEndpoints": [],
"delegations": []
},
{
"name": "sxx-az-subnet-x-005",
"name": "sxx-az-subnet-x-003",
"addressPrefix": "10.0.6.0/24",
"networkSecurityGroupName": "",
"routeTableName": "",
"serviceEndpoints": [],
"delegations": [],
"privateEndpointNetworkPolicies": "Disabled", // This property must be set to disabled for subnets that contain private endpoints. It confirms that NSGs rules will not apply to private endpoints (currently not supported). Default Value when not specified is "Enabled".
"privateEndpointNetworkPolicies": "Disabled",
"privateLinkServiceNetworkPolicies": "Enabled"
}
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,116 +3,18 @@
"contentVersion": "1.0.0.0",
"parameters": {
"name": {
"value": "sxx-az-vnet-x-001"
"value": "sxx-az-vnet-peer-x-002"
},
"addressPrefixes": {
"value": [
"10.0.0.0/16"
"10.0.0.0/24"
]
},
"subnets": {
"value": [
{
"name": "GatewaySubnet",
"addressPrefix": "10.0.255.0/24"
},
{
"name": "sxx-az-subnet-x-001",
"addressPrefix": "10.0.0.0/24",
"networkSecurityGroupName": "",
"routeTableName": "",
"serviceEndpoints": [
{
"service": "Microsoft.EventHub"
},
{
"service": "Microsoft.Sql"
},
{
"service": "Microsoft.Storage"
},
{
"service": "Microsoft.KeyVault"
}
],
"delegations": []
},
{
"name": "sxx-az-subnet-x-002",
"addressPrefix": "10.0.1.0/24",
"networkSecurityGroupName": "",
"routeTableName": "",
"serviceEndpoints": [
{
"service": "Microsoft.EventHub"
},
{
"service": "Microsoft.Sql"
},
{
"service": "Microsoft.Storage"
},
{
"service": "Microsoft.KeyVault"
}
],
"delegations": []
},
{
"name": "sxx-az-subnet-x-003",
"addressPrefix": "10.0.2.0/24",
"networkSecurityGroupName": "",
"routeTableName": "",
"serviceEndpoints": [],
"delegations": [
{
"name": "sqlMiDel",
"properties": {
"serviceName": "Microsoft.Sql/managedInstances"
}
}
]
},
{
"name": "sxx-az-subnet-x-004",
"addressPrefix": "10.0.3.0/24",
"networkSecurityGroupName": "",
"routeTableName": "",
"serviceEndpoints": [],
"delegations": [
{
"name": "netappDel",
"properties": {
"serviceName": "Microsoft.Netapp/volumes"
}
}
]
},
{
"name": "AzureFirewallSubnet",
"addressPrefix": "10.0.4.0/24",
"networkSecurityGroupName": "",
"routeTableName": "",
"serviceEndpoints": [],
"delegations": []
},
{
"name": "AzureBastionSubnet",
"addressPrefix": "10.0.5.0/24",
"networkSecurityGroupName": "",
"routeTableName": "",
"serviceEndpoints": [],
"delegations": []
},
{
"name": "sxx-az-subnet-x-005",
"addressPrefix": "10.0.6.0/24",
"networkSecurityGroupName": "",
"routeTableName": "",
"serviceEndpoints": [],
"delegations": [],
"privateEndpointNetworkPolicies": "Disabled", // This property must be set to disabled for subnets that contain private endpoints. It confirms that NSGs rules will not apply to private endpoints (currently not supported). Default Value when not specified is "Enabled".
"privateLinkServiceNetworkPolicies": "Enabled"
"addressPrefix": "10.0.0.0/26"
}
]
},
Expand All @@ -123,17 +25,11 @@
"allowForwardedTraffic": true,
"allowGatewayTransit": false,
"allowVirtualNetworkAccess": true,
"useRemoteGateways": false
}
]
},
"roleAssignments": {
"value": [
{
"roleDefinitionIdOrName": "Reader",
"principalIds": [
"<<deploymentSpId>>"
]
"useRemoteGateways": false,
"remotePeeringEnabled": true,
"remotePeeringName": "customName",
"remotePeeringAllowVirtualNetworkAccess": true,
"remotePeeringAllowForwardedTraffic": true
}
]
},
Expand Down
Loading