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 #2979 from brendandburns/e2e

Browse Source 
Wait for not pending, not for running.
This commit is contained in:
bgrant0607 2014-12-16 13:49:49 -08:00
commit 56ee66831b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hack/e2e-suite/liveness.sh
View File

@ -30,7 +30,7 @@ function teardown() {
${KUBECFG} delete pods/liveness-http ${KUBECFG} delete pods/liveness-http
} }
function waitForRunning() { function waitForNotPending() {
pod_id_list=$($KUBECFG '-template={{range.items}}{{.id}} {{end}}' -l test=liveness list pods) pod_id_list=$($KUBECFG '-template={{range.items}}{{.id}} {{end}}' -l test=liveness list pods)
# Pod turn up on a clean cluster can take a while for the docker image pull. # Pod turn up on a clean cluster can take a while for the docker image pull.
all_running=0 all_running=0
@ -40,7 +40,7 @@ function waitForRunning() {
all_running=1 all_running=1
for id in $pod_id_list; do for id in $pod_id_list; do
current_status=$($KUBECFG -template '{{.currentState.status}}' get pods/$id) || true current_status=$($KUBECFG -template '{{.currentState.status}}' get pods/$id) || true
if [[ "$current_status" != "Running" ]]; then if [[ "$current_status" == "Pending" ]]; then
all_running=0 all_running=0
break break
fi fi
@ -58,7 +58,7 @@ function waitForRunning() {
trap "teardown" EXIT trap "teardown" EXIT
${KUBECFG} -c ${KUBE_ROOT}/examples/liveness/http-liveness.yaml create pods ${KUBECFG} -c ${KUBE_ROOT}/examples/liveness/http-liveness.yaml create pods
waitForRunning waitForNotPending
before=$(${KUBECFG} '-template={{.currentState.info.liveness.restartCount}}' get pods/liveness-http) before=$(${KUBECFG} '-template={{.currentState.info.liveness.restartCount}}' get pods/liveness-http)
@ -67,7 +67,7 @@ for i in $(seq 1 24); do
sleep 10 sleep 10
after=$(${KUBECFG} '-template={{.currentState.info.liveness.restartCount}}' get pods/liveness-http) after=$(${KUBECFG} '-template={{.currentState.info.liveness.restartCount}}' get pods/liveness-http)
echo "Restarts: ${after} > ${before}" echo "Restarts: ${after} > ${before}"
if [[ "${after}" > "${before} ]]; then if [[ "${after}" > "${before}" ]]; then
break break
fi fi
done done