Skip to content

Commit 83549d2

Browse files
local-pv-provisioner: e2etest: remove workaround for kernel 5.10
1 parent 66fb2f7 commit 83549d2

File tree

2 files changed

+0
-16
lines changed

2 files changed

+0
-16
lines changed

local-pv-provisioner/e2etest/Makefile

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ setup:
3333
.PHONY: test
3434
test:
3535
$(MAKE) launch-cluster MINIKUBE_PROFILE=$(MINIKUBE_PROFILE)
36-
$(MAKE) setup-workaround-for-xfs
3736
$(MAKE) create-loop-dev
3837
$(MAKE) launch-local-pv-provisioner
3938
$(MAKE) do-test
@@ -74,18 +73,6 @@ launch-cluster:
7473
$(MINIKUBE) profile $(MINIKUBE_PROFILE)
7574
$(MAKE) image-build
7675

77-
# mkfs.xfs and the kernel on the minikube VM may be incompatible.
78-
# This workaround replaces mkfs.xfs to create compatible superblock with the kernel version.
79-
.PHONY: setup-workaround-for-xfs
80-
setup-workaround-for-xfs:
81-
@if ! $(MINIKUBE) ssh -- uname -r | grep -qF "5.10"; then \
82-
echo "the kernel version on minikube is not 5.10, it may not need workaround, please check it."; \
83-
exit 1; \
84-
fi
85-
$(MINIKUBE) ssh -- $(SUDO) sh -c '"[ -e /usr/sbin/mkfs.xfs.orig ] || mv /usr/sbin/mkfs.xfs /usr/sbin/mkfs.xfs.orig"'
86-
$(MINIKUBE) cp mkfs.xfs lpptest:/usr/sbin/mkfs.xfs
87-
$(MINIKUBE) ssh -- $(SUDO) chmod 0755 /usr/sbin/mkfs.xfs
88-
8976
.PHONY: create-loop-dev
9077
create-loop-dev:
9178
$(MINIKUBE) ssh -- $(DD) if=/dev/zero of=loop0.img bs=1G seek=1 count=0

local-pv-provisioner/e2etest/mkfs.xfs

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)