From ddf02d30325cbc253606781333a1164962cc2403 Mon Sep 17 00:00:00 2001 From: Satoru Takeuchi Date: Thu, 16 Apr 2020 01:51:46 +0900 Subject: [PATCH 1/2] tests: make swapon and swapoff reliable After running `swapoff -a`, systemd re-enable swap soon. We should stop the corresponding unit to avoid this problem. Signed-off-by: Satoru Takeuchi --- tests/scripts/kubeadm-install.sh | 3 ++- tests/scripts/kubeadm.sh | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/scripts/kubeadm-install.sh b/tests/scripts/kubeadm-install.sh index 3e71d360b..f9a2d8e81 100755 --- a/tests/scripts/kubeadm-install.sh +++ b/tests/scripts/kubeadm-install.sh @@ -6,7 +6,8 @@ null_str= KUBE_INSTALL_VERSION="${KUBE_VERSION/v/$null_str}"-00 # Kubelet cannot run with swap enabled: https://github.com/kubernetes/kubernetes/issues/34726 -# Disabling swap when installing k8s 1.8.x via kubeadm +# Disabling swap when installing k8s via kubeadm +which systemctl >/dev/null && sudo systemctl stop swap.target sudo swapoff -a wait_for_dpkg_unlock() { diff --git a/tests/scripts/kubeadm.sh b/tests/scripts/kubeadm.sh index 7f31ace05..6af0783ca 100755 --- a/tests/scripts/kubeadm.sh +++ b/tests/scripts/kubeadm.sh @@ -107,6 +107,7 @@ kubeadm_reset() { sudo apt-get -y remove kubelet sudo apt-get -y remove kubeadm sudo swapon -a + which systemctl >/dev/null && sudo systemctl start swap.target } case "${1:-}" in From 76a2b8c23039320082ca4f625bb244042e758309 Mon Sep 17 00:00:00 2001 From: Satoru Takeuchi Date: Thu, 16 Apr 2020 09:12:41 +0900 Subject: [PATCH 2/2] tests: prevent the installation failure due to downgrade packages kubeadm installer tries to install the fixed versions of some packages. So if the newer versions are already installed, this script fails. Signed-off-by: Satoru Takeuchi --- tests/scripts/kubeadm-install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/scripts/kubeadm-install.sh b/tests/scripts/kubeadm-install.sh index f9a2d8e81..1973c23ee 100755 --- a/tests/scripts/kubeadm-install.sh +++ b/tests/scripts/kubeadm-install.sh @@ -48,8 +48,8 @@ sudo apt-get update wait_for_dpkg_unlock sleep 5 wait_for_dpkg_unlock -sudo apt-get install -y kubernetes-cni="0.6.0-00" -sudo apt-get install -y kubelet="${KUBE_INSTALL_VERSION}" && sudo apt-get install -y kubeadm="${KUBE_INSTALL_VERSION}" +sudo apt-get install -y --allow-downgrades kubernetes-cni="0.6.0-00" +sudo apt-get install -y --allow-downgrades kubelet="${KUBE_INSTALL_VERSION}" && sudo apt-get install -y --allow-downgrades kubeadm="${KUBE_INSTALL_VERSION}" #get matching kubectl case ${ARCH} in