From 382bfabf0cfc8f74575cc05dd1019234636f7313 Mon Sep 17 00:00:00 2001 From: Thomas Stromberg Date: Fri, 14 Dec 2018 14:10:39 -0800 Subject: [PATCH] First try "kubeadm reset" without -f, primarily for older versions. For newer versions, it seems more pleasant anyways. This approach is at least less ugly than parsing JSON from a shell script to version sniff. --- hack/jenkins/linux_integration_tests_none.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hack/jenkins/linux_integration_tests_none.sh b/hack/jenkins/linux_integration_tests_none.sh index da2255058e..f3b1b7da9a 100755 --- a/hack/jenkins/linux_integration_tests_none.sh +++ b/hack/jenkins/linux_integration_tests_none.sh @@ -35,8 +35,9 @@ SUDO_PREFIX="sudo -E " export KUBECONFIG="/root/.kube/config" # "none" driver specific cleanup from previous runs. -# kubeadm -sudo kubeadm reset -f || true + +# Try without -f first, primarily because older kubeadm versions (v1.10) don't support it anyways. +sudo kubeadm reset || sudo kubeadm reset -f || true # Cleanup data directory sudo rm -rf /data/* # Cleanup old Kubernetes configs