From d69ccd5c8cccd70830892b6824a6c1d566a116bb Mon Sep 17 00:00:00 2001 From: Alex Robinson Date: Mon, 18 Apr 2016 22:53:15 -0700 Subject: [PATCH] Fix gce.getDiskByNameUnknownZone logic. --- pkg/cloudprovider/providers/gce/gce.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkg/cloudprovider/providers/gce/gce.go b/pkg/cloudprovider/providers/gce/gce.go index c23da8ee3de..af40aed1dc5 100644 --- a/pkg/cloudprovider/providers/gce/gce.go +++ b/pkg/cloudprovider/providers/gce/gce.go @@ -2245,6 +2245,11 @@ func (gce *GCECloud) getDiskByNameUnknownZone(diskName string) (*gceDisk, error) if err != nil { return nil, err } + // findDiskByName returns (nil,nil) if the disk doesn't exist, so we can't + // assume that a disk was found unless disk is non-nil. + if disk == nil { + continue + } if found != nil { return nil, fmt.Errorf("GCE persistent disk name was found in multiple zones: %q", diskName) }