not set sandbox id when use podsandbox type

yylt · samuelkarp · commit 4b4e6f7c693e · 2025-04-22T09:30:14.000-07:00
Signed-off-by: yang yang &lt;yang8518296@163.com&gt;
diff --git a/internal/cri/server/container_create.go b/internal/cri/server/container_create.go
@@ -32,6 +32,7 @@ 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"
@@ -409,7 +410,9 @@ func (c *criService) createContainer(r *createContainerRequest) (_ string, retEr
 		containerd.WithContainerExtension(crilabels.ContainerMetadataExtension, r.meta),
 	)
 
-	opts = append(opts, containerd.WithSandbox(r.sandboxID))
+	if r.sandbox.Sandboxer != podsandboxtypes.InternalSandboxID {
+		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
@@ -47,7 +47,7 @@ import (
 func init() {
 	registry.Register(&plugin.Registration{
 		Type: plugins.PodSandboxPlugin,
-		ID:   "podsandbox",
+		ID:   types.InternalSandboxID,
 		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
@@ -26,6 +26,10 @@ import (
 	sandboxstore "github.com/containerd/containerd/v2/internal/cri/store/sandbox"
 )
 
+const (
+	InternalSandboxID = "podsandbox"
+)
+
 type PodSandbox struct {
 	ID        string
 	Container containerd.Container
