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

GCE PD plugin now prevents attaching a regional PD PV with pdName of a regular PD

Browse Source
This commit is contained in:
Cheng Xing 2018-04-30 13:31:54 -07:00
parent b36743fe30
commit b4009c5444
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/cloudprovider/providers/gce/gce_disks.go
View File

@ -535,14 +535,10 @@ func (gce *GCECloud) AttachDisk(diskName string, nodeName types.NodeName, readOn
if regional && utilfeature.DefaultFeatureGate.Enabled(features.GCERegionalPersistentDisk) { if regional && utilfeature.DefaultFeatureGate.Enabled(features.GCERegionalPersistentDisk) {
disk, err = gce.getRegionalDiskByName(diskName) disk, err = gce.getRegionalDiskByName(diskName)
if err != nil { if err != nil {
glog.V(5).Infof("Could not find regional PD named %q to Attach. Will look for a zonal PD", diskName) return err
err = nil
} else {
mc = newDiskMetricContextRegional("attach", gce.region)
} }
} mc = newDiskMetricContextRegional("attach", gce.region)
} else {
if disk == nil {
disk, err = gce.getDiskByName(diskName, instance.Zone) disk, err = gce.getDiskByName(diskName, instance.Zone)
if err != nil { if err != nil {
return err return err