Skip to content

VM NICS: Add ASG and LB input on VM Nic #1092

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

Merged
MariusStorhaug merged 8 commits into from
Mar 12, 2022
Merged

VM NICS: Add ASG and LB input on VM Nic #1092

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
f376bc9
Additions to NFS fileshares
Feb 28, 2022
26abd27
Added settings on ipConfiguration for nic to accept asg and LB
MariusStorhaug Mar 4, 2022
b97ebcc
Merge branch 'main' of https://github.com/Azure/ResourceModules into …
MariusStorhaug Mar 4, 2022
7d39536
Merge branch 'main' of https://github.com/Azure/ResourceModules into …
MariusStorhaug Mar 5, 2022
217b981
Merge branch 'main' of https://github.com/Azure/ResourceModules into …
MariusStorhaug Mar 5, 2022
d8180d9
Added support and test for ASG and LB
MariusStorhaug Mar 5, 2022
35c6d07
fix vm api
MariusStorhaug Mar 5, 2022
db2c3ca
dependency module change name
MariusStorhaug Mar 6, 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
2 changes: 1 addition & 1 deletion arm/.global/global.module.tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -847,7 +847,7 @@ Describe "API version tests [All apiVersions in the template should be 'recent']
}
}

It 'In [<moduleName>] used resource type [<resourceType>] should use on of the recent API version(s). Currently using [<TargetApi>]' -TestCases $TestCases {
It 'In [<moduleName>] used resource type [<resourceType>] should use one of the recent API version(s). Currently using [<TargetApi>]' -TestCases $TestCases {
param(
$moduleName,
$resourceType,
Expand Down
4 changes: 3 additions & 1 deletion arm/Microsoft.Compute/virtualMachines/.bicep/nested_networkInterface.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ module networkInterface_publicIPConfigurations 'nested_networkInterface_publicIP
}
}]

resource networkInterface 'Microsoft.Network/networkInterfaces@2021-03-01' = {
resource networkInterface 'Microsoft.Network/networkInterfaces@2021-05-01' = {
name: networkInterfaceName
location: location
tags: tags
Expand All @@ -73,6 +73,8 @@ resource networkInterface 'Microsoft.Network/networkInterfaces@2021-03-01' = {
subnet: {
id: ipConfiguration.subnetId
}
loadBalancerBackendAddressPools: contains(ipConfiguration, 'loadBalancerBackendAddressPools') ? ipConfiguration.loadBalancerBackendAddressPools : null
applicationSecurityGroups: contains(ipConfiguration, 'applicationSecurityGroups') ? ipConfiguration.applicationSecurityGroups : null
}
}]
}
Expand Down
12 changes: 11 additions & 1 deletion arm/Microsoft.Compute/virtualMachines/.parameters/linux.parameters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,17 @@
]
}
]
}
},
"loadBalancerBackendAddressPools": [
{
"id": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/loadBalancers/adp-<<namePrefix>>-az-lb-internal-001/backendAddressPools/servers"
}
],
"applicationSecurityGroups": [
{
"id": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/applicationSecurityGroups/adp-<<namePrefix>>-az-asg-x-001"
}
]
}
],
"roleAssignments": [
Expand Down
13 changes: 12 additions & 1 deletion arm/Microsoft.Compute/virtualMachines/.parameters/windows.parameters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,18 @@
]
}
]
}
},
"loadBalancerBackendAddressPools": [
{
"id": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/loadBalancers/adp-<<namePrefix>>-az-lb-internal-001/backendAddressPools/servers"
}
],
"applicationSecurityGroups": [
{
"id": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/applicationSecurityGroups/adp-<<namePrefix>>-az-asg-x-001"
}
]

}
],
"roleAssignments": [
Expand Down