github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 20:53:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #94265 from andyzhangx/only-update-data-disk

Browse Source 
only update Azure data disks when attach/detach
This commit is contained in:
Kubernetes Prow Robot 2020-09-06 20:55:55 -07:00 committed by GitHub
commit 01e9ddac80
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
staging/src/k8s.io/legacy-cloud-providers/azure/azure_controller_standard.go
View File

@ -85,7 +85,6 @@ func (as *availabilitySet) AttachDisk(isManagedDisk bool, diskName, diskURI stri
newVM := compute.VirtualMachineUpdate{ newVM := compute.VirtualMachineUpdate{
VirtualMachineProperties: &compute.VirtualMachineProperties{ VirtualMachineProperties: &compute.VirtualMachineProperties{
HardwareProfile: vm.HardwareProfile,
StorageProfile: &compute.StorageProfile{ StorageProfile: &compute.StorageProfile{
DataDisks: &disks, DataDisks: &disks,
}, },
@ -155,7 +154,6 @@ func (as *availabilitySet) DetachDisk(diskName, diskURI string, nodeName types.N
newVM := compute.VirtualMachineUpdate{ newVM := compute.VirtualMachineUpdate{
VirtualMachineProperties: &compute.VirtualMachineProperties{ VirtualMachineProperties: &compute.VirtualMachineProperties{
HardwareProfile: vm.HardwareProfile,
StorageProfile: &compute.StorageProfile{ StorageProfile: &compute.StorageProfile{
DataDisks: &disks, DataDisks: &disks,
}, },

8
staging/src/k8s.io/legacy-cloud-providers/azure/azure_controller_vmss.go
View File

@ -85,12 +85,8 @@ func (ss *scaleSet) AttachDisk(isManagedDisk bool, diskName, diskURI string, nod
}) })
} }
newVM := compute.VirtualMachineScaleSetVM{ newVM := compute.VirtualMachineScaleSetVM{
Sku: vm.Sku,
Location: vm.Location,
VirtualMachineScaleSetVMProperties: &compute.VirtualMachineScaleSetVMProperties{ VirtualMachineScaleSetVMProperties: &compute.VirtualMachineScaleSetVMProperties{
HardwareProfile: vm.HardwareProfile,
StorageProfile: &compute.StorageProfile{ StorageProfile: &compute.StorageProfile{
OsDisk: vm.StorageProfile.OsDisk,
DataDisks: &disks, DataDisks: &disks,
}, },
}, },
@ -159,12 +155,8 @@ func (ss *scaleSet) DetachDisk(diskName, diskURI string, nodeName types.NodeName
} }
newVM := compute.VirtualMachineScaleSetVM{ newVM := compute.VirtualMachineScaleSetVM{
Sku: vm.Sku,
Location: vm.Location,
VirtualMachineScaleSetVMProperties: &compute.VirtualMachineScaleSetVMProperties{ VirtualMachineScaleSetVMProperties: &compute.VirtualMachineScaleSetVMProperties{
HardwareProfile: vm.HardwareProfile,
StorageProfile: &compute.StorageProfile{ StorageProfile: &compute.StorageProfile{
OsDisk: vm.StorageProfile.OsDisk,
DataDisks: &disks, DataDisks: &disks,
}, },
}, },