From 4796120f704bccbe534701c63d42d8136a4c3056 Mon Sep 17 00:00:00 2001 From: Dawn Chen Date: Mon, 22 Sep 2014 22:20:48 -0700 Subject: [PATCH] Debugging to fix e2e testing issue --- hack/e2e-suite/update.sh | 2 +- pkg/cloudprovider/gce/gce.go | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/hack/e2e-suite/update.sh b/hack/e2e-suite/update.sh index 8fa0cf1255e..72148dc7956 100755 --- a/hack/e2e-suite/update.sh +++ b/hack/e2e-suite/update.sh @@ -19,7 +19,7 @@ set -o errexit set -o nounset set -o pipefail -set -x +set -e source "${KUBE_REPO_ROOT}/cluster/kube-env.sh" source "${KUBE_REPO_ROOT}/cluster/$KUBERNETES_PROVIDER/util.sh" diff --git a/pkg/cloudprovider/gce/gce.go b/pkg/cloudprovider/gce/gce.go index 3c503e47c58..5984a71f994 100644 --- a/pkg/cloudprovider/gce/gce.go +++ b/pkg/cloudprovider/gce/gce.go @@ -30,6 +30,7 @@ import ( "code.google.com/p/goauth2/compute/serviceaccount" compute "code.google.com/p/google-api-go-client/compute/v1" "github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider" + "github.com/golang/glog" ) // GCECloud is an implementation of Interface, TCPLoadBalancer and Instances for Google Compute Engine. @@ -191,10 +192,18 @@ func (gce *GCECloud) DeleteTCPLoadBalancer(name, region string) error { // IPAddress is an implementation of Instances.IPAddress. func (gce *GCECloud) IPAddress(instance string) (net.IP, error) { - res, err := gce.service.Instances.Get(gce.projectID, gce.zone, instance).Do() + suffix, err := fqdnSuffix() if err != nil { return nil, err } + if len(suffix) > 0 { + suffix = "." + suffix + } + res, err := gce.service.Instances.Get(gce.projectID, gce.zone, strings.Replace(instance, suffix, "", 1)).Do() + if err != nil { + glog.Errorf("Failed to retrieve TargetInstance resource for instance:%s", instance) + return nil, err + } ip := net.ParseIP(res.NetworkInterfaces[0].AccessConfigs[0].NatIP) if ip == nil { return nil, fmt.Errorf("Invalid network IP: %s", res.NetworkInterfaces[0].AccessConfigs[0].NatIP)