From 23b6b46cf21767eb5571b7024b771b42246f2c5f Mon Sep 17 00:00:00 2001 From: Abrar Shivani Date: Tue, 3 Apr 2018 11:56:27 -0700 Subject: [PATCH] Detach bug fix --- pkg/cloudprovider/providers/vsphere/vsphere.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkg/cloudprovider/providers/vsphere/vsphere.go b/pkg/cloudprovider/providers/vsphere/vsphere.go index 4835306d156..3f98d51d4e9 100644 --- a/pkg/cloudprovider/providers/vsphere/vsphere.go +++ b/pkg/cloudprovider/providers/vsphere/vsphere.go @@ -780,6 +780,11 @@ func (vs *VSphere) DetachDisk(volPath string, nodeName k8stypes.NodeName) error defer cancel() vsi, err := vs.getVSphereInstance(nodeName) if err != nil { + // If node doesn't exist, disk is already detached from node. + if err == vclib.ErrNoVMFound { + glog.Infof("Node %q does not exist, disk %s is already detached from node.", convertToString(nodeName), volPath) + return nil + } return err } // Ensure client is logged in and session is valid