Merge pull request #41034 from rootfs/gce-instance

Automatic merge from submit-queue (batch tested with PRs 41337, 41375, 41363, 41034, 41350) use instance's Name to attach gce disk **What this PR does / why we need it**: fix #40427 **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #40427 **Special notes for your reviewer**: **Release note**: ```release-note NONE ```

Merge pull request #41034 from rootfs/gce-instance
16a0a0b9 · Kubernetes Submit Queue · GitHub · bc29bb02 · b36009be · 16a0a0b9
Commit 16a0a0b9 authored Feb 14, 2017 by Kubernetes Submit Queue Committed by GitHub Feb 14, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

gce.go pkg/cloudprovider/providers/gce/gce.go +1 -1

No files found.
--- a/pkg/cloudprovider/providers/gce/gce.go
+++ b/pkg/cloudprovider/providers/gce/gce.go
@@ -2588,7 +2588,7 @@ func (gce *GCECloud) AttachDisk(diskName string, nodeName types.NodeName, readOn
 	}
 	attachedDisk := gce.convertDiskToAttachedDisk(disk, readWrite)

-	attachOp, err := gce.service.Instances.AttachDisk(gce.projectID, disk.Zone, instanceName, attachedDisk).Do()
+	attachOp, err := gce.service.Instances.AttachDisk(gce.projectID, disk.Zone, instance.Name, attachedDisk).Do()
 	if err != nil {
 		return err
 	}