From b577498c66b8c1fc4d4b7cec8b35648f7bcdfd09 Mon Sep 17 00:00:00 2001 From: deads2k Date: Fri, 30 Sep 2016 13:37:25 -0400 Subject: [PATCH] add optional env var for allowing version skew in test cmd --- hack/make-rules/test-cmd.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/hack/make-rules/test-cmd.sh b/hack/make-rules/test-cmd.sh index 3260627441a..e83e530ec7b 100755 --- a/hack/make-rules/test-cmd.sh +++ b/hack/make-rules/test-cmd.sh @@ -304,14 +304,18 @@ runTests() { if [[ -z "${version}" ]]; then kube_flags=( -s "http://127.0.0.1:${API_PORT}" - --match-server-version ) + if [[ -z "${ALLOW_SKEW:-}" ]]; then + kube_flags+=("--match-server-version") + fi [ "$(kubectl get nodes -o go-template='{{ .apiVersion }}' "${kube_flags[@]}")" == "v1" ] else kube_flags=( -s "http://127.0.0.1:${API_PORT}" - --match-server-version ) + if [[ -z "${ALLOW_SKEW:-}" ]]; then + kube_flags+=("--match-server-version") + fi [ "$(kubectl get nodes -o go-template='{{ .apiVersion }}' "${kube_flags[@]}")" == "${version}" ] fi id_field=".metadata.name"