containerd 20 (#4100)

* bump containerd-dev to 2.0.2

Signed-off-by: Avi Deitcher <avi@deitcher.net>

* update pkg/init libs to containerd-20

Signed-off-by: Avi Deitcher <avi@deitcher.net>

* bump linuxkit CLI containerd deps to 20

Signed-off-by: Avi Deitcher <avi@deitcher.net>

* update test/pkg/containerd to work with containerd v2.x tests

Signed-off-by: Avi Deitcher <avi@deitcher.net>

* update containerd-dev deps

Signed-off-by: Avi Deitcher <avi@deitcher.net>

* update pkg/init and pkg/containerd dependencies

Signed-off-by: Avi Deitcher <avi@deitcher.net>

* update test/pkg/containerd deps

Signed-off-by: Avi Deitcher <avi@deitcher.net>

---------

Signed-off-by: Avi Deitcher <avi@deitcher.net>

test/pkg/containerd/Dockerfile

@@ -1,4 +1,4 @@
-FROM linuxkit/containerd-dev:6bcd306acd17006695406edc0cc6b5111a601799 as containerd-dev
+FROM linuxkit/containerd-dev:dcb484003086d12dc0458793375f3769553f330e as containerd-dev
 FROM linuxkit/alpine:35b33c6b03c40e51046c3b053dd131a68a26c37a AS mirror
 RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
 # btrfs-progfs is required for btrfs test (mkfs.btrfs)
@@ -9,6 +9,8 @@ RUN apk add --no-cache --initdb -p /out \
     busybox \
     btrfs-progs \
     btrfs-progs-dev \
+    device-mapper \
+    e2fsprogs \    
     gcc \
     git \
     go \
@@ -17,8 +19,13 @@ RUN apk add --no-cache --initdb -p /out \
     make \
     musl \
     util-linux \
+    util-linux-misc \
     xfsprogs \
     tzdata
+
+# because we want the one from util-linux-misc at /sbin/blkdiscard to override the one from busybox
+RUN rm /out/usr/bin/blkdiscard    
+
 RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache
 RUN cp /out/usr/share/zoneinfo/UTC /out/etc/localtime
 
@@ -26,8 +33,9 @@ FROM scratch
 COPY --from=mirror /out/ /
 COPY --from=containerd-dev /go/src/github.com/containerd/containerd /go/src/github.com/containerd/containerd/
 
-# containerd 1.4.x does not support go modules; remove GO111MODULE=off when we switch to 1.5.x
-ENV GOPATH=/go GO111MODULE=off
+RUN mv /sbin/dmsetup /sbin/dmsetup.orig
+COPY dmsetup.sh /sbin/dmsetup
+ENV GOPATH=/go
 WORKDIR $GOPATH/src/github.com/containerd/containerd
 ADD run.sh ./run.sh
 

test/pkg/containerd/build.yml

@@ -10,7 +10,6 @@ config:
     - /etc/resolv.conf:/etc/resolv.conf
     - /usr/bin/runc:/usr/bin/runc
     - /usr/bin/containerd:/usr/bin/containerd
-    - /usr/bin/containerd-shim:/usr/bin/containerd-shim
   devices:
     # all block and character devices
     - path: all

test/pkg/containerd/dmsetup.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+/sbin/dmsetup "$@" 2> >(sed 's/device or //g' >&2)

test/pkg/containerd/run.sh

@@ -16,6 +16,6 @@ export TMPDIR=/var/lib/tmp
 # unset -race (does not work on alpine; see golang/go#14481)
 export TESTFLAGS=
 # disable devmapper tests
-export SKIPTESTS="github.com/containerd/containerd/snapshots/devmapper github.com/containerd/containerd/snapshots/devmapper/dmsetup github.com/containerd/containerd/snapshots/devmapper/losetup"
+export SKIPTESTS="github.com/containerd/containerd/v2/plugins/snapshots/devmapper github.com/containerd/containerd/v2/plugins/snapshots/devmapper/dmsetup"
 make root-test || failed
 printf "containerd test suite PASSED\n"

test/pkg/ns/template.yml

@@ -3,7 +3,7 @@ kernel:
   image: linuxkit/kernel:6.6.71
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:3c0baa0abe9b513538b1feee36f01667161f17dd
+  - linuxkit/init:7e8f626582eab2f142d4b8ce217e4c121ac748ed
   - linuxkit/runc:667e7ea2c426a2460ca21e3da065a57dbb3369c9
 onboot:
   - name: test-ns