Commit fd559ee1 authored by Pengfei Ni's avatar Pengfei Ni

Fix panic for attaching AzureDisk to vmss nodes

parent 24bc761a
...@@ -34,7 +34,10 @@ func (ss *scaleSet) AttachDisk(isManagedDisk bool, diskName, diskURI string, nod ...@@ -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 ...@@ -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 ...@@ -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
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment