github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 14:37:00 +00:00
Code Issues Projects Releases Wiki Activity

Fix review comments, will squash later.

Browse Source
This commit is contained in:
Xiangyang Chu 2019-07-25 14:42:23 +08:00
parent 4ef227c682
commit 23ce08a7d0
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/cmd/legacy-script.sh
View File

@ -315,17 +315,17 @@ runTests() {
} }
kube_flags=( kube_flags=(
-s "http://127.0.0.1:${API_PORT}" '-s' "http://127.0.0.1:${API_PORT}"
) )
# token defined in hack/testdata/auth-tokens.csv # token defined in hack/testdata/auth-tokens.csv
kube_flags_with_token=( kube_flags_with_token=(
-s "https://127.0.0.1:${SECURE_API_PORT}" "--token=admin-token" "--insecure-skip-tls-verify=true" '-s' "https://127.0.0.1:${SECURE_API_PORT}" '--token=admin-token' '--insecure-skip-tls-verify=true'
) )
if [[ -z "${ALLOW_SKEW:-}" ]]; then if [[ -z "${ALLOW_SKEW:-}" ]]; then
kube_flags+=("--match-server-version") kube_flags+=('--match-server-version')
kube_flags_with_token+=("--match-server-version") kube_flags_with_token+=('--match-server-version')
fi fi
if kube::test::if_supports_resource "${nodes}" ; then if kube::test::if_supports_resource "${nodes}" ; then
[ "$(kubectl get nodes -o go-template='{{ .apiVersion }}' "${kube_flags[@]}")" == "v1" ] [ "$(kubectl get nodes -o go-template='{{ .apiVersion }}' "${kube_flags[@]}")" == "v1" ]
@ -397,7 +397,7 @@ runTests() {
do do
# running of kubeadm is captured in hack/make-targets/test-cmd.sh # running of kubeadm is captured in hack/make-targets/test-cmd.sh
if [[ "${pkg}" != "kubeadm" ]]; then if [[ "${pkg}" != "kubeadm" ]]; then
record_command run_"${pkg}"_tests record_command "run_${pkg}_tests"
fi fi
done done
cleanup_tests cleanup_tests