From 97ebc1aad9280a63b0435a7be20a775c6d1dd5b1 Mon Sep 17 00:00:00 2001 From: Daniel Smith Date: Tue, 9 Jun 2015 14:15:01 -0700 Subject: [PATCH] improve output of kube_get_url --- hack/lib/util.sh | 11 +++++------ hack/test-cmd.sh | 13 +++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/hack/lib/util.sh b/hack/lib/util.sh index e61f55aa3ac..f652ef7aee0 100644 --- a/hack/lib/util.sh +++ b/hack/lib/util.sh @@ -21,8 +21,8 @@ kube::util::sortable_date() { kube::util::wait_for_url() { local url=$1 local prefix=${2:-} - local wait=${3:-0.2} - local times=${4:-10} + local wait=${3:-0.5} + local times=${4:-25} which curl >/dev/null || { kube::log::usage "curl must be installed" @@ -30,16 +30,15 @@ kube::util::wait_for_url() { } local i - for i in $(seq 1 $times); do local out if out=$(curl -fs $url 2>/dev/null); then - kube::log::status ${prefix}${out} + kube::log::status "On try ${i}, ${prefix}: ${out}" return 0 fi - sleep $wait + sleep ${wait} done - kube::log::error "Timed out waiting for ${url}" + kube::log::error "Timed out waiting for ${prefix} to answer at ${url}; tried ${times} waiting ${wait} between each" return 1 } diff --git a/hack/test-cmd.sh b/hack/test-cmd.sh index 7d2170c2b7b..943a7a07186 100755 --- a/hack/test-cmd.sh +++ b/hack/test-cmd.sh @@ -65,7 +65,7 @@ kube::log::status "Starting kubelet in masterless mode" --port="$KUBELET_PORT" \ --healthz_port="${KUBELET_HEALTHZ_PORT}" 1>&2 & KUBELET_PID=$! -kube::util::wait_for_url "http://127.0.0.1:${KUBELET_HEALTHZ_PORT}/healthz" "kubelet: " 0.2 25 +kube::util::wait_for_url "http://127.0.0.1:${KUBELET_HEALTHZ_PORT}/healthz" "kubelet(masterless)" kill ${KUBELET_PID} 1>&2 2>/dev/null kube::log::status "Starting kubelet in masterful mode" @@ -81,7 +81,7 @@ kube::log::status "Starting kubelet in masterful mode" --healthz_port="${KUBELET_HEALTHZ_PORT}" 1>&2 & KUBELET_PID=$! -kube::util::wait_for_url "http://127.0.0.1:${KUBELET_HEALTHZ_PORT}/healthz" "kubelet: " 0.2 25 +kube::util::wait_for_url "http://127.0.0.1:${KUBELET_HEALTHZ_PORT}/healthz" "kubelet" # Start kube-apiserver kube::log::status "Starting kube-apiserver" @@ -98,17 +98,18 @@ kube::log::status "Starting kube-apiserver" --service-cluster-ip-range="10.0.0.0/24" 1>&2 & APISERVER_PID=$! -kube::util::wait_for_url "http://127.0.0.1:${API_PORT}/healthz" "apiserver: " +kube::util::wait_for_url "http://127.0.0.1:${API_PORT}/healthz" "apiserver" # Start controller manager -kube::log::status "Starting CONTROLLER-MANAGER" +kube::log::status "Starting controller-manager" "${KUBE_OUTPUT_HOSTBIN}/kube-controller-manager" \ --machines="127.0.0.1" \ + --port="${CTLRMGR_PORT}" \ --master="127.0.0.1:${API_PORT}" 1>&2 & CTLRMGR_PID=$! -kube::util::wait_for_url "http://127.0.0.1:${CTLRMGR_PORT}/healthz" "controller-manager: " -kube::util::wait_for_url "http://127.0.0.1:${API_PORT}/api/v1beta3/nodes/127.0.0.1" "apiserver(nodes): " 0.2 25 +kube::util::wait_for_url "http://127.0.0.1:${CTLRMGR_PORT}/healthz" "controller-manager" +kube::util::wait_for_url "http://127.0.0.1:${API_PORT}/api/v1beta3/nodes/127.0.0.1" "apiserver(nodes)" # Expose kubectl directly for readability PATH="${KUBE_OUTPUT_HOSTBIN}":$PATH