github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 14:07:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1188 from carlossg/detect-zone

Browse Source 
[GCE] detect-master and detect-minions api calls should specify the zone
This commit is contained in:
Joe Beda 2014-09-05 14:24:49 -07:00
commit 2edbfcf25d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/gce/util.sh
View File

@ -59,7 +59,7 @@ function detect-minions () {
KUBE_MINION_IP_ADDRESSES=() KUBE_MINION_IP_ADDRESSES=()
for (( i=0; i<${#MINION_NAMES[@]}; i++)); do for (( i=0; i<${#MINION_NAMES[@]}; i++)); do
local minion_ip=$(gcutil listinstances --format=csv --sort=external-ip \ 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) | tail -n 1)
echo "Found ${MINION_NAMES[$i]} at ${minion_ip}" echo "Found ${MINION_NAMES[$i]} at ${minion_ip}"
KUBE_MINION_IP_ADDRESSES+=("${minion_ip}") KUBE_MINION_IP_ADDRESSES+=("${minion_ip}")
@ -74,7 +74,7 @@ function detect-master () {
KUBE_MASTER=${MASTER_NAME} KUBE_MASTER=${MASTER_NAME}
if [ -z "$KUBE_MASTER_IP" ]; then if [ -z "$KUBE_MASTER_IP" ]; then
KUBE_MASTER_IP=$(gcutil listinstances --format=csv --sort=external-ip \ 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) | tail -n 1)
fi fi
if [ -z "$KUBE_MASTER_IP" ]; then if [ -z "$KUBE_MASTER_IP" ]; then