github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Using metadata library for GCE metadata fetch. 

Fixes #3343.
pull/6/head
Victor Marmol 2015-01-27 19:25:47 -08:00
parent 988d15943f
commit 41bc0b301d
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/cloudprovider/gce/gce.go
View File

@ -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
}