github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-10 05:30:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3146 from zmerlynn/limit_liveness_gke

Browse Source 
GKE: Limit liveness.sh to server version >0.7.2
This commit is contained in:
Joe Beda
2015-01-05 14:41:39 -08:00
parent 7d507a4fa9 e965fc1f79
commit 943ed6d289
2 changed files with 33 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,10 +25,20 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../..
source "${KUBE_ROOT}/cluster/kube-env.sh"
source "${KUBE_ROOT}/cluster/$KUBERNETES_PROVIDER/util.sh"
liveness_tests="http exec"
if [[ ${KUBERNETES_PROVIDER} == "gke" ]]; then
server_version=$(kube_server_version)
if [[ ${server_version} -le 702 ]]; then
echo "GKE server version <= 0.7.2, limiting test to http (version = ${server_version})"
liveness_tests="http"
fi
fi
function teardown() {
echo "Cleaning up test artifacts"
${KUBECFG} delete pods/liveness-http
${KUBECFG} delete pods/liveness-exec
for test in ${liveness_tests}; do
${KUBECFG} delete pods/liveness-${test}
done
}
function waitForNotPending() {
@@ -58,7 +68,7 @@ function waitForNotPending() {
trap "teardown" EXIT
for test in http exec; do
for test in ${liveness_tests}; do
echo "Liveness test: ${test}"
${KUBECFG} -c ${KUBE_ROOT}/examples/liveness/${test}-liveness.yaml create pods
waitForNotPending