From ae314ad24636a36f7418b432657d108865793035 Mon Sep 17 00:00:00 2001 From: Brad Erickson Date: Mon, 23 Nov 2015 19:00:46 -0800 Subject: [PATCH] Minion->Node rename: KUBE_NODE_IP_ADDRESSES, KUBE_NODE_IP_ADDRESS --- cluster/aws/util.sh | 12 ++++++------ cluster/gce/util.sh | 8 ++++---- cluster/juju/util.sh | 6 +++--- cluster/kube-util.sh | 4 ++-- cluster/mesos/docker/util.sh | 6 +++--- cluster/vagrant/util.sh | 4 ++-- cluster/vsphere/util.sh | 12 ++++++------ 7 files changed, 26 insertions(+), 26 deletions(-) diff --git a/cluster/aws/util.sh b/cluster/aws/util.sh index e790e8d9e1b..ed586dbe4bb 100755 --- a/cluster/aws/util.sh +++ b/cluster/aws/util.sh @@ -199,8 +199,8 @@ function find-running-minions () { function detect-minions () { find-running-minions - # This is inefficient, but we want MINION_NAMES / MINION_IDS to be ordered the same as KUBE_MINION_IP_ADDRESSES - KUBE_MINION_IP_ADDRESSES=() + # This is inefficient, but we want MINION_NAMES / MINION_IDS to be ordered the same as KUBE_NODE_IP_ADDRESSES + KUBE_NODE_IP_ADDRESSES=() for (( i=0; i<${#MINION_NAMES[@]}; i++)); do local minion_ip if [[ "${ENABLE_MINION_PUBLIC_IP}" == "true" ]]; then @@ -209,10 +209,10 @@ function detect-minions () { minion_ip=$(get_instance_private_ip ${MINION_NAMES[$i]}) fi echo "Found minion ${i}: ${MINION_NAMES[$i]} @ ${minion_ip}" - KUBE_MINION_IP_ADDRESSES+=("${minion_ip}") + KUBE_NODE_IP_ADDRESSES+=("${minion_ip}") done - if [[ -z "$KUBE_MINION_IP_ADDRESSES" ]]; then + if [[ -z "$KUBE_NODE_IP_ADDRESSES" ]]; then echo "Could not detect Kubernetes minion nodes. Make sure you've launched a cluster with 'kube-up.sh'" exit 1 fi @@ -1113,11 +1113,11 @@ function check-cluster() { # Basic sanity checking # TODO(justinsb): This is really not needed any more local rc # Capture return code without exiting because of errexit bash option - for (( i=0; i<${#KUBE_MINION_IP_ADDRESSES[@]}; i++)); do + for (( i=0; i<${#KUBE_NODE_IP_ADDRESSES[@]}; i++)); do # Make sure docker is installed and working. local attempt=0 while true; do - local minion_ip=${KUBE_MINION_IP_ADDRESSES[$i]} + local minion_ip=${KUBE_NODE_IP_ADDRESSES[$i]} echo -n "Attempt $(($attempt+1)) to check Docker on node @ ${minion_ip} ..." local output=`check-minion ${minion_ip}` echo $output diff --git a/cluster/gce/util.sh b/cluster/gce/util.sh index 655221c9d16..65595268b14 100755 --- a/cluster/gce/util.sh +++ b/cluster/gce/util.sh @@ -229,11 +229,11 @@ function detect-minion-names { # ZONE # Vars set: # MINION_NAMES -# KUBE_MINION_IP_ADDRESSES (array) +# KUBE_NODE_IP_ADDRESSES (array) function detect-minions () { detect-project detect-minion-names - KUBE_MINION_IP_ADDRESSES=() + KUBE_NODE_IP_ADDRESSES=() for (( i=0; i<${#MINION_NAMES[@]}; i++)); do local minion_ip=$(gcloud compute instances describe --project "${PROJECT}" --zone "${ZONE}" \ "${MINION_NAMES[$i]}" --fields networkInterfaces[0].accessConfigs[0].natIP \ @@ -242,10 +242,10 @@ function detect-minions () { echo "Did not find ${MINION_NAMES[$i]}" >&2 else echo "Found ${MINION_NAMES[$i]} at ${minion_ip}" - KUBE_MINION_IP_ADDRESSES+=("${minion_ip}") + KUBE_NODE_IP_ADDRESSES+=("${minion_ip}") fi done - if [[ -z "${KUBE_MINION_IP_ADDRESSES-}" ]]; then + if [[ -z "${KUBE_NODE_IP_ADDRESSES-}" ]]; then echo "Could not detect Kubernetes minion nodes. Make sure you've launched a cluster with 'kube-up.sh'" >&2 exit 1 fi diff --git a/cluster/juju/util.sh b/cluster/juju/util.sh index 2ed2dd70aba..faa9c4e20ac 100755 --- a/cluster/juju/util.sh +++ b/cluster/juju/util.sh @@ -69,9 +69,9 @@ function detect-minions() { # ] # Strip out the IP addresses - export KUBE_MINION_IP_ADDRESSES=($(${JUJU_PATH}/return-node-ips.py "${ipoutput}")) - # echo "Kubernetes minions: " ${KUBE_MINION_IP_ADDRESSES[@]} 1>&2 - export NUM_MINIONS=${#KUBE_MINION_IP_ADDRESSES[@]} + export KUBE_NODE_IP_ADDRESSES=($(${JUJU_PATH}/return-node-ips.py "${ipoutput}")) + # echo "Kubernetes minions: " ${KUBE_NODE_IP_ADDRESSES[@]} 1>&2 + export NUM_MINIONS=${#KUBE_NODE_IP_ADDRESSES[@]} } function get-password() { diff --git a/cluster/kube-util.sh b/cluster/kube-util.sh index 8bbb3b97ca2..396ccccf619 100644 --- a/cluster/kube-util.sh +++ b/cluster/kube-util.sh @@ -29,9 +29,9 @@ function detect-minion-names { echo "MINION_NAMES: [${MINION_NAMES[*]}]" 1>&2 } -# Get minion IP addresses and store in KUBE_MINION_IP_ADDRESSES[] +# Get minion IP addresses and store in KUBE_NODE_IP_ADDRESSES[] function detect-minions { - echo "KUBE_MINION_IP_ADDRESSES: [${KUBE_MINION_IP_ADDRESSES[*]}]" 1>&2 + echo "KUBE_NODE_IP_ADDRESSES: [${KUBE_NODE_IP_ADDRESSES[*]}]" 1>&2 } # Verify prereqs on host machine diff --git a/cluster/mesos/docker/util.sh b/cluster/mesos/docker/util.sh index 838936f9ec3..20f8f32df44 100644 --- a/cluster/mesos/docker/util.sh +++ b/cluster/mesos/docker/util.sh @@ -204,7 +204,7 @@ function detect-master { echo "KUBE_MASTER_IP: $KUBE_MASTER_IP" 1>&2 } -# Get minion IP addresses and store in KUBE_MINION_IP_ADDRESSES[] +# Get minion IP addresses and store in KUBE_NODE_IP_ADDRESSES[] # These Mesos slaves MAY host Kublets, # but might not have a Kublet running unless a kubernetes task has been scheduled on them. function detect-minions { @@ -215,9 +215,9 @@ function detect-minions { fi while read -r docker_id; do local minion_ip=$(docker inspect --format="{{.NetworkSettings.IPAddress}}" "${docker_id}") - KUBE_MINION_IP_ADDRESSES+=("${minion_ip}") + KUBE_NODE_IP_ADDRESSES+=("${minion_ip}") done <<< "$docker_ids" - echo "KUBE_MINION_IP_ADDRESSES: [${KUBE_MINION_IP_ADDRESSES[*]}]" 1>&2 + echo "KUBE_NODE_IP_ADDRESSES: [${KUBE_NODE_IP_ADDRESSES[*]}]" 1>&2 } # Verify prereqs on host machine diff --git a/cluster/vagrant/util.sh b/cluster/vagrant/util.sh index b4ddc99fbb8..4de4e05a4ba 100644 --- a/cluster/vagrant/util.sh +++ b/cluster/vagrant/util.sh @@ -25,10 +25,10 @@ function detect-master () { echo "KUBE_MASTER_IP: ${KUBE_MASTER_IP}" 1>&2 } -# Get minion IP addresses and store in KUBE_MINION_IP_ADDRESSES[] +# Get minion IP addresses and store in KUBE_NODE_IP_ADDRESSES[] function detect-minions { echo "Minions already detected" 1>&2 - KUBE_MINION_IP_ADDRESSES=("${MINION_IPS[@]}") + KUBE_NODE_IP_ADDRESSES=("${MINION_IPS[@]}") } # Verify prereqs on host machine Also sets exports USING_KUBE_SCRIPTS=true so diff --git a/cluster/vsphere/util.sh b/cluster/vsphere/util.sh index c14452fbfb2..13847d152a6 100755 --- a/cluster/vsphere/util.sh +++ b/cluster/vsphere/util.sh @@ -47,19 +47,19 @@ function detect-master { # Assumed vars: # MINION_NAMES # Vars set: -# KUBE_MINION_IP_ADDRESS (array) +# KUBE_NODE_IP_ADDRESS (array) function detect-minions { - KUBE_MINION_IP_ADDRESSES=() + KUBE_NODE_IP_ADDRESSES=() for (( i=0; i<${#MINION_NAMES[@]}; i++)); do local minion_ip=$(govc vm.ip ${MINION_NAMES[$i]}) if [[ -z "${minion_ip-}" ]] ; then echo "Did not find ${MINION_NAMES[$i]}" >&2 else echo "Found ${MINION_NAMES[$i]} at ${minion_ip}" - KUBE_MINION_IP_ADDRESSES+=("${minion_ip}") + KUBE_NODE_IP_ADDRESSES+=("${minion_ip}") fi done - if [[ -z "${KUBE_MINION_IP_ADDRESSES-}" ]]; then + if [[ -z "${KUBE_NODE_IP_ADDRESSES-}" ]]; then echo "Could not detect Kubernetes minion nodes. Make sure you've launched a cluster with 'kube-up.sh'" >&2 exit 1 fi @@ -315,7 +315,7 @@ function kube-up { for (( i=0; i<${#MINION_NAMES[@]}; i++)); do printf "Waiting for ${MINION_NAMES[$i]} to become available..." until curl --max-time 5 \ - --fail --output /dev/null --silent "http://${KUBE_MINION_IP_ADDRESSES[$i]}:10250/healthz"; do + --fail --output /dev/null --silent "http://${KUBE_NODE_IP_ADDRESSES[$i]}:10250/healthz"; do printf "." sleep 2 done @@ -349,7 +349,7 @@ function kube-up { local i for (( i=0; i<${#MINION_NAMES[@]}; i++)); do # Make sure docker is installed - kube-ssh "${KUBE_MINION_IP_ADDRESSES[$i]}" which docker > /dev/null || { + kube-ssh "${KUBE_NODE_IP_ADDRESSES[$i]}" which docker > /dev/null || { echo "Docker failed to install on ${MINION_NAMES[$i]}. Your cluster is unlikely" >&2 echo "to work correctly. Please run ./cluster/kube-down.sh and re-create the" >&2 echo "cluster. (sorry!)" >&2