Update containerd version to 1.7.22

Signed-off-by: Shubharanshu Mahapatra <[email protected]>
containerd · Sep 10, 2024 · a803e60 · a803e60
1 parent 7cab42c
commit a803e60
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -79,13 +79,13 @@ jobs:
           - ubuntu: 20.04
             containerd: v1.6.31
           - ubuntu: 20.04
-            containerd: v1.7.21
+            containerd: v1.7.22
           - ubuntu: 22.04
-            containerd: v1.7.21
+            containerd: v1.7.22
           - ubuntu: 22.04
             containerd: main
           - ubuntu: 24.04
-            containerd: v1.7.21
+            containerd: v1.7.22
           - ubuntu: 24.04
             containerd: main
     env:
@@ -117,7 +117,7 @@ jobs:
         # ubuntu-20.04: cgroup v1, ubuntu-22.04 and later: cgroup v2
         include:
           - ubuntu: 24.04
-            containerd: v1.7.21
+            containerd: v1.7.22
     env:
       UBUNTU_VERSION: "${{ matrix.ubuntu }}"
       CONTAINERD_VERSION: "${{ matrix.containerd }}"
@@ -165,19 +165,19 @@ jobs:
             rootlesskit: v1.1.1
             target: test-integration-rootless
           - ubuntu: 20.04
-            containerd: v1.7.21
+            containerd: v1.7.22
             rootlesskit: v2.3.1
             target: test-integration-rootless
           - ubuntu: 22.04
-            containerd: v1.7.21
+            containerd: v1.7.22
             rootlesskit: v1.1.1
             target: test-integration-rootless
           - ubuntu: 22.04
             containerd: main  # v2.0.0-rc.X
             rootlesskit: v2.3.1
             target: test-integration-rootless
           - ubuntu: 24.04
-            containerd: v1.7.21
+            containerd: v1.7.22
             rootlesskit: v1.1.1
             target: test-integration-rootless
           - ubuntu: 24.04
@@ -189,19 +189,19 @@ jobs:
             rootlesskit: v1.1.1
             target: test-integration-rootless-port-slirp4netns
           - ubuntu: 20.04
-            containerd: v1.7.21
+            containerd: v1.7.22
             rootlesskit: v2.3.1
             target: test-integration-rootless-port-slirp4netns
           - ubuntu: 22.04
-            containerd: v1.7.21
+            containerd: v1.7.22
             rootlesskit: v1.1.1
             target: test-integration-rootless-port-slirp4netns
           - ubuntu: 22.04
             containerd: main  # v2.0.0-rc.X
             rootlesskit: v2.3.1
             target: test-integration-rootless-port-slirp4netns
           - ubuntu: 24.04
-            containerd: v1.7.21
+            containerd: v1.7.22
             rootlesskit: v1.1.1
             target: test-integration-rootless-port-slirp4netns
           - ubuntu: 24.04
@@ -321,15 +321,15 @@ jobs:
       - uses: actions/[email protected]
         with:
           repository: containerd/containerd
-          ref: v1.7.21
+          ref: v1.7.22
           path: containerd
           fetch-depth: 1
       - name: "Set up CNI"
         working-directory: containerd
         run: GOPATH=$(go env GOPATH) script/setup/install-cni-windows
       - name: "Set up containerd"
         env:
-          ctrdVersion: 1.7.21
+          ctrdVersion: 1.7.22
         run: powershell hack/configure-windows-ci.ps1
       # TODO: Run unit tests
       - name: "Run integration tests"

diff --git a/Dockerfile b/Dockerfile
@@ -18,7 +18,7 @@
 # TODO: verify commit hash
 
 # Basic deps
-ARG CONTAINERD_VERSION=v1.7.21
+ARG CONTAINERD_VERSION=v1.7.22
 ARG RUNC_VERSION=v1.1.14
 ARG CNI_PLUGINS_VERSION=v1.5.1
 

diff --git a/go.mod b/go.mod
@@ -11,7 +11,7 @@ require (
 	github.com/containerd/accelerated-container-image v1.1.2
 	github.com/containerd/cgroups/v3 v3.0.3
 	github.com/containerd/console v1.0.4
-	github.com/containerd/containerd v1.7.21
+	github.com/containerd/containerd v1.7.22
 	github.com/containerd/containerd/api v1.7.19
 	github.com/containerd/continuity v0.4.3
 	github.com/containerd/fifo v1.1.0

diff --git a/go.sum b/go.sum
@@ -37,8 +37,8 @@ github.com/containerd/cgroups/v3 v3.0.3/go.mod h1:8HBe7V3aWGLFPd/k03swSIsGjZhHI2
 github.com/containerd/console v1.0.1/go.mod h1:XUsP6YE/mKtz6bxc+I8UiKKTP04qjQL4qcS3XoQ5xkw=
 github.com/containerd/console v1.0.4 h1:F2g4+oChYvBTsASRTz8NP6iIAi97J3TtSAsLbIFn4ro=
 github.com/containerd/console v1.0.4/go.mod h1:YynlIjWYF8myEu6sdkwKIvGQq+cOckRm6So2avqoYAk=
-github.com/containerd/containerd v1.7.21 h1:USGXRK1eOC/SX0L195YgxTHb0a00anxajOzgfN0qrCA=
-github.com/containerd/containerd v1.7.21/go.mod h1:e3Jz1rYRUZ2Lt51YrH9Rz0zPyJBOlSvB3ghr2jbVD8g=
+github.com/containerd/containerd v1.7.22 h1:nZuNnNRA6T6jB975rx2RRNqqH2k6ELYKDZfqTHqwyy0=
+github.com/containerd/containerd v1.7.22/go.mod h1:e3Jz1rYRUZ2Lt51YrH9Rz0zPyJBOlSvB3ghr2jbVD8g=
 github.com/containerd/containerd/api v1.7.19 h1:VWbJL+8Ap4Ju2mx9c9qS1uFSB1OVYr5JJrW2yT5vFoA=
 github.com/containerd/containerd/api v1.7.19/go.mod h1:fwGavl3LNwAV5ilJ0sbrABL44AQxmNjDRcwheXDb6Ig=
 github.com/containerd/continuity v0.4.3 h1:6HVkalIp+2u1ZLH1J/pYX2oBVXlJZvh1X1A7bEZ9Su8=