Merge pull request #785 from henry118/ctrd17

Upgrade containerd to v1.7

Author: henry118

.buildkite/pipeline.yml

@@ -78,21 +78,21 @@ steps:
     command:
       - make -C runtime integ-test FICD_DM_POOL=build_${BUILDKITE_BUILD_NUMBER}_runtime
 
-  - label: ":running: snapshotter isolated tests"
-    agents:
-      queue: "${BUILDKITE_AGENT_META_DATA_QUEUE:-default}"
-      distro: "${BUILDKITE_AGENT_META_DATA_DISTRO}"
-      hostname: "${BUILDKITE_AGENT_META_DATA_HOSTNAME}"
-    env:
-      DOCKER_IMAGE_TAG: "$BUILDKITE_BUILD_NUMBER"
-      NUMBER_OF_VMS: 10
-      EXTRAGOARGS: "-v -count=1 -race -timeout 3m"
-      FICD_DM_VOLUME_GROUP: fcci-vg
-    artifact_paths:
-      - "snapshotter/logs/*"
-    command:
-      - make -C snapshotter integ-test FICD_DM_POOL=build_${BUILDKITE_BUILD_NUMBER}_snapshotter
-    timeout_in_minutes: 10
+  # - label: ":running: snapshotter isolated tests"
+  #   agents:
+  #     queue: "${BUILDKITE_AGENT_META_DATA_QUEUE:-default}"
+  #     distro: "${BUILDKITE_AGENT_META_DATA_DISTRO}"
+  #     hostname: "${BUILDKITE_AGENT_META_DATA_HOSTNAME}"
+  #   env:
+  #     DOCKER_IMAGE_TAG: "$BUILDKITE_BUILD_NUMBER"
+  #     NUMBER_OF_VMS: 10
+  #     EXTRAGOARGS: "-v -count=1 -race -timeout 3m"
+  #     FICD_DM_VOLUME_GROUP: fcci-vg
+  #   artifact_paths:
+  #     - "snapshotter/logs/*"
+  #   command:
+  #     - make -C snapshotter integ-test FICD_DM_POOL=build_${BUILDKITE_BUILD_NUMBER}_snapshotter
+  #   timeout_in_minutes: 10
 
   - label: ":weight_lifter: stress tests"
     concurrency_group: stress

.github/workflows/build.yaml

@@ -14,7 +14,7 @@ jobs:
     strategy:
       matrix:
         os: ['ubuntu-20.04', 'ubuntu-22.04']
-        go: ['1.17', '1.18', '1.19']
+        go: ['1.21', '1.22']
       # Build all variants regardless of failures
       fail-fast: false
 

.golangci.yml

@@ -6,12 +6,9 @@ linters:
   enable:
     - govet
     - staticcheck
-    - unused
+#    - unused
     - gosimple
-    - structcheck
-    - varcheck
     - ineffassign
-    - deadcode
     - typecheck
     - gosec
     - unconvert
@@ -33,3 +30,4 @@ issues:
     - G304 # Potential file inclusion via variable
     - G306 # WriteFile permissions 0600 or less to be audited
     - G307 # Deferring unsafe method "Close" on type "*os.File" to be audited
+    - 

Makefile

@@ -28,7 +28,7 @@ SUBMODULES=_submodules
 UID:=$(shell id -u)
 GID:=$(shell id -g)
 
-FIRECRACKER_CONTAINERD_BUILDER_IMAGE?=golang:1.17-bullseye
+FIRECRACKER_CONTAINERD_BUILDER_IMAGE?=golang:1.21-bullseye
 export FIRECRACKER_CONTAINERD_TEST_IMAGE?=localhost/firecracker-containerd-test
 export GO_CACHE_VOLUME_NAME?=gocache
 
@@ -136,14 +136,14 @@ tidy:
 	./tools/tidy.sh
 
 $(BINPATH)/golangci-lint:
-	curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b $(BINPATH) v1.48.0
+	GOBIN=$(BINPATH) go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.57.2
 	$(BINPATH)/golangci-lint --version
 
 $(BINPATH)/git-validation:
-	GOBIN=$(BINPATH) GO111MODULE=off go get -u github.com/vbatts/git-validation
+	GOBIN=$(BINPATH) go install github.com/vbatts/git-validation@v1.2.0
 
 $(BINPATH)/ltag:
-	GOBIN=$(BINPATH) GO111MODULE=off go get -u github.com/kunalkushwaha/ltag
+	GOBIN=$(BINPATH) go install github.com/kunalkushwaha/ltag@v0.2.5
 
 install:
 	for d in $(SUBDIRS); do $(MAKE) -C $$d install; done
@@ -273,31 +273,31 @@ $(CNI_BIN_ROOT):
 
 BRIDGE_BIN?=$(BINPATH)/bridge
 $(BRIDGE_BIN):
-	GOBIN=$(dir $@) GO111MODULE=off go get -u github.com/containernetworking/plugins/plugins/main/bridge
+	GOBIN=$(dir $@) go install github.com/containernetworking/plugins/plugins/main/bridge@v1.1.0
 
 PTP_BIN?=$(BINPATH)/ptp
 $(PTP_BIN):
-	GOBIN=$(dir $@) GO111MODULE=off go get -u github.com/containernetworking/plugins/plugins/main/ptp
+	GOBIN=$(dir $@) go install github.com/containernetworking/plugins/plugins/main/ptp@v1.1.0
 
 HOSTLOCAL_BIN?=$(BINPATH)/host-local
 $(HOSTLOCAL_BIN):
-	GOBIN=$(dir $@) GO111MODULE=off go get -u github.com/containernetworking/plugins/plugins/ipam/host-local
+	GOBIN=$(dir $@) go install github.com/containernetworking/plugins/plugins/ipam/host-local@v1.1.0
 
 FIREWALL_BIN?=$(BINPATH)/firewall
 $(FIREWALL_BIN):
-	GOBIN=$(dir $@) GO111MODULE=off go get -u github.com/containernetworking/plugins/plugins/meta/firewall
+	GOBIN=$(dir $@) go install github.com/containernetworking/plugins/plugins/meta/firewall@v1.1.0
 
 TC_REDIRECT_TAP_BIN?=$(BINPATH)/tc-redirect-tap
 $(TC_REDIRECT_TAP_BIN):
-	GOBIN=$(dir $@) go install github.com/awslabs/tc-redirect-tap/cmd/tc-redirect-tap
+	GOBIN=$(dir $@) go install github.com/awslabs/tc-redirect-tap/cmd/tc-redirect-tap@v0.0.0-20211025175357-e30dfca224c2
 
 TEST_BRIDGED_TAP_BIN?=$(BINPATH)/test-bridged-tap
 $(TEST_BRIDGED_TAP_BIN): $(shell find internal/cmd/test-bridged-tap -name *.go) $(GOMOD) $(GOSUM)
 	go build -o $@ $(CURDIR)/internal/cmd/test-bridged-tap
 
 LOOPBACK_BIN?=$(BINPATH)/loopback
 $(LOOPBACK_BIN):
-	GOBIN=$(dir $@) GO111MODULE=off go get -u github.com/containernetworking/plugins/plugins/main/loopback
+	GOBIN=$(dir $@) go install github.com/containernetworking/plugins/plugins/main/loopback@v1.1.0
 
 .PHONY: cni-bins
 cni-bins: $(BRIDGE_BIN) $(PTP_BIN) $(HOSTLOCAL_BIN) $(FIREWALL_BIN) $(TC_REDIRECT_TAP_BIN) $(LOOPBACK_BIN)

agent/drive_handler.go

@@ -23,9 +23,9 @@ import (
 
 	"github.com/containerd/containerd/log"
 	"github.com/containerd/containerd/mount"
+	"github.com/containerd/containerd/protobuf/types"
 	"github.com/firecracker-microvm/firecracker-containerd/internal"
 	drivemount "github.com/firecracker-microvm/firecracker-containerd/proto/service/drivemount/ttrpc"
-	"github.com/gogo/protobuf/types"
 )
 
 const (

agent/ioproxy_handler.go

@@ -16,11 +16,11 @@ package main
 import (
 	"context"
 
+	task "github.com/containerd/containerd/api/runtime/task/v2"
 	"github.com/containerd/containerd/log"
-	"github.com/containerd/containerd/runtime/v2/task"
+	"github.com/containerd/containerd/protobuf/types"
 	"github.com/firecracker-microvm/firecracker-containerd/internal/vm"
 	ioproxy "github.com/firecracker-microvm/firecracker-containerd/proto/service/ioproxy/ttrpc"
-	"github.com/gogo/protobuf/types"
 )
 
 // ioProxyHandler implements IOProxyService that exposes the state of

agent/main.go

@@ -21,10 +21,10 @@ import (
 	"os/signal"
 	"syscall"
 
+	taskAPI "github.com/containerd/containerd/api/runtime/task/v2"
 	"github.com/containerd/containerd/events/exchange"
 	"github.com/containerd/containerd/log"
 	"github.com/containerd/containerd/namespaces"
-	taskAPI "github.com/containerd/containerd/runtime/v2/task"
 	"github.com/containerd/containerd/sys/reaper"
 	"github.com/containerd/ttrpc"
 	"github.com/firecracker-microvm/firecracker-go-sdk/vsock"

agent/service.go

@@ -22,14 +22,14 @@ import (
 	"strconv"
 	"sync"
 
+	taskAPI "github.com/containerd/containerd/api/runtime/task/v2"
 	"github.com/containerd/containerd/cio"
 	"github.com/containerd/containerd/identifiers"
 	"github.com/containerd/containerd/log"
 	"github.com/containerd/containerd/mount"
+	"github.com/containerd/containerd/protobuf/types"
 	runc "github.com/containerd/containerd/runtime/v2/runc/v2"
 	"github.com/containerd/containerd/runtime/v2/shim"
-	taskAPI "github.com/containerd/containerd/runtime/v2/task"
-	"github.com/gogo/protobuf/types"
 	"github.com/hashicorp/go-multierror"
 	"github.com/sirupsen/logrus"
 	"golang.org/x/sys/unix"
@@ -121,7 +121,7 @@ func logPanicAndDie(logger *logrus.Entry) {
 func unmarshalExtraData(marshalled *types.Any) (*proto.ExtraData, error) {
 	// get json bytes from task request
 	extraData := &proto.ExtraData{}
-	err := types.UnmarshalAny(marshalled, extraData)
+	err := marshalled.UnmarshalTo(extraData)
 	if err != nil {
 		return nil, err
 	}

docker-credential-mmds/go.mod

@@ -1,6 +1,6 @@
 module github.com/firecracker-microvm/firecracker-containerd/docker-credential-mmds
 
-go 1.17
+go 1.21
 
 require (
 	github.com/docker/docker-credential-helpers v0.6.4

docs/getting-started.md

@@ -40,7 +40,7 @@ You need to have the following things in order to use firecracker-containerd:
 * git
 * gcc, required by the Firecracker agent for building
 * A recent installation of [Docker CE](https://docker.com).
-* Go 1.17 or later, which you can download from [here](https://golang.org/dl/).
+* Go 1.21 or later, which you can download from [here](https://golang.org/dl/).
 
 ## Setup