From 4d9abe27af343b5b7585542ecbc3bd12a8a1ce10 Mon Sep 17 00:00:00 2001
From: Kay Yan <kay.yan@daocloud.io>
Date: Tue, 12 Mar 2024 04:53:40 +0000
Subject: [PATCH] update containerd (1.7.14),(1.6.30)

Signed-off-by: Kay Yan <kay.yan@daocloud.io>
---
 .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 9d61b45cb2d..ca46ee68230 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.28
+            containerd: v1.6.30
           - ubuntu: 20.04
-            containerd: v1.7.13
+            containerd: v1.7.14
           - ubuntu: 22.04
-            containerd: v1.7.13
+            containerd: v1.7.14
           - 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.13
+            containerd: v1.7.14
     env:
       UBUNTU_VERSION: "${{ matrix.ubuntu }}"
       CONTAINERD_VERSION: "${{ matrix.containerd }}"
@@ -157,15 +157,15 @@ jobs:
         # ubuntu-22.04: cgroup v1, ubuntu-22.04: cgroup v2
         include:
           - ubuntu: 20.04
-            containerd: v1.6.28
+            containerd: v1.6.30
             rootlesskit: v1.1.1
             target: test-integration-rootless
           - ubuntu: 20.04
-            containerd: v1.7.13
+            containerd: v1.7.14
             rootlesskit: v2.0.1
             target: test-integration-rootless
           - ubuntu: 22.04
-            containerd: v1.7.13
+            containerd: v1.7.14
             rootlesskit: v1.1.1
             target: test-integration-rootless
           - ubuntu: 22.04
@@ -173,15 +173,15 @@ jobs:
             rootlesskit: v2.0.1
             target: test-integration-rootless
           - ubuntu: 20.04
-            containerd: v1.6.28
+            containerd: v1.6.30
             rootlesskit: v1.1.1
             target: test-integration-rootless-port-slirp4netns
           - ubuntu: 20.04
-            containerd: v1.7.13
+            containerd: v1.7.14
             rootlesskit: v2.0.1
             target: test-integration-rootless-port-slirp4netns
           - ubuntu: 22.04
-            containerd: v1.7.13
+            containerd: v1.7.14
             rootlesskit: v1.1.1
             target: test-integration-rootless-port-slirp4netns
           - ubuntu: 22.04
@@ -275,7 +275,7 @@ jobs:
       - uses: actions/checkout@v4.1.1
         with:
           repository: containerd/containerd
-          ref: v1.7.13
+          ref: v1.7.14
           path: containerd
           fetch-depth: 1
       - name: "Set up CNI"
@@ -283,7 +283,7 @@ jobs:
         run: GOPATH=$(go env GOPATH) script/setup/install-cni-windows
       - name: "Set up containerd"
         env:
-          ctrdVersion: 1.7.13
+          ctrdVersion: 1.7.14
         run: powershell hack/configure-windows-ci.ps1
       # TODO: Run unit tests
       - name: "Run integration tests"
diff --git a/Dockerfile b/Dockerfile
index 666bea984fe..e62142fcbdc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,7 +18,7 @@
 # TODO: verify commit hash
 
 # Basic deps
-ARG CONTAINERD_VERSION=v1.7.13
+ARG CONTAINERD_VERSION=v1.7.14
 ARG RUNC_VERSION=v1.1.12
 ARG CNI_PLUGINS_VERSION=v1.4.0