Skip to content
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

Fix VMSS ILIP Upgrade #79

Merged
merged 3 commits into from
Sep 28, 2023
Merged

Fix VMSS ILIP Upgrade #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a4d687e
rename scenarios
mbrat2005 Sep 27, 2023
b1751e6
Merge branch 'main' of https://github.com/Azure/AzLoadBalancerMigrati…
mbrat2005 Sep 27, 2023
9cfb92e
ilip upgrade fix
mbrat2005 Sep 28, 2023
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 ...adBalancerUpgrade/module/AzureBasicLoadBalancerUpgrade/AzureBasicLoadBalancerUpgrade.psd1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
RootModule = 'AzureBasicLoadBalancerUpgrade'

# Version number of this module.
ModuleVersion = '2.1.2'
ModuleVersion = '2.1.3'

# Supported PSEditions
# CompatiblePSEditions = @()
Expand Down
4 changes: 2 additions & 2 deletions ...cLoadBalancerUpgrade/modules/VmssPublicIPConfigMigration/VmssPublicIPConfigMigration.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,13 @@ Function AddVmssPublicIPConfig {
ForEach ($nic in $refVmss.VirtualMachineProfile.NetworkProfile.NetworkInterfaceConfigurations) {
Foreach ($ipConfig in $nic.IpConfigurations) {
If ($null -ne $ipConfig.PublicIpAddressConfiguration) {
log -Message "[AddVMSSPublicIPConfig] Adding public IP address configuration '$($ipConfig.PublicIpAddressConfiguration.Name)' on IPConfig '$($ipConfig.Name)' on NIC '$($nic.Name)' pf VMSS '$($vmss.Name)'"
log -Message "[AddVMSSPublicIPConfig] Adding public IP address '$($ipConfig.PublicIpAddressConfiguration.Name)' on IPConfig '$($ipConfig.Name)' on NIC '$($nic.Name)' of VMSS '$($vmss.Name)'"

$vmssNic = $vmss.VirtualMachineProfile.NetworkProfile.NetworkInterfaceConfigurations | Where-Object {$_.Name -eq $nic.Name}
$vmssIpConfig = $vmssNic.IpConfigurations | Where-Object {$_.Name -eq $ipConfig.Name}

log -Message "[AddVMSSPublicIPConfig] Changing Public IP Address configuration SKU to Standard"
$ipConfig.PublicIpAddressConfiguration.Sku.Name = "Standard"
$ipConfig.PublicIpAddressConfiguration.Sku = [Microsoft.Azure.Management.Compute.Models.PublicIPAddressSku]::new('Standard')

$vmssIpConfig.PublicIpAddressConfiguration = $ipConfig.PublicIpAddressConfiguration

Expand Down
0 ...0-service-fabric-basic-lb-mr-rolling.json → ...0-service-fabric-basic-lb-mr-rolling.json
View file
Open in desktop
File renamed without changes.
0 ...tEnvs/scenarios/051-vmss-managed-sfc.json → ...tEnvs/scenarios/031-vmss-managed-sfc.json
View file
Open in desktop
File renamed without changes.
144 changes: 144 additions & 0 deletions AzureBasicLoadBalancerUpgrade/testEnvs/scenarios/032-vmss-automatic-os-upgrade-policy.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,144 @@
targetScope = 'subscription'
param randomGuid string = newGuid()
param location string
param resourceGroupName string


// Resource Group
module rg '../modules/Microsoft.Resources/resourceGroups/deploy.bicep' = {
name: '${resourceGroupName}-${location}'
params: {
name: resourceGroupName
location: location
}
}

// vnet
module virtualNetworks '../modules/Microsoft.Network/virtualNetworks/deploy.bicep' = {
name: '${uniqueString(deployment().name)}-virtualNetworks'
scope: resourceGroup(resourceGroupName)
params: {
// Required parameters
location: location
addressPrefixes: [
'10.0.0.0/16'
]
name: 'vnet-01'
subnets: [
{
name: 'subnet-01'
addressPrefix: '10.0.1.0/24'
}
]
}
dependsOn: [
rg
]
}

// basic lb
module loadbalancer '../modules/Microsoft.Network/loadBalancers_custom/deploy.bicep' = {
name: 'lb-basic-01'
scope: resourceGroup(resourceGroupName)
params: {
name: 'lb-basic-01'
location: location
frontendIPConfigurations: [
{
name: 'fe-01'
subnetId: virtualNetworks.outputs.subnetResourceIds[0]
}
]
backendAddressPools: [
{
name: 'be-01'
}
]
inboundNatRules: []
loadBalancerSku: 'Basic'
loadBalancingRules: [
{
backendAddressPoolName: 'be-01'
backendPort: 80
frontendIPConfigurationName: 'fe-01'
frontendPort: 80
idleTimeoutInMinutes: 4
loadDistribution: 'Default'
name: 'rule-01'
probeName: 'probe-01'
protocol: 'Tcp'
}
]
probes: [
{
intervalInSeconds: 5
name: 'probe-01'
numberOfProbes: 2
port: '80'
protocol: 'Tcp'
}
]
}
dependsOn: [
rg
]
}


module virtualMachineScaleSets '../modules/Microsoft.Compute/virtualMachineScaleSets_custom/deploy.bicep' = {
name: 'vmss-01'
scope: resourceGroup(resourceGroupName)
params: {
location: location
// Required parameters
encryptionAtHost: false
adminUsername: 'admin-vmss'
skuCapacity: 1
upgradePolicyMode:'Automatic'
enableAutomaticUpdates: false
enableAutomaticOSUpgrade: true
healthProbeId: '${loadbalancer.outputs.resourceId}/probes/probe-01'
imageReference: {
offer: 'WindowsServer'
publisher: 'MicrosoftWindowsServer'
sku: '2022-Datacenter'
version: 'latest'
}
name: 'vmss-01'
osDisk: {
createOption: 'fromImage'
diskSizeGB: '128'
managedDisk: {
storageAccountType: 'Standard_LRS'
}
}
osType: 'Windows'
skuName: 'Standard_DS1_v2'
// Non-required parameters
adminPassword: '${uniqueString(randomGuid)}rpP@340'
nicConfigurations: [
{
ipConfigurations: [
{
name: 'ipconfig1'
properties: {
subnet: {
id: virtualNetworks.outputs.subnetResourceIds[0]
}
loadBalancerBackendAddressPools: [
{
id: loadbalancer.outputs.backendpools[0].id
}
]
}
}
]
nicSuffix: '-nic-01'
}
]
}
dependsOn: [
rg
]
}

0 ...stEnvs/scenarios/040-std-lb-nat-pool.json → ...stEnvs/scenarios/033-std-lb-nat-pool.json
View file
Open in desktop
File renamed without changes.
165 changes: 165 additions & 0 deletions AzureBasicLoadBalancerUpgrade/testEnvs/scenarios/034-basic-lb-int-ilip.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,165 @@
targetScope = 'subscription'
param randomGuid string = newGuid()
param location string
param resourceGroupName string


// Resource Group
module rg '../modules/Microsoft.Resources/resourceGroups/deploy.bicep' = {
name: '${resourceGroupName}-${location}'
params: {
name: resourceGroupName
location: location
}
}

// vnet
module virtualNetworks '../modules/Microsoft.Network/virtualNetworks/deploy.bicep' = {
name: '${uniqueString(deployment().name)}-virtualNetworks'
scope: resourceGroup(resourceGroupName)
params: {
// Required parameters
location: location
addressPrefixes: [
'10.0.0.0/16'
]
name: 'vnet-01'
subnets: [
{
name: 'subnet-01'
addressPrefix: '10.0.1.0/24'
}
]
}
dependsOn: [
rg
]
}

// basic lb
module loadbalancer '../modules/Microsoft.Network/loadBalancers_custom/deploy.bicep' = {
name: 'lb-basic-01'
scope: resourceGroup(resourceGroupName)
params: {
name: 'lb-basic-01'
location: location
frontendIPConfigurations: [
{
name: 'fe-01'
subnetId: virtualNetworks.outputs.subnetResourceIds[0]
}
]
backendAddressPools: [
{
name: 'be-01'
}
]
inboundNatRules: []
loadBalancerSku: 'Basic'
loadBalancingRules: [
{
backendAddressPoolName: 'be-01'
backendPort: 80
frontendIPConfigurationName: 'fe-01'
frontendPort: 80
idleTimeoutInMinutes: 4
loadDistribution: 'Default'
name: 'rule-01'
probeName: 'probe-01'
protocol: 'Tcp'
}
]
probes: [
{
intervalInSeconds: 5
name: 'probe-01'
numberOfProbes: 2
port: '80'
protocol: 'Tcp'
}
]
}
dependsOn: [
rg
]
}


module storageAccounts '../modules/Microsoft.Storage/storageAccounts/deploy.bicep' = {
name: 'bootdiag-storage-01'
scope: resourceGroup(resourceGroupName)
params: {
name: 'bootdiag${uniqueString(deployment().name)}'
location: location
storageAccountSku: 'Standard_LRS'
storageAccountKind: 'StorageV2'
supportsHttpsTrafficOnly: true
}
dependsOn: [
rg
]
}

module virtualMachineScaleSets '../modules/Microsoft.Compute/virtualMachineScaleSets/deploy.bicep' = {
name: 'vmss-01'
scope: resourceGroup(resourceGroupName)
params: {
location: location
// Required parameters
encryptionAtHost: false
adminUsername: 'admin-lbmig'
skuCapacity: 1
upgradePolicyMode: 'Manual'
imageReference: {
offer: 'WindowsServer'
publisher: 'MicrosoftWindowsServer'
sku: '2022-Datacenter'
version: 'latest'
}
bootDiagnosticStorageAccountName: storageAccounts.outputs.name
name: 'vmss-01'
osDisk: {
createOption: 'fromImage'
diskSizeGB: '128'
managedDisk: {
storageAccountType: 'Standard_LRS'
}
}
osType: 'Windows'
skuName: 'Standard_DS1_v2'
// Non-required parameters
adminPassword: '${uniqueString(randomGuid)}rpP@340'
nicConfigurations: [
{
ipConfigurations: [
{
name: 'ipconfig1'
properties: {
subnet: {
id: virtualNetworks.outputs.subnetResourceIds[0]
}
loadBalancerBackendAddressPools: [
{
id: loadbalancer.outputs.backendpools[0].id
}
]
publicIPAddressConfiguration: {
name: 'publicipconfig1'
properties: {
idleTimeoutInMinutes: 4
dnsSettings: {
domainNameLabel: 'vmss-01'
}
}
}
}
}
]
nicSuffix: '-nic-01'
}
]
}
dependsOn: [
rg
]
}
0 ...testEnvs/scenarios/030-vms-many-fes.bicep → ...testEnvs/scenarios/100-vms-many-fes.bicep
View file
Open in desktop
File renamed without changes.
0 ...e/testEnvs/scenarios/031-vms-lb-int.bicep → ...e/testEnvs/scenarios/101-vms-lb-int.bicep
View file
Open in desktop
File renamed without changes.
0 ...vs/scenarios/032-vms-multivm-lb-int.bicep → ...vs/scenarios/102-vms-multivm-lb-int.bicep
View file
Open in desktop
File renamed without changes.
0 ...testEnvs/scenarios/033-vms-multi-be.bicep → ...testEnvs/scenarios/103-vms-multi-be.bicep
View file
Open in desktop
File renamed without changes.
0 ...e/testEnvs/scenarios/034-vms-lb-ext.bicep → ...e/testEnvs/scenarios/104-vms-lb-ext.bicep
View file
Open in desktop
File renamed without changes.
0 ...stEnvs/scenarios/035-vms-pip-lb-ext.bicep → ...stEnvs/scenarios/105-vms-pip-lb-ext.bicep
View file
Open in desktop
File renamed without changes.
0 ...narios/036-vms-multi-nic-pip-lb-ext.bicep → ...narios/106-vms-multi-nic-pip-lb-ext.bicep
View file
Open in desktop
File renamed without changes.
0 ...vs/scenarios/037-vms-nsg-nic-lb-ext.bicep → ...vs/scenarios/107-vms-nsg-nic-lb-ext.bicep
View file
Open in desktop
File renamed without changes.
0 ...scenarios/038-vms-nsg-subnet-lb-ext.bicep → ...scenarios/108-vms-nsg-subnet-lb-ext.bicep
View file
Open in desktop
File renamed without changes.
0 ...rios/039-vms-multivm-mix-pip-lb-ext.bicep → ...rios/109-vms-multivm-mix-pip-lb-ext.bicep
View file
Open in desktop
File renamed without changes.
0 ...testEnvs/scenarios/041-vms-multi-lb.bicep → ...testEnvs/scenarios/111-vms-multi-lb.bicep
View file
Open in desktop
File renamed without changes.