From 5053063ddb054079aeb04aa191dc6a4929cf2624 Mon Sep 17 00:00:00 2001 From: andyzhangx Date: Thu, 27 Aug 2020 00:43:16 +0000 Subject: [PATCH] only update Azure data disks when attach/detach --- .../azure/azure_controller_standard.go | 2 -- .../legacy-cloud-providers/azure/azure_controller_vmss.go | 8 -------- 2 files changed, 10 deletions(-) diff --git a/staging/src/k8s.io/legacy-cloud-providers/azure/azure_controller_standard.go b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_controller_standard.go index 54ca4f880ff..a9d824f9e94 100644 --- a/staging/src/k8s.io/legacy-cloud-providers/azure/azure_controller_standard.go +++ b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_controller_standard.go @@ -85,7 +85,6 @@ func (as *availabilitySet) AttachDisk(isManagedDisk bool, diskName, diskURI stri newVM := compute.VirtualMachineUpdate{ VirtualMachineProperties: &compute.VirtualMachineProperties{ - HardwareProfile: vm.HardwareProfile, StorageProfile: &compute.StorageProfile{ DataDisks: &disks, }, @@ -155,7 +154,6 @@ func (as *availabilitySet) DetachDisk(diskName, diskURI string, nodeName types.N newVM := compute.VirtualMachineUpdate{ VirtualMachineProperties: &compute.VirtualMachineProperties{ - HardwareProfile: vm.HardwareProfile, StorageProfile: &compute.StorageProfile{ DataDisks: &disks, }, diff --git a/staging/src/k8s.io/legacy-cloud-providers/azure/azure_controller_vmss.go b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_controller_vmss.go index 344e4f03d4a..4e1d65cc2b0 100644 --- a/staging/src/k8s.io/legacy-cloud-providers/azure/azure_controller_vmss.go +++ b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_controller_vmss.go @@ -85,12 +85,8 @@ func (ss *scaleSet) AttachDisk(isManagedDisk bool, diskName, diskURI string, nod }) } newVM := compute.VirtualMachineScaleSetVM{ - Sku: vm.Sku, - Location: vm.Location, VirtualMachineScaleSetVMProperties: &compute.VirtualMachineScaleSetVMProperties{ - HardwareProfile: vm.HardwareProfile, StorageProfile: &compute.StorageProfile{ - OsDisk: vm.StorageProfile.OsDisk, DataDisks: &disks, }, }, @@ -159,12 +155,8 @@ func (ss *scaleSet) DetachDisk(diskName, diskURI string, nodeName types.NodeName } newVM := compute.VirtualMachineScaleSetVM{ - Sku: vm.Sku, - Location: vm.Location, VirtualMachineScaleSetVMProperties: &compute.VirtualMachineScaleSetVMProperties{ - HardwareProfile: vm.HardwareProfile, StorageProfile: &compute.StorageProfile{ - OsDisk: vm.StorageProfile.OsDisk, DataDisks: &disks, }, },