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

Merge pull request #32265 from lojies/errmodify 

Automatic merge from submit-queue

modify error return

err is nil here,chage it to fmt.Errorf("cannot find SCSI controller in VM")
pull/6/head
Kubernetes Submit Queue 2016-09-13 01:16:03 -07:00 committed by GitHub
parent f7bea5d8fd d45dfda425
commit 8a56b6b27c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/cloudprovider/providers/vsphere/vsphere.go
View File

@ -695,10 +695,10 @@ func (vs *VSphere) AttachDisk(vmDiskPath string, nodeName string) (diskID string
scsiController = getSCSIController(vmDevices, vs.cfg.Disk.SCSIControllerType)
if scsiController == nil {
glog.Errorf("cannot find SCSI controller in VM - %v", err)
glog.Errorf("cannot find SCSI controller in VM")
// attempt clean up of scsi controller
cleanUpController(newSCSIController, vmDevices, vm, ctx)
return "", "", err
return "", "", fmt.Errorf("cannot find SCSI controller in VM")
}
newSCSICreated = true
}