Skip to content

Commit cdce1c2

Browse files
authored
Merge pull request #204499 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents 28038e4 + 349175e commit cdce1c2

File tree

2 files changed

+17
-16
lines changed

2 files changed

+17
-16
lines changed

articles/virtual-machine-scale-sets/virtual-machine-scale-sets-automatic-upgrade.md

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -72,20 +72,29 @@ The following platform SKUs are currently supported (and more are added periodic
7272

7373
| Publisher | OS Offer | Sku |
7474
|-------------------------|---------------|--------------------|
75-
| MicrosoftWindowsServer | WindowsServer | 2012-R2-Datacenter |
76-
| MicrosoftWindowsServer | WindowsServer | 2016-Datacenter |
75+
| Canonical | UbuntuServer | 18.04-LTS |
76+
| Canonical | UbuntuServer | 18.04-LTS-Gen2 |
77+
| Canonical | UbuntuServer | 20.04-LTS |
78+
| Canonical | UbuntuServer | 20.04-LTS-Gen2 |
79+
| MicrosoftCblMariner | Cbl-Mariner | cbl-mariner-1 |
80+
| MicrosoftCblMariner | Cbl-Mariner | 1-Gen2 |
81+
| MicrosoftCblMariner | Cbl-Mariner | cbl-mariner-2
82+
| MicrosoftCblMariner | Cbl-Mariner | cbl-mariner-2-Gen2
83+
| MicrosoftWindowsServer | WindowsServer | 2012-R2-Datacenter |
84+
| MicrosoftWindowsServer | WindowsServer | 2016-Datacenter |
7785
| MicrosoftWindowsServer | WindowsServer | 2016-Datacenter-gensecond |
78-
| MicrosoftWindowsServer | WindowsServer | 2016-Datacenter-gs |
86+
| MicrosoftWindowsServer | WindowsServer | 2016-Datacenter-gs |
7987
| MicrosoftWindowsServer | WindowsServer | 2016-Datacenter-smalldisk |
80-
| MicrosoftWindowsServer | WindowsServer | 2016-Datacenter-with-containers |
88+
| MicrosoftWindowsServer | WindowsServer | 2016-Datacenter-with-Containers |
8189
| MicrosoftWindowsServer | WindowsServer | 2016-Datacenter-with-containers-gs |
8290
| MicrosoftWindowsServer | WindowsServer | 2019-Datacenter |
83-
| MicrosoftWindowsServer | WindowsServer | 2019-Datacenter-core |
84-
| MicrosoftWindowsServer | WindowsServer | 2019-Datacenter-core-with-containers |
91+
| MicrosoftWindowsServer | WindowsServer | 2019-Datacenter-Core |
92+
| MicrosoftWindowsServer | WindowsServer | 2019-Datacenter-Core-with-Containers |
8593
| MicrosoftWindowsServer | WindowsServer | 2019-Datacenter-gensecond |
8694
| MicrosoftWindowsServer | WindowsServer | 2019-Datacenter-gs |
8795
| MicrosoftWindowsServer | WindowsServer | 2019-Datacenter-smalldisk |
88-
| MicrosoftWindowsServer | WindowsServer | 2019-Datacenter-with-containers |
96+
| MicrosoftWindowsServer | WindowsServer | 2019-Datacenter-with-Containers |
97+
| MicrosoftWindowsServer | WindowsServer | 2012-R2-Datacenter |
8998
| MicrosoftWindowsServer | WindowsServer | 2019-Datacenter-with-containers-gs |
9099
| MicrosoftWindowsServer | WindowsServer | 2022-Datacenter |
91100
| MicrosoftWindowsServer | WindowsServer | 2022-Datacenter-smalldisk |
@@ -94,14 +103,6 @@ The following platform SKUs are currently supported (and more are added periodic
94103
| MicrosoftWindowsServer | WindowsServer | 2022-Datacenter-core-smalldisk |
95104
| MicrosoftWindowsServer | WindowsServer | 2022-Datacenter-g2 |
96105
| MicrosoftWindowsServer | WindowsServer | 2022-Datacenter-smalldisk-g2 |
97-
| Canonical | UbuntuServer | 20.04-LTS |
98-
| Canonical | UbuntuServer | 20.04-LTS-Gen2 |
99-
| Canonical | UbuntuServer | 18.04-LTS |
100-
| Canonical | UbuntuServer | 18.04-LTS-Gen2 |
101-
| MicrosoftCblMariner | Cbl-Mariner | cbl-mariner-1 |
102-
| MicrosoftCblMariner | Cbl-Mariner | 1-Gen2 |
103-
| MicrosoftCblMariner | Cbl-Mariner | cbl-mariner-2 |
104-
| MicrosoftCblMariner | Cbl-Mariner | cbl-mariner-2-Gen2 |
105106

106107

107108
## Requirements for configuring automatic OS image upgrade

articles/virtual-machine-scale-sets/virtual-machine-scale-sets-upgrade-scale-set.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ Let's say you have a scale set with an Azure Load Balancer, and you want to repl
418418
$vmss=Get-AzVmss -ResourceGroupName "myResourceGroup" -Name "myScaleSet"
419419
420420
# Create a local PowerShell object for the new desired IP configuration, which includes the reference to the application gateway
421-
$ipconf = New-AzVmssIPConfig "myNic" -ApplicationGatewayBackendAddressPoolsId /subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.Network/applicationGateways/{applicationGatewayName}/backendAddressPools/{applicationGatewayBackendAddressPoolName} -SubnetId $vmss.VirtualMachineProfile.NetworkProfile.NetworkInterfaceConfigurations[0].IpConfigurations[0].Subnet.Id Name $vmss.VirtualMachineProfile.NetworkProfile.NetworkInterfaceConfigurations[0].IpConfigurations[0].Name
421+
$ipconf = New-AzVmssIPConfig -ApplicationGatewayBackendAddressPoolsId /subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.Network/applicationGateways/{applicationGatewayName}/backendAddressPools/{applicationGatewayBackendAddressPoolName} -SubnetId $vmss.VirtualMachineProfile.NetworkProfile.NetworkInterfaceConfigurations[0].IpConfigurations[0].Subnet.Id -Name $vmss.VirtualMachineProfile.NetworkProfile.NetworkInterfaceConfigurations[0].IpConfigurations[0].Name
422422
423423
# Replace the existing IP configuration in the local PowerShell object (which contains the references to the current Azure Load Balancer) with the new IP configuration
424424
$vmss.VirtualMachineProfile.NetworkProfile.NetworkInterfaceConfigurations[0].IpConfigurations[0] = $ipconf

0 commit comments

Comments
 (0)