From 588a428175bedc8d992e4559bc6a57935f448fb5 Mon Sep 17 00:00:00 2001 From: Carlos Sanchez Date: Tue, 2 Sep 2014 13:47:08 +0200 Subject: [PATCH] [GCE] detect-master and detect-minions api calls should specify the zone Otherwise KUBE_MASTER_IP and KUBE_MINION_IP_ADDRESSES may contain 'external-ip' $ detect-master Using master: kubernetes-master (external IP: external-ip)' --- cluster/gce/util.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cluster/gce/util.sh b/cluster/gce/util.sh index 5fac25689e641..7b064d3b68a6f 100755 --- a/cluster/gce/util.sh +++ b/cluster/gce/util.sh @@ -59,7 +59,7 @@ function detect-minions () { KUBE_MINION_IP_ADDRESSES=() for (( i=0; i<${#MINION_NAMES[@]}; i++)); do local minion_ip=$(gcutil listinstances --format=csv --sort=external-ip \ - --columns=external-ip --filter="name eq ${MINION_NAMES[$i]}" \ + --columns=external-ip --zone ${ZONE} --filter="name eq ${MINION_NAMES[$i]}" \ | tail -n 1) echo "Found ${MINION_NAMES[$i]} at ${minion_ip}" KUBE_MINION_IP_ADDRESSES+=("${minion_ip}") @@ -74,7 +74,7 @@ function detect-master () { KUBE_MASTER=${MASTER_NAME} if [ -z "$KUBE_MASTER_IP" ]; then KUBE_MASTER_IP=$(gcutil listinstances --format=csv --sort=external-ip \ - --columns=external-ip --filter="name eq ${MASTER_NAME}" \ + --columns=external-ip --zone ${ZONE} --filter="name eq ${MASTER_NAME}" \ | tail -n 1) fi if [ -z "$KUBE_MASTER_IP" ]; then