mirror of
https://github.com/ceph/ceph-csi.git
synced 2024-12-18 11:00:25 +00:00
e2e: remove losetup workaround for minikube
Signed-off-by: Niels de Vos <ndevos@redhat.com>
This commit is contained in:
parent
e5787f24b0
commit
27247d1444
@ -130,17 +130,6 @@ function disable_storage_addons() {
|
|||||||
${minikube} addons disable storage-provisioner 2>/dev/null || true
|
${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() {
|
function minikube_supports_psp() {
|
||||||
local MINIKUBE_MAJOR
|
local MINIKUBE_MAJOR
|
||||||
local MINIKUBE_MINOR
|
local MINIKUBE_MINOR
|
||||||
@ -234,7 +223,6 @@ up)
|
|||||||
wait_for_ssh
|
wait_for_ssh
|
||||||
# shellcheck disable=SC2086
|
# 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} ssh "sudo mkdir -p /mnt/${DISK}/var/lib/rook;sudo ln -s /mnt/${DISK}/var/lib/rook /var/lib/rook"
|
||||||
minikube_losetup
|
|
||||||
fi
|
fi
|
||||||
${minikube} kubectl -- cluster-info
|
${minikube} kubectl -- cluster-info
|
||||||
;;
|
;;
|
||||||
|
Loading…
Reference in New Issue
Block a user