Skip to content

K
k3s
Commit b577498c authored by deads2k's avatar deads2k
Browse files
Options

add optional env var for allowing version skew in test cmd

parent b20765f5
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 2 deletions
hack/make-rules/test-cmd.sh
View file @ b577498c
...@@ -304,14 +304,18 @@ runTests() { ...@@ -304,14 +304,18 @@ runTests() {
if [[ -z "${version}" ]]; then if [[ -z "${version}" ]]; then
kube_flags=( kube_flags=(
-s "http://127.0.0.1:${API_PORT}" -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" ] [ "$(kubectl get nodes -o go-template='{{ .apiVersion }}' "${kube_flags[@]}")" == "v1" ]
else else
kube_flags=( kube_flags=(
-s "http://127.0.0.1:${API_PORT}" -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}" ] [ "$(kubectl get nodes -o go-template='{{ .apiVersion }}' "${kube_flags[@]}")" == "${version}" ]
fi fi
id_field=".metadata.name" id_field=".metadata.name"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment