github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-07 03:03:59 +00:00
Code Issues Projects Releases Wiki Activity

Fix gce.getDiskByNameUnknownZone logic.

Browse Source
This commit is contained in:
Alex Robinson 2016-04-18 22:53:15 -07:00
parent 5abbc24a86
commit d69ccd5c8c
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/cloudprovider/providers/gce/gce.go
View File

@ -2245,6 +2245,11 @@ func (gce *GCECloud) getDiskByNameUnknownZone(diskName string) (*gceDisk, error)
if err != nil { if err != nil {
return nil, err 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 { if found != nil {
return nil, fmt.Errorf("GCE persistent disk name was found in multiple zones: %q", diskName) return nil, fmt.Errorf("GCE persistent disk name was found in multiple zones: %q", diskName)
} }