From 10b69090fb7460be870733df081938741533f427 Mon Sep 17 00:00:00 2001 From: Mitch Zhu Date: Mon, 3 Feb 2025 22:49:32 +0000 Subject: [PATCH 1/2] containerd2: fix ptest after adding tardev-snapshotter patch --- SPECS/containerd2/add-tardev-support.patch | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/SPECS/containerd2/add-tardev-support.patch b/SPECS/containerd2/add-tardev-support.patch index 7ddc24bb813..eb29ec934a0 100644 --- a/SPECS/containerd2/add-tardev-support.patch +++ b/SPECS/containerd2/add-tardev-support.patch @@ -1,6 +1,6 @@ -From 33ac7f6f513934a0ef59cc6739eee0efdac3631c Mon Sep 17 00:00:00 2001 +From b4c672fcfc8faad7d0534d887d72e2a68c112d20 Mon Sep 17 00:00:00 2001 From: Mitch Zhu -Date: Fri, 22 Nov 2024 20:41:27 +0000 +Date: Mon, 3 Feb 2025 22:42:14 +0000 Subject: [PATCH] Enhance snapshot handling and CRI runtime compatibility for tardev-snapshotter @@ -8,11 +8,12 @@ Subject: [PATCH] Enhance snapshot handling and CRI runtime compatibility for client/image.go | 4 +- internal/cri/server/container_status_test.go | 2 +- internal/cri/server/images/image_pull.go | 37 +++++++++++-------- + internal/cri/server/images/image_pull_test.go | 2 +- internal/cri/server/podsandbox/controller.go | 2 +- internal/cri/server/podsandbox/sandbox_run.go | 30 ++++++++------- internal/cri/server/service.go | 2 +- internal/cri/store/image/image.go | 29 ++++++++++++--- - 7 files changed, 68 insertions(+), 38 deletions(-) + 8 files changed, 69 insertions(+), 39 deletions(-) diff --git a/client/image.go b/client/image.go index 355bcba..791db88 100644 @@ -126,6 +127,19 @@ index e59b88b..f9c90b7 100644 } // TODO: Ensure error is returned if runtime not found? +diff --git a/internal/cri/server/images/image_pull_test.go b/internal/cri/server/images/image_pull_test.go +index bc79e35..af6a451 100644 +--- a/internal/cri/server/images/image_pull_test.go ++++ b/internal/cri/server/images/image_pull_test.go +@@ -429,7 +429,7 @@ func TestSnapshotterFromPodSandboxConfig(t *testing.T) { + Platform: platforms.DefaultSpec(), + Snapshotter: runtimeSnapshotter, + } +- snapshotter, err := cri.snapshotterFromPodSandboxConfig(context.Background(), "test-image", tt.podSandboxConfig) ++ snapshotter, err := cri.snapshotterFromPodSandboxConfig(context.Background(), "test-image", tt.podSandboxConfig, "") + assert.Equal(t, tt.expectedSnapshotter, snapshotter) + if tt.expectedErr { + assert.Error(t, err) diff --git a/internal/cri/server/podsandbox/controller.go b/internal/cri/server/podsandbox/controller.go index a185a4c..8fd032b 100644 --- a/internal/cri/server/podsandbox/controller.go From a62b3f4ba6e55b1474806373fda5a9e033a1672b Mon Sep 17 00:00:00 2001 From: Mitch Zhu Date: Tue, 4 Feb 2025 02:03:39 +0000 Subject: [PATCH 2/2] Bump release version --- SPECS/containerd2/containerd2.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/SPECS/containerd2/containerd2.spec b/SPECS/containerd2/containerd2.spec index 5e2b9e409df..6cc1f1fde48 100644 --- a/SPECS/containerd2/containerd2.spec +++ b/SPECS/containerd2/containerd2.spec @@ -5,7 +5,7 @@ Summary: Industry-standard container runtime Name: %{upstream_name}2 Version: 2.0.0 -Release: 3%{?dist} +Release: 4%{?dist} License: ASL 2.0 Group: Tools/Container URL: https://www.containerd.io @@ -81,7 +81,10 @@ fi %dir /opt/containerd/lib %changelog -* Sun Jan 26 2024 Mitch Zhu - 2.0.0-3 +* Mon Feb 03 2025 Mitch Zhu - 2.0.0-4 +- Fix ptest in tardev-snapshotter support patch + +* Sun Jan 26 2025 Mitch Zhu - 2.0.0-3 - Added patch to support tardev-snapshotter for Kata CC. * Thu Jan 23 2025 Kavya Sree Kaitepalli - 2.0.0-2