Skip to content

Commit

Permalink
Merge pull request kubernetes#102118 from feiskyer/automated-cherry-p…
Browse files Browse the repository at this point in the history
…ick-of-#102005-upstream-release-1.20

Automated cherry pick of kubernetes#102005: Azure: avoid setting cached Sku when updating VMSS and VMSS
  • Loading branch information
k8s-ci-robot authored Jun 8, 2021
2 parents f646410 + 5c0f874 commit bf0f8cb
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions staging/src/k8s.io/legacy-cloud-providers/azure/azure_vmss.go
Original file line number Diff line number Diff line change
Expand Up @@ -1175,7 +1175,6 @@ func (ss *scaleSet) ensureVMSSInPool(service *v1.Service, nodes []*v1.Node, back
})
primaryIPConfig.LoadBalancerBackendAddressPools = &loadBalancerBackendAddressPools
newVMSS := compute.VirtualMachineScaleSet{
Sku: vmss.Sku,
Location: vmss.Location,
VirtualMachineScaleSetProperties: &compute.VirtualMachineScaleSetProperties{
VirtualMachineProfile: &compute.VirtualMachineScaleSetVMProfile{
Expand Down Expand Up @@ -1488,7 +1487,6 @@ func (ss *scaleSet) ensureBackendPoolDeletedFromVMSS(service *v1.Service, backen
// Compose a new vmss with added backendPoolID.
primaryIPConfig.LoadBalancerBackendAddressPools = &newBackendPools
newVMSS := compute.VirtualMachineScaleSet{
Sku: vmss.Sku,
Location: vmss.Location,
VirtualMachineScaleSetProperties: &compute.VirtualMachineScaleSetProperties{
VirtualMachineProfile: &compute.VirtualMachineScaleSetVMProfile{
Expand Down

0 comments on commit bf0f8cb

Please sign in to comment.