Upgrade to containerd 1.6.0 release

Signed-off-by: Henry Wang <[email protected]>

.github/workflows/build.yaml

@@ -14,7 +14,7 @@ jobs:
     strategy:
       matrix:
         os: ['ubuntu-18.04', 'ubuntu-20.04']
-        go: ['1.15', '1.16', '1.17']
+        go: ['1.16', '1.17']
       # Build all variants regardless of failures
       fail-fast: false
 

Makefile

@@ -28,7 +28,7 @@ SUBMODULES=_submodules
 UID:=$(shell id -u)
 GID:=$(shell id -g)
 
-FIRECRACKER_CONTAINERD_BUILDER_IMAGE?=golang:1.15-buster
+FIRECRACKER_CONTAINERD_BUILDER_IMAGE?=golang:1.16-buster
 export FIRECRACKER_CONTAINERD_TEST_IMAGE?=localhost/firecracker-containerd-test
 export GO_CACHE_VOLUME_NAME?=gocache
 
@@ -257,7 +257,7 @@ $(TEST_BRIDGED_TAP_BIN): $(shell find internal/cmd/test-bridged-tap -name *.go)
 	go build -o $@ $(CURDIR)/internal/cmd/test-bridged-tap
 
 LOOPBACK_BIN?=$(BINPATH)/loopback
-$(LOOPBACK_BIN): 
+$(LOOPBACK_BIN):
 	GOBIN=$(dir $@) GO111MODULE=off go get -u github.com/containernetworking/plugins/plugins/main/loopback
 
 .PHONY: cni-bins

firecracker-control/cmd/containerd/main.go

@@ -23,6 +23,7 @@ import (
 	// Register containerd builtins
 	// See https://github.com/containerd/containerd/blob/master/cmd/containerd/builtins.go
 	_ "github.com/containerd/containerd/diff/walking/plugin"
+	_ "github.com/containerd/containerd/events/plugin"
 	_ "github.com/containerd/containerd/gc/scheduler"
 	_ "github.com/containerd/containerd/runtime/restart/monitor"
 	_ "github.com/containerd/containerd/services/containers"

go.mod

@@ -1,14 +1,10 @@
 module github.com/firecracker-microvm/firecracker-containerd
 
 require (
-	github.com/Microsoft/go-winio v0.5.0 // indirect
 	github.com/StackExchange/wmi v0.0.0-20181212234831-e0a55b97c705 // indirect
 	github.com/awslabs/tc-redirect-tap v0.0.0-20211025175357-e30dfca224c2
-	github.com/bits-and-blooms/bitset v1.2.1 // indirect
-	github.com/containerd/containerd v1.5.9
-	github.com/containerd/continuity v0.2.0 // indirect
+	github.com/containerd/containerd v1.6.0
 	github.com/containerd/fifo v1.0.0
-	github.com/containerd/go-cni v1.1.1 // indirect
 	github.com/containerd/go-runc v1.0.0
 	github.com/containerd/ttrpc v1.1.0
 	github.com/containerd/typeurl v1.0.2
@@ -19,39 +15,25 @@ require (
 	github.com/gofrs/uuid v3.3.0+incompatible
 	github.com/gogo/googleapis v1.4.1 // indirect
 	github.com/gogo/protobuf v1.3.2
-	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.2
 	github.com/hashicorp/go-multierror v1.1.1
 	github.com/klauspost/compress v1.13.6 // indirect
 	github.com/mdlayher/vsock v1.1.0
 	github.com/miekg/dns v1.1.25
-	github.com/opencontainers/runc v1.0.3
+	github.com/opencontainers/runc v1.1.0
 	github.com/opencontainers/runtime-spec v1.0.3-0.20210910115017-0d6cc581aeea
-	github.com/opencontainers/selinux v1.8.5 // indirect
 	github.com/pkg/errors v0.9.1
 	github.com/shirou/gopsutil v2.18.12+incompatible
 	github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4 // indirect
 	github.com/sirupsen/logrus v1.8.1
 	github.com/stretchr/testify v1.7.0
 	github.com/vishvananda/netlink v1.1.1-0.20210330154013-f5de75959ad5
-	go.opencensus.io v0.23.0 // indirect
 	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
 	golang.org/x/sys v0.0.0-20220209214540-3681064d5158
-	google.golang.org/genproto v0.0.0-20211005153810-c76a74d43a8e // indirect
-	google.golang.org/grpc v1.41.0
+	google.golang.org/grpc v1.43.0
 )
 
-replace (
-	// Pin gPRC-related dependencies as like containerd v1.5.x.
-	github.com/gogo/googleapis => github.com/gogo/googleapis v1.3.2
-	github.com/golang/protobuf => github.com/golang/protobuf v1.3.5
-
-	// Upgrade mongo-driver before go-openapi packages update the package.
-	go.mongodb.org/mongo-driver => go.mongodb.org/mongo-driver v1.5.1
-
-	// Pin gPRC-related dependencies as like containerd v1.5.x.
-	google.golang.org/genproto => google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63
-	google.golang.org/grpc => google.golang.org/grpc v1.27.1
-)
+// Upgrade mongo-driver before go-openapi packages update the package.
+replace go.mongodb.org/mongo-driver => go.mongodb.org/mongo-driver v1.5.1
 
 go 1.11

tools/docker/Dockerfile.integ-test

@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:experimental
 # Test image that starts up containerd and the devmapper snapshotter. The default CMD will drop to a bash shell. Overrides
 # to CMD will be provided appended to /bin/bash -c
-FROM golang:1.15-stretch
+FROM golang:1.16-stretch
 ENV PATH="/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin:/usr/local/go/bin"
 ENV INSTALLROOT="/usr/local"
 ENV DEBIAN_FRONTEND="noninteractive"
@@ -37,7 +37,7 @@ COPY tools/docker/do_not_edit_for_firecracker-control.config.json /etc/container
 COPY tools/docker/critest/10-mynet.conf /etc/cni/net.d
 COPY tools/docker/critest/99-loopback.conf /etc/cni/net.d
 
-RUN --mount=type=bind,source=firecracker-control/cmd/containerd,target=/src \
+RUN --mount=type=bind,target=/src \
   make -C /src install && \
   ln -sv /usr/local/bin/firecracker-containerd /usr/local/bin/containerd && \
   ln -sv /usr/local/bin/firecracker-ctr /usr/local/bin/ctr

tools/docker/Dockerfile.proto-builder

@@ -11,7 +11,7 @@
 # express or implied. See the License for the specific language governing
 # permissions and limitations under the License.
 
-FROM golang:1.15-stretch
+FROM golang:1.16-stretch
 
 RUN apt-get update && apt-get install --yes --no-install-recommends \
 	libprotobuf-dev \

tools/docker/Dockerfile.runc-builder

@@ -11,7 +11,7 @@
 # express or implied. See the License for the specific language governing
 # permissions and limitations under the License.
 
-FROM golang:1.15-stretch
+FROM golang:1.16-stretch
 
 RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get -y install libseccomp-dev pkg-config