github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 14:37:00 +00:00
Code Issues Projects Releases Wiki Activity

Fix panic for attaching AzureDisk to vmss nodes

Browse Source
This commit is contained in:
Pengfei Ni 2018-04-28 15:48:39 +08:00
parent 24bc761aec
commit fd559ee165
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,7 +34,10 @@ func (ss *scaleSet) AttachDisk(isManagedDisk bool, diskName, diskURI string, nod
return err return err
} }
disks := *vm.StorageProfile.DataDisks disks := []compute.DataDisk{}
if vm.StorageProfile != nil && vm.StorageProfile.DataDisks != nil {
disks = *vm.StorageProfile.DataDisks
}
if isManagedDisk { if isManagedDisk {
disks = append(disks, disks = append(disks,
compute.DataDisk{ compute.DataDisk{
@ -95,7 +98,10 @@ func (ss *scaleSet) DetachDiskByName(diskName, diskURI string, nodeName types.No
return err return err
} }
disks := *vm.StorageProfile.DataDisks disks := []compute.DataDisk{}
if vm.StorageProfile != nil && vm.StorageProfile.DataDisks != nil {
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) ||
@ -144,7 +150,7 @@ func (ss *scaleSet) GetDataDisks(nodeName types.NodeName) ([]compute.DataDisk, e
return nil, err return nil, err
} }
if vm.StorageProfile.DataDisks == nil { if vm.StorageProfile == nil || vm.StorageProfile.DataDisks == nil {
return nil, nil return nil, nil
} }