From d8a81155c841dba5389bbd9672270b9e1758a00c Mon Sep 17 00:00:00 2001 From: Matt Liggett Date: Tue, 23 Aug 2016 13:14:58 -0700 Subject: [PATCH 1/2] Only run federated test if FEDERATION == "true" --- hack/e2e.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/e2e.go b/hack/e2e.go index 124ed378f7b..f1044dbec76 100644 --- a/hack/e2e.go +++ b/hack/e2e.go @@ -428,7 +428,7 @@ func Test() bool { } // TODO(fejta): add a --federated or something similar - if os.Getenv("FEDERATION") == "" { + if os.Getenv("FEDERATION") != "true" { if *checkNodeCount { ValidateClusterSize() } From 2ddc08e56775e6ae76a50fa4fb7053a1a2dbeaf4 Mon Sep 17 00:00:00 2001 From: Matt Liggett Date: Tue, 23 Aug 2016 13:18:22 -0700 Subject: [PATCH 2/2] Add debugging output when trying to find the name of the master. --- cluster/gce/util.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cluster/gce/util.sh b/cluster/gce/util.sh index 67659f85bcd..1e0de73a529 100755 --- a/cluster/gce/util.sh +++ b/cluster/gce/util.sh @@ -386,15 +386,18 @@ function detect-nodes() { function detect-master() { detect-project KUBE_MASTER=${MASTER_NAME} + echo "Trying to find master named '${MASTER_NAME}'" >&2 if [[ -z "${KUBE_MASTER_IP-}" ]]; then - KUBE_MASTER_IP=$(gcloud compute addresses describe "${MASTER_NAME}-ip" \ + local master_address_name="${MASTER_NAME}-ip" + echo "Looking for address '${master_address_name}'" >&2 + KUBE_MASTER_IP=$(gcloud compute addresses describe "${master_address_name}" \ --project "${PROJECT}" --region "${REGION}" -q --format='value(address)') fi if [[ -z "${KUBE_MASTER_IP-}" ]]; then echo "Could not detect Kubernetes master node. Make sure you've launched a cluster with 'kube-up.sh'" >&2 exit 1 fi - echo "Using master: $KUBE_MASTER (external IP: $KUBE_MASTER_IP)" + echo "Using master: $KUBE_MASTER (external IP: $KUBE_MASTER_IP)" >&2 } # Reads kube-env metadata from master