github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #77199 from andyzhangx/automated-cherry-pick-of-#77187-upstream-release-1.14 

Automated cherry pick of #77187: fix disk list corruption issue
pull/564/head
Kubernetes Prow Robot 2019-04-30 15:39:09 -07:00 committed by GitHub
parent 8c00490d9b c01eca5802
commit d88be4d966
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/cloudprovider/providers/azure/azure_controller_standard.go
View File

@ -40,7 +40,9 @@ func (as *availabilitySet) AttachDisk(isManagedDisk bool, diskName, diskURI stri
return err return err
} }
disks := *vm.StorageProfile.DataDisks disks := make([]compute.DataDisk, len(*vm.StorageProfile.DataDisks))
copy(disks, *vm.StorageProfile.DataDisks)
if isManagedDisk { if isManagedDisk {
disks = append(disks, disks = append(disks,
compute.DataDisk{ compute.DataDisk{
@ -112,7 +114,9 @@ func (as *availabilitySet) DetachDiskByName(diskName, diskURI string, nodeName t
return err return err
} }
disks := *vm.StorageProfile.DataDisks disks := make([]compute.DataDisk, len(*vm.StorageProfile.DataDisks))
copy(disks, *vm.StorageProfile.DataDisks)
bFoundDisk := false bFoundDisk := false
for i, disk := range disks { for i, disk := range disks {
if disk.Lun != nil && (disk.Name != nil && diskName != "" && *disk.Name == diskName) || if disk.Lun != nil && (disk.Name != nil && diskName != "" && *disk.Name == diskName) ||

6
pkg/cloudprovider/providers/azure/azure_controller_vmss.go
View File

@ -42,7 +42,8 @@ func (ss *scaleSet) AttachDisk(isManagedDisk bool, diskName, diskURI string, nod
disks := []compute.DataDisk{} disks := []compute.DataDisk{}
if vm.StorageProfile != nil && vm.StorageProfile.DataDisks != nil { if vm.StorageProfile != nil && vm.StorageProfile.DataDisks != nil {
disks = *vm.StorageProfile.DataDisks disks = make([]compute.DataDisk, len(*vm.StorageProfile.DataDisks))
copy(disks, *vm.StorageProfile.DataDisks)
} }
if isManagedDisk { if isManagedDisk {
disks = append(disks, disks = append(disks,
@ -117,7 +118,8 @@ func (ss *scaleSet) DetachDiskByName(diskName, diskURI string, nodeName types.No
disks := []compute.DataDisk{} disks := []compute.DataDisk{}
if vm.StorageProfile != nil && vm.StorageProfile.DataDisks != nil { if vm.StorageProfile != nil && vm.StorageProfile.DataDisks != nil {
disks = *vm.StorageProfile.DataDisks disks = make([]compute.DataDisk, len(*vm.StorageProfile.DataDisks))
copy(disks, *vm.StorageProfile.DataDisks)
} }
bFoundDisk := false bFoundDisk := false
for i, disk := range disks { for i, disk := range disks {