Skip to content

Commit 6c82611

Browse files
author
Keshava Kandikonda
committed
Address reviewer feedback: preserve existing subnet ranges and cleanup
Use reference() function to read existing subnet addressPrefix instead of omitting it. Remove unused useExistingPrivateDnsZone parameter and update documentation.
1 parent bea2aaf commit 6c82611

File tree

2 files changed

+6
-29
lines changed

2 files changed

+6
-29
lines changed

ARM_Template_Create_WP/azuredeploy.json

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -211,32 +211,18 @@
211211
"description": "Set to false to skip subnet creation (useful when subnets already exist)"
212212
}
213213
},
214-
"vnetAddressPrefix": {
215-
"type": "string",
216-
"defaultValue": "10.0.0.0/16",
217-
"metadata": {
218-
"description": "Address space for the VNet (e.g., 10.0.0.0/16)"
219-
}
220-
},
221214
"subnetAddressForApp": {
222215
"type": "string",
223216
"defaultValue": "10.0.0.0/24",
224217
"metadata": {
225-
"description": "Address prefix for the App Service subnet (e.g., 10.0.0.0/24)"
218+
"description": "Address prefix for the App Service subnet when creating new subnets (createSubnets=true). When using existing subnets (createSubnets=false), this parameter is ignored and the existing subnet's address range is preserved. Example: 10.0.0.0/24"
226219
}
227220
},
228221
"subnetAddressForDb": {
229222
"type": "string",
230223
"defaultValue": "10.0.1.0/24",
231224
"metadata": {
232-
"description": "Address prefix for the Database subnet (e.g., 10.0.1.0/24)"
233-
}
234-
},
235-
"useExistingPrivateDnsZone": {
236-
"type": "bool",
237-
"defaultValue": false,
238-
"metadata": {
239-
"description": "Set to true to use an existing Private DNS Zone instead of creating a new one"
225+
"description": "Address prefix for the Database subnet when creating new subnets (createSubnets=true). When using existing subnets (createSubnets=false), this parameter is ignored and the existing subnet's address range is preserved. Example: 10.0.1.0/24"
240226
}
241227
}
242228
},
@@ -555,7 +541,7 @@
555541
"properties": {
556542
"addressSpace": {
557543
"addressPrefixes": [
558-
"[parameters('vnetAddressPrefix')]"
544+
"[variables('vnetAddress')]"
559545
]
560546
},
561547
"subnets": []
@@ -569,8 +555,6 @@
569555
"condition": "[parameters('createSubnets')]",
570556
"dependsOn": [
571557
],
572-
"resourceGroup": "[parameters('serverFarmResourceGroup')]",
573-
"subscriptionId": "[subscription().subscriptionId]",
574558
"properties": {
575559
"mode": "Incremental",
576560
"template": {
@@ -625,8 +609,6 @@
625609
"condition": "[and(parameters('useExistingVnet'), not(parameters('createSubnets')))]",
626610
"dependsOn": [
627611
],
628-
"resourceGroup": "[parameters('serverFarmResourceGroup')]",
629-
"subscriptionId": "[subscription().subscriptionId]",
630612
"properties": {
631613
"mode": "Incremental",
632614
"template": {
@@ -640,7 +622,7 @@
640622
"apiVersion": "2021-03-01",
641623
"name": "[format('{0}/{1}', parameters('vnetName'), parameters('subnetForApp'))]",
642624
"properties": {
643-
"addressPrefix": "[parameters('subnetAddressForApp')]",
625+
"addressPrefix": "[reference(resourceId(parameters('serverFarmResourceGroup'), 'Microsoft.Network/virtualNetworks/subnets', parameters('vnetName'), parameters('subnetForApp')), '2021-03-01').addressPrefix]",
644626
"delegations": [
645627
{
646628
"name": "dlg-appService",
@@ -656,7 +638,7 @@
656638
"apiVersion": "2021-03-01",
657639
"name": "[format('{0}/{1}',parameters('vnetName'), parameters('subnetForDb'))]",
658640
"properties": {
659-
"addressPrefix": "[parameters('subnetAddressForDb')]",
641+
"addressPrefix": "[reference(resourceId(parameters('serverFarmResourceGroup'), 'Microsoft.Network/virtualNetworks/subnets', parameters('vnetName'), parameters('subnetForDb')), '2021-03-01').addressPrefix]",
660642
"delegations": [
661643
{
662644
"name": "dlg-mysql",
@@ -1163,6 +1145,7 @@
11631145
"databaseVersion": "8.0.21",
11641146
"vnetDeploymentApiVersion": "2020-07-01",
11651147
"privateDnsApiVersion": "2018-09-01",
1148+
"vnetAddress": "10.0.0.0/23",
11661149
"blobApiVersion": "2021-08-01",
11671150
"storageAccountId": "[resourceId(parameters('storageAccountResourceGroup'),'Microsoft.Storage/storageAccounts', parameters('storageAccountName'))]",
11681151
"emailApiVersion": "2023-03-31",

ARM_Template_Create_WP/azuredeploy.parameters.json

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -203,17 +203,11 @@
203203
"createSubnets": {
204204
"value": true
205205
},
206-
"vnetAddressPrefix": {
207-
"value": "10.0.0.0/16"
208-
},
209206
"subnetAddressForApp": {
210207
"value": "10.0.0.0/24"
211208
},
212209
"subnetAddressForDb": {
213210
"value": "10.0.1.0/24"
214-
},
215-
"useExistingPrivateDnsZone": {
216-
"value": false
217211
}
218212
}
219213
}

0 commit comments

Comments
 (0)