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

Merge pull request #9513 from lavalamp/fixFlake

Browse Source 
improve output of kube_get_url & fix #6548
This commit is contained in:
Abhi Shah 2015-06-11 11:28:32 -07:00
commit b37190b784
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hack/lib/util.sh
View File

@ -21,8 +21,8 @@ kube::util::sortable_date() {
kube::util::wait_for_url() { kube::util::wait_for_url() {
local url=$1 local url=$1
local prefix=${2:-} local prefix=${2:-}
local wait=${3:-0.2} local wait=${3:-0.5}
local times=${4:-10} local times=${4:-25}
which curl >/dev/null || { which curl >/dev/null || {
kube::log::usage "curl must be installed" kube::log::usage "curl must be installed"
@ -30,16 +30,15 @@ kube::util::wait_for_url() {
} }
local i local i
for i in $(seq 1 $times); do for i in $(seq 1 $times); do
local out local out
if out=$(curl -fs $url 2>/dev/null); then if out=$(curl -fs $url 2>/dev/null); then
kube::log::status ${prefix}${out} kube::log::status "On try ${i}, ${prefix}: ${out}"
return 0 return 0
fi fi
sleep $wait sleep ${wait}
done 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 return 1
} }

13
hack/test-cmd.sh
View File

@ -65,7 +65,7 @@ kube::log::status "Starting kubelet in masterless mode"
--port="$KUBELET_PORT" \ --port="$KUBELET_PORT" \
--healthz_port="${KUBELET_HEALTHZ_PORT}" 1>&2 & --healthz_port="${KUBELET_HEALTHZ_PORT}" 1>&2 &
KUBELET_PID=$! 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 kill ${KUBELET_PID} 1>&2 2>/dev/null
kube::log::status "Starting kubelet in masterful mode" 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 & --healthz_port="${KUBELET_HEALTHZ_PORT}" 1>&2 &
KUBELET_PID=$! 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 # Start kube-apiserver
kube::log::status "Starting 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 & --service-cluster-ip-range="10.0.0.0/24" 1>&2 &
APISERVER_PID=$! 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 # Start controller manager
kube::log::status "Starting CONTROLLER-MANAGER" kube::log::status "Starting controller-manager"
"${KUBE_OUTPUT_HOSTBIN}/kube-controller-manager" \ "${KUBE_OUTPUT_HOSTBIN}/kube-controller-manager" \
--machines="127.0.0.1" \ --machines="127.0.0.1" \
--port="${CTLRMGR_PORT}" \
--master="127.0.0.1:${API_PORT}" 1>&2 & --master="127.0.0.1:${API_PORT}" 1>&2 &
CTLRMGR_PID=$! 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:${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:${API_PORT}/api/v1beta3/nodes/127.0.0.1" "apiserver(nodes)"
# Expose kubectl directly for readability # Expose kubectl directly for readability
PATH="${KUBE_OUTPUT_HOSTBIN}":$PATH PATH="${KUBE_OUTPUT_HOSTBIN}":$PATH