Merge pull request #24491 from a-robinson/automated-cherry-pick-of-#2…

…4452-upstream-release-1.2 Automated cherry pick of #24452 upstream release 1.2
kubernetes · Apr 19, 2016 · f2d4b68 · f2d4b68
2 parents 15f1165 + 193ad31
commit f2d4b68
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/pkg/cloudprovider/providers/gce/gce.go b/pkg/cloudprovider/providers/gce/gce.go
@@ -2220,6 +2220,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)
 		}