From b4009c5444b0996f7f7ba2a3e8a5025efd6143e2 Mon Sep 17 00:00:00 2001 From: Cheng Xing Date: Mon, 30 Apr 2018 13:31:54 -0700 Subject: [PATCH] GCE PD plugin now prevents attaching a regional PD PV with pdName of a regular PD --- pkg/cloudprovider/providers/gce/gce_disks.go | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkg/cloudprovider/providers/gce/gce_disks.go b/pkg/cloudprovider/providers/gce/gce_disks.go index 18b1c080932..c2320b76253 100644 --- a/pkg/cloudprovider/providers/gce/gce_disks.go +++ b/pkg/cloudprovider/providers/gce/gce_disks.go @@ -535,14 +535,10 @@ func (gce *GCECloud) AttachDisk(diskName string, nodeName types.NodeName, readOn if regional && utilfeature.DefaultFeatureGate.Enabled(features.GCERegionalPersistentDisk) { disk, err = gce.getRegionalDiskByName(diskName) if err != nil { - glog.V(5).Infof("Could not find regional PD named %q to Attach. Will look for a zonal PD", diskName) - err = nil - } else { - mc = newDiskMetricContextRegional("attach", gce.region) + return err } - } - - if disk == nil { + mc = newDiskMetricContextRegional("attach", gce.region) + } else { disk, err = gce.getDiskByName(diskName, instance.Zone) if err != nil { return err