diff --git a/cluster/validate-cluster.sh b/cluster/validate-cluster.sh index 9c3d3c27dd2..0c793e0f0a6 100755 --- a/cluster/validate-cluster.sh +++ b/cluster/validate-cluster.sh @@ -33,7 +33,7 @@ detect-master > /dev/null detect-minions > /dev/null MINIONS_FILE=/tmp/minions -"${KUBE_ROOT}/cluster/kubecfg.sh" -template $'{{range.Items}}{{.ID}}\n{{end}}' list minions > ${MINIONS_FILE} +"${KUBE_ROOT}/cluster/kubecfg.sh" -template $'{{range.Items}}{{.Name}}\n{{end}}' list minions > ${MINIONS_FILE} # On vSphere, use minion IPs as their names if [ "$KUBERNETES_PROVIDER" == "vsphere" ]; then diff --git a/hack/e2e-suite/basic.sh b/hack/e2e-suite/basic.sh index 968de2a1672..1f2d95507c7 100755 --- a/hack/e2e-suite/basic.sh +++ b/hack/e2e-suite/basic.sh @@ -37,7 +37,7 @@ function teardown() { trap "teardown" EXIT -pod_id_list=$($KUBECFG '-template={{range.Items}}{{.ID}} {{end}}' -l replicationController=my-hostname list pods) +pod_id_list=$($KUBECFG '-template={{range.Items}}{{.Name}} {{end}}' -l replicationController=my-hostname list pods) # Pod turn up on a clean cluster can take a while for the docker image pull. all_running=0 for i in $(seq 1 24); do diff --git a/hack/e2e-suite/guestbook.sh b/hack/e2e-suite/guestbook.sh index 8e1e3d45a2a..e3c4a2e94b6 100755 --- a/hack/e2e-suite/guestbook.sh +++ b/hack/e2e-suite/guestbook.sh @@ -35,7 +35,7 @@ $KUBECFG -c "${GUESTBOOK}/redis-slave-controller.json" create /replicationContro sleep 5 -POD_LIST_1=$($KUBECFG '-template={{range.Items}}{{.ID}} {{end}}' list pods) +POD_LIST_1=$($KUBECFG '-template={{range.Items}}{{.Meta}} {{end}}' list pods) echo "Pods running: ${POD_LIST_1}" $KUBECFG stop redisSlaveController @@ -45,7 +45,7 @@ $KUBECFG rm redisSlaveController $KUBECFG delete services/redismaster $KUBECFG delete pods/redis-master-2 -POD_LIST_2=$($KUBECFG '-template={{range.Items}}{{.ID}} {{end}}' list pods) +POD_LIST_2=$($KUBECFG '-template={{range.Items}}{{.Meta}} {{end}}' list pods) echo "Pods running after shutdown: ${POD_LIST_2}" exit 0 diff --git a/hack/e2e-suite/services.sh b/hack/e2e-suite/services.sh index 5ee499bd9db..0c1b3becf61 100755 --- a/hack/e2e-suite/services.sh +++ b/hack/e2e-suite/services.sh @@ -69,7 +69,7 @@ function query_pods() { local i for i in $(seq 1 10); do pods_unsorted=($(${KUBECFG} \ - '-template={{range.Items}}{{.ID}} {{end}}' \ + '-template={{range.Items}}{{.Name}} {{end}}' \ -l replicationController="$1" list pods)) found="${#pods_unsorted[*]}" if [[ "${found}" == "$2" ]]; then diff --git a/hack/e2e-suite/update.sh b/hack/e2e-suite/update.sh index 14c7915755b..0a5a0945a48 100755 --- a/hack/e2e-suite/update.sh +++ b/hack/e2e-suite/update.sh @@ -38,7 +38,7 @@ function validate() { sleep 2 local pod_id_list - pod_id_list=($($KUBECFG -template='{{range.Items}}{{.ID}} {{end}}' -l simpleService="${CONTROLLER_NAME}" list pods)) + pod_id_list=($($KUBECFG -template='{{range.Items}}{{.Name}} {{end}}' -l simpleService="${CONTROLLER_NAME}" list pods)) echo " ${#pod_id_list[@]} out of ${num_replicas} created" diff --git a/hack/e2e-test.sh b/hack/e2e-test.sh index 15594fc4693..08e49305349 100755 --- a/hack/e2e-test.sh +++ b/hack/e2e-test.sh @@ -80,7 +80,7 @@ for test_file in $(ls "${KUBE_ROOT}/hack/e2e-suite/"); do fi fi - echo "running $test_file" + echo "+++ Running $test_file" result=0 "${KUBE_ROOT}/hack/e2e-suite/${test_file}" || result="$?" if [[ "${result}" -eq "0" ]]; then