Skip to content

Commit a9963a7

Browse files
committed
rework skip
1 parent 6d68515 commit a9963a7

File tree

1 file changed

+3
-8
lines changed

1 file changed

+3
-8
lines changed

deploy/kicbase/entrypoint

+3-8
Original file line numberDiff line numberDiff line change
@@ -118,16 +118,11 @@ configure_containerd() {
118118
# we need to switch to 'native' or 'fuse-overlayfs' on zfs
119119
container_filesystem="$(stat -f -c %T /kind)"
120120
if [[ "$container_filesystem" == 'zfs' ]]; then
121-
# if fuse is present, use fuse-overlayfs, else fallback to native
122121
# we do not use the ZFS snapshotter because of skew issues vs the host
123-
if [[ -e /dev/fuse ]]; then
124-
# snapshotter="fuse-overlayfs" skipping temporarily: https://github.com/kubernetes/minikube/issues/15191
125-
else
126-
snapshotter="native"
127-
fi
122+
snapshotter="native"
128123
# fuse likely implies fuse-overlayfs, we should switch to fuse-overlayfs (or native)
129-
elif [[ "$container_filesystem" == 'fuseblk' ]]; then
130-
# snapshotter="fuse-overlayfs" skipping temporarily: https://github.com/kubernetes/minikube/issues/15191
124+
# elif [[ "$container_filesystem" == 'fuseblk' ]]; then skipping temporarily: https://github.com/kubernetes/minikube/issues/15191
125+
# snapshotter="fuse-overlayfs"
131126
fi
132127
fi
133128

0 commit comments

Comments
 (0)