From 41bc0b301d0d4e8938ec1c59cdb065efb6f098f2 Mon Sep 17 00:00:00 2001 From: Victor Marmol Date: Tue, 27 Jan 2015 19:25:47 -0800 Subject: [PATCH] Using metadata library for GCE metadata fetch. Fixes #3343. --- pkg/cloudprovider/gce/gce.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkg/cloudprovider/gce/gce.go b/pkg/cloudprovider/gce/gce.go index 65e62f6d91..529c810643 100644 --- a/pkg/cloudprovider/gce/gce.go +++ b/pkg/cloudprovider/gce/gce.go @@ -37,6 +37,7 @@ import ( "github.com/golang/glog" "golang.org/x/oauth2" "golang.org/x/oauth2/google" + "google.golang.org/cloud/compute/metadata" ) // GCECloud is an implementation of Interface, TCPLoadBalancer and Instances for Google Compute Engine. @@ -72,8 +73,7 @@ func getMetadata(url string) (string, error) { } func getProjectAndZone() (string, string, error) { - url := "http://metadata/computeMetadata/v1/instance/zone" - result, err := getMetadata(url) + result, err := metadata.Get("instance/zone") if err != nil { return "", "", err } @@ -85,8 +85,7 @@ func getProjectAndZone() (string, string, error) { } func getInstanceID() (string, error) { - url := "http://metadata/computeMetadata/v1/instance/hostname" - result, err := getMetadata(url) + result, err := metadata.Get("instance/hostname") if err != nil { return "", err }