Skip to content

Commit e926556

Browse files
author
Dany Contreras
committed
updates
1 parent f53891d commit e926556

File tree

4 files changed

+37
-27
lines changed

4 files changed

+37
-27
lines changed

‎workload/arm/deploy-baseline.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"_generator": {
66
"name": "bicep",
77
"version": "0.33.93.31351",
8-
"templateHash": "7757439101299686233"
8+
"templateHash": "4711751862376592155"
99
},
1010
"name": "AVD Accelerator - Baseline Deployment",
1111
"description": "AVD Accelerator - Deployment Baseline",
@@ -26673,7 +26673,7 @@
2667326673
"_generator": {
2667426674
"name": "bicep",
2667526675
"version": "0.33.93.31351",
26676-
"templateHash": "1250311981651125075"
26676+
"templateHash": "15598155563920004753"
2667726677
},
2667826678
"name": "AVD LZA storage",
2667926679
"description": "This module deploys storage account, azure files. domain join logic",
@@ -26920,7 +26920,7 @@
2692026920
"accessTier": {
2692126921
"value": "Hot"
2692226922
},
26923-
"networkAcls": "[if(parameters('deployPrivateEndpoint'), createObject('value', createObject('bypass', 'AzureServices', 'defaultAction', 'Deny', 'virtualNetworkRules', createArray(), 'ipRules', createArray())), createObject('value', createObject('bypass', 'AzureServices', 'defaultAction', 'Deny', 'virtualNetworkRules', createArray(createObject('id', parameters('vmsSubnetId'), 'action', 'Allow')), 'ipRules', createArray())))]",
26923+
"networkAcls": "[if(parameters('deployPrivateEndpoint'), createObject('value', createObject('bypass', 'AzureServices', 'defaultAction', 'Deny', 'virtualNetworkRules', createArray(), 'ipRules', createArray())), createObject('value', createObject()))]",
2692426924
"fileServices": {
2692526925
"value": {
2692626926
"shares": [
@@ -29631,7 +29631,7 @@
2963129631
"_generator": {
2963229632
"name": "bicep",
2963329633
"version": "0.33.93.31351",
29634-
"templateHash": "1250311981651125075"
29634+
"templateHash": "15598155563920004753"
2963529635
},
2963629636
"name": "AVD LZA storage",
2963729637
"description": "This module deploys storage account, azure files. domain join logic",
@@ -29878,7 +29878,7 @@
2987829878
"accessTier": {
2987929879
"value": "Hot"
2988029880
},
29881-
"networkAcls": "[if(parameters('deployPrivateEndpoint'), createObject('value', createObject('bypass', 'AzureServices', 'defaultAction', 'Deny', 'virtualNetworkRules', createArray(), 'ipRules', createArray())), createObject('value', createObject('bypass', 'AzureServices', 'defaultAction', 'Deny', 'virtualNetworkRules', createArray(createObject('id', parameters('vmsSubnetId'), 'action', 'Allow')), 'ipRules', createArray())))]",
29881+
"networkAcls": "[if(parameters('deployPrivateEndpoint'), createObject('value', createObject('bypass', 'AzureServices', 'defaultAction', 'Deny', 'virtualNetworkRules', createArray(), 'ipRules', createArray())), createObject('value', createObject()))]",
2988229882
"fileServices": {
2988329883
"value": {
2988429884
"shares": [

‎workload/bicep/deploy-baseline.bicep

+17-8
Original file line numberDiff line numberDiff line change
@@ -1213,14 +1213,23 @@ module wrklKeyVault '../../avm/1.0.0/res/key-vault/vault/main.bicep' = {
12131213
sku: varWrklKeyVaultSku
12141214
softDeleteRetentionInDays: 7
12151215
publicNetworkAccess: deployPrivateEndpointKeyvaultStorage ? 'Disabled' : 'Enabled'
1216-
networkAcls: deployPrivateEndpointKeyvaultStorage
1217-
? {
1218-
bypass: 'AzureServices'
1219-
defaultAction: 'Deny'
1220-
virtualNetworkRules: []
1221-
ipRules: []
1222-
}
1223-
: {}
1216+
networkAcls: deployPrivateEndpointKeyvaultStorage ? {
1217+
bypass: 'AzureServices'
1218+
defaultAction: 'Deny'
1219+
virtualNetworkRules: []
1220+
ipRules: []
1221+
} : {}
1222+
// }: {
1223+
// bypass: 'AzureServices'
1224+
// defaultAction: 'Deny'
1225+
// virtualNetworkRules: [
1226+
// {
1227+
// id: createAvdVnet ? '${networking.outputs.virtualNetworkResourceId}/subnets/${varVnetAvdSubnetName}' : existingVnetAvdSubnetResourceId
1228+
// action: 'Allow'
1229+
// }
1230+
// ]
1231+
// ipRules: []
1232+
// }
12241233
privateEndpoints: deployPrivateEndpointKeyvaultStorage
12251234
? [
12261235
{

‎workload/bicep/modules/storageAzureFiles/deploy.bicep

+12-11
Original file line numberDiff line numberDiff line change
@@ -155,17 +155,18 @@ module storageAndFile '../../../../avm/1.0.0/res/storage/storage-account/main.bi
155155
defaultAction: 'Deny'
156156
virtualNetworkRules: []
157157
ipRules: []
158-
}: {
159-
bypass: 'AzureServices'
160-
defaultAction: 'Deny'
161-
virtualNetworkRules: [
162-
{
163-
id: vmsSubnetId
164-
action: 'Allow'
165-
}
166-
]
167-
ipRules: []
168-
}
158+
} : {}
159+
// }: {
160+
// bypass: 'AzureServices'
161+
// defaultAction: 'Deny'
162+
// virtualNetworkRules: [
163+
// {
164+
// id: vmsSubnetId
165+
// action: 'Allow'
166+
// }
167+
// ]
168+
// ipRules: []
169+
// }
169170
fileServices: {
170171
shares: [
171172
{

‎workload/portal-ui/portal-ui-baseline.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -2521,9 +2521,9 @@
25212521
"avdVmLocalUserName": "[steps('identity').identityLocalCredentials.identityLocalUserName]",
25222522
"avdVmLocalUserPassword": "[steps('identity').identityLocalCredentials.identityLocalUserPassword.password]",
25232523
"createAvdVnet": "[steps('network').createAvdVirtualNetwork]",
2524-
"avdVnetworkAddressPrefixes": "[if(equals(steps('network').createAvdVirtualNetwork, true), steps('network').virtualNetworkSize, '10.10.1.0/24')]",
2525-
"vNetworkAvdSubnetAddressPrefix": "[if(equals(steps('network').createAvdVirtualNetwork, true), steps('network').virtualNetworkAvdSubnetSize, '10.10.2.0/27')]",
2526-
"vNetworkPrivateEndpointSubnetAddressPrefix": "[if(and(equals(steps('network').createAvdVirtualNetwork, true), equals(steps('network').deployPrivateEndpointKeyvaultStorage, true)), steps('network').virtualNetworkPrivateEndpointSubnetSize, '10.10.1.0/27')]",
2524+
"avdVnetworkAddressPrefixes": "[if(equals(steps('network').createAvdVirtualNetwork, true), steps('network').virtualNetworkSize, '10.10.0.0/16')]",
2525+
"vNetworkAvdSubnetAddressPrefix": "[if(equals(steps('network').createAvdVirtualNetwork, true), steps('network').virtualNetworkAvdSubnetSize, '10.10.1.0/24')]",
2526+
"vNetworkPrivateEndpointSubnetAddressPrefix": "[if(and(equals(steps('network').createAvdVirtualNetwork, true), equals(steps('network').deployPrivateEndpointKeyvaultStorage, true)), steps('network').virtualNetworkPrivateEndpointSubnetSize, '10.10.2.0/27')]",
25272527
"customDnsIps": "[if(equals(steps('network').createAvdVirtualNetwork, true), steps('network').virtualNetworkDns, '')]",
25282528
"existingHubVnetResourceId": "[if(equals(steps('network').createAvdVirtualNetwork, true), steps('network').hubVirtualNetworkPeering.existingHubVirtualNetwork, '')]",
25292529
"vNetworkGatewayOnHub": "[if(equals(steps('network').createAvdVirtualNetwork, true), steps('network').hubVirtualNetworkPeering.hubVirtualNetworkGateway, false)]",

0 commit comments

Comments
 (0)