From e5ef65017d2d14f8b016b711a4e82406935f690c Mon Sep 17 00:00:00 2001 From: Wei Fu Date: Fri, 2 May 2025 19:15:36 -0400 Subject: [PATCH] Revert "not set sandbox id when use podsandbox type" This reverts commit 4b4e6f7c693e3739deed20ed5832ede137b41b3e. Signed-off-by: Wei Fu --- internal/cri/server/container_create.go | 5 +---- internal/cri/server/podsandbox/controller.go | 2 +- internal/cri/server/podsandbox/types/podsandbox.go | 4 ---- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/internal/cri/server/container_create.go b/internal/cri/server/container_create.go index 775a0df0f7..d4581518f5 100644 --- a/internal/cri/server/container_create.go +++ b/internal/cri/server/container_create.go @@ -32,7 +32,6 @@ import ( cio "github.com/containerd/containerd/v2/internal/cri/io" crilabels "github.com/containerd/containerd/v2/internal/cri/labels" customopts "github.com/containerd/containerd/v2/internal/cri/opts" - podsandboxtypes "github.com/containerd/containerd/v2/internal/cri/server/podsandbox/types" containerstore "github.com/containerd/containerd/v2/internal/cri/store/container" "github.com/containerd/containerd/v2/internal/cri/store/sandbox" "github.com/containerd/containerd/v2/internal/cri/util" @@ -410,9 +409,7 @@ func (c *criService) createContainer(r *createContainerRequest) (_ string, retEr containerd.WithContainerExtension(crilabels.ContainerMetadataExtension, r.meta), ) - if r.sandbox.Sandboxer != podsandboxtypes.InternalSandboxID { - opts = append(opts, containerd.WithSandbox(r.sandboxID)) - } + opts = append(opts, containerd.WithSandbox(r.sandboxID)) opts = append(opts, c.nri.WithContainerAdjustment()) defer func() { diff --git a/internal/cri/server/podsandbox/controller.go b/internal/cri/server/podsandbox/controller.go index 68e7203548..a185a4ce88 100644 --- a/internal/cri/server/podsandbox/controller.go +++ b/internal/cri/server/podsandbox/controller.go @@ -47,7 +47,7 @@ import ( func init() { registry.Register(&plugin.Registration{ Type: plugins.PodSandboxPlugin, - ID: types.InternalSandboxID, + ID: "podsandbox", Requires: []plugin.Type{ plugins.EventPlugin, plugins.LeasePlugin, diff --git a/internal/cri/server/podsandbox/types/podsandbox.go b/internal/cri/server/podsandbox/types/podsandbox.go index 362067f492..bbc83db1c8 100644 --- a/internal/cri/server/podsandbox/types/podsandbox.go +++ b/internal/cri/server/podsandbox/types/podsandbox.go @@ -26,10 +26,6 @@ import ( sandboxstore "github.com/containerd/containerd/v2/internal/cri/store/sandbox" ) -const ( - InternalSandboxID = "podsandbox" -) - type PodSandbox struct { ID string Container containerd.Container