From de9854575419e540a14905627bcadc4f48666e5f Mon Sep 17 00:00:00 2001
From: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
Date: Mon, 11 Dec 2023 11:15:08 +0900
Subject: [PATCH] update containerd (1.7.11)

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
---
 .github/workflows/test.yml | 24 ++++++++++++------------
 Dockerfile                 |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 5c3daba554c..2e6ac21683b 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -77,11 +77,11 @@ jobs:
         # ubuntu-20.04: cgroup v1, ubuntu-22.04: cgroup v2
         include:
           - ubuntu: 20.04
-            containerd: v1.6.25
+            containerd: v1.6.26
           - ubuntu: 20.04
-            containerd: v1.7.10
+            containerd: v1.7.11
           - ubuntu: 22.04
-            containerd: v1.7.10
+            containerd: v1.7.11
           - ubuntu: 22.04
             containerd: main
     env:
@@ -113,7 +113,7 @@ jobs:
         # ubuntu-20.04: cgroup v1, ubuntu-22.04: cgroup v2
         include:
           - ubuntu: 22.04
-            containerd: v1.7.10
+            containerd: v1.7.11
     env:
       UBUNTU_VERSION: "${{ matrix.ubuntu }}"
       CONTAINERD_VERSION: "${{ matrix.containerd }}"
@@ -157,25 +157,25 @@ jobs:
         # ubuntu-22.04: cgroup v1, ubuntu-22.04: cgroup v2
         include:
           - ubuntu: 20.04
-            containerd: v1.6.25
+            containerd: v1.6.26
             target: test-integration-rootless
           - ubuntu: 20.04
-            containerd: v1.7.10
+            containerd: v1.7.11
             target: test-integration-rootless
           - ubuntu: 22.04
-            containerd: v1.7.10
+            containerd: v1.7.11
             target: test-integration-rootless
           - ubuntu: 22.04
             containerd: main
             target: test-integration-rootless
           - ubuntu: 20.04
-            containerd: v1.6.25
+            containerd: v1.6.26
             target: test-integration-rootless-port-slirp4netns
           - ubuntu: 20.04
-            containerd: v1.7.10
+            containerd: v1.7.11
             target: test-integration-rootless-port-slirp4netns
           - ubuntu: 22.04
-            containerd: v1.7.10
+            containerd: v1.7.11
             target: test-integration-rootless-port-slirp4netns
           - ubuntu: 22.04
             containerd: main
@@ -267,7 +267,7 @@ jobs:
       - uses: actions/checkout@v4.1.1
         with:
           repository: containerd/containerd
-          ref: v1.7.10
+          ref: v1.7.11
           path: containerd
           fetch-depth: 1
       - name: "Set up CNI"
@@ -275,7 +275,7 @@ jobs:
         run: GOPATH=$(go env GOPATH) script/setup/install-cni-windows
       - name: "Set up containerd"
         env:
-          ctrdVersion: 1.7.10
+          ctrdVersion: 1.7.11
         run: powershell hack/configure-windows-ci.ps1
       # TODO: Run unit tests
       - name: "Run integration tests"
diff --git a/Dockerfile b/Dockerfile
index 1f84b8102c9..8693cd33cdb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,7 +18,7 @@
 # TODO: verify commit hash
 
 # Basic deps
-ARG CONTAINERD_VERSION=v1.7.10
+ARG CONTAINERD_VERSION=v1.7.11
 ARG RUNC_VERSION=v1.1.10
 ARG CNI_PLUGINS_VERSION=v1.4.0