From 2c9696f78c3c5a95686679cd122b46c5efb873ee Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Fri, 22 Jan 2021 16:58:50 +0100 Subject: [PATCH] e2e: remove losetup workaround for minikube Signed-off-by: Niels de Vos --- scripts/minikube.sh | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/scripts/minikube.sh b/scripts/minikube.sh index 55aaa1c2e81..23175d4df5b 100755 --- a/scripts/minikube.sh +++ b/scripts/minikube.sh @@ -130,17 +130,6 @@ function disable_storage_addons() { ${minikube} addons disable storage-provisioner 2>/dev/null || true } -# minikube has the Busybox losetup, and that does not work with raw-block PVCs. -# Copy the host losetup executable and hope it works. -# -# See https://github.com/kubernetes/minikube/issues/8284 -function minikube_losetup() { - # scp should not ask for any confirmation - scp -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i "$(${minikube} ssh-key)" /sbin/losetup docker@"$(${minikube} ip)":losetup - # replace /sbin/losetup symlink with the executable - ${minikube} ssh 'sudo sh -c "rm -f /sbin/losetup && cp ~docker/losetup /sbin"' -} - function minikube_supports_psp() { local MINIKUBE_MAJOR local MINIKUBE_MINOR @@ -234,7 +223,6 @@ up) wait_for_ssh # shellcheck disable=SC2086 ${minikube} ssh "sudo mkdir -p /mnt/${DISK}/var/lib/rook;sudo ln -s /mnt/${DISK}/var/lib/rook /var/lib/rook" - minikube_losetup fi ${minikube} kubectl -- cluster-info ;;