Merge pull request containerd#13272 from estesp/backport-13260-2.1

[release/2.1] backport: sandbox: forward Create fields, fix event topics

Author: fuweid

plugins/services/sandbox/controller_service.go

@@ -33,6 +33,7 @@ import (
 	"github.com/containerd/plugin/registry"
 
 	"github.com/containerd/containerd/v2/core/events"
+	"github.com/containerd/containerd/v2/core/mount"
 	"github.com/containerd/containerd/v2/core/sandbox"
 	"github.com/containerd/containerd/v2/pkg/protobuf"
 	"github.com/containerd/containerd/v2/plugins"
@@ -104,7 +105,6 @@ func (s *controllerService) getController(name string) (sandbox.Controller, erro
 
 func (s *controllerService) Create(ctx context.Context, req *api.ControllerCreateRequest) (*api.ControllerCreateResponse, error) {
 	log.G(ctx).WithField("req", req).Debug("create sandbox")
-	// TODO: Rootfs
 	ctrl, err := s.getController(req.Sandboxer)
 	if err != nil {
 		return nil, errgrpc.ToGRPC(err)
@@ -115,12 +115,17 @@ func (s *controllerService) Create(ctx context.Context, req *api.ControllerCreat
 	} else {
 		sb = sandbox.Sandbox{ID: req.GetSandboxID()}
 	}
-	err = ctrl.Create(ctx, sb, sandbox.WithOptions(req.GetOptions()))
+	err = ctrl.Create(ctx, sb,
+		sandbox.WithOptions(req.GetOptions()),
+		sandbox.WithNetNSPath(req.GetNetnsPath()),
+		sandbox.WithRootFS(mount.FromProto(req.GetRootfs())),
+		sandbox.WithAnnotations(req.GetAnnotations()),
+	)
 	if err != nil {
 		return &api.ControllerCreateResponse{}, errgrpc.ToGRPC(err)
 	}
 
-	if err := s.publisher.Publish(ctx, "sandboxes/create", &eventtypes.SandboxCreate{
+	if err := s.publisher.Publish(ctx, "/sandboxes/create", &eventtypes.SandboxCreate{
 		SandboxID: req.GetSandboxID(),
 	}); err != nil {
 		return &api.ControllerCreateResponse{}, errgrpc.ToGRPC(err)
@@ -142,7 +147,7 @@ func (s *controllerService) Start(ctx context.Context, req *api.ControllerStartR
 		return &api.ControllerStartResponse{}, errgrpc.ToGRPC(err)
 	}
 
-	if err := s.publisher.Publish(ctx, "sandboxes/start", &eventtypes.SandboxStart{
+	if err := s.publisher.Publish(ctx, "/sandboxes/start", &eventtypes.SandboxStart{
 		SandboxID: req.GetSandboxID(),
 	}); err != nil {
 		return &api.ControllerStartResponse{}, errgrpc.ToGRPC(err)
@@ -176,7 +181,7 @@ func (s *controllerService) Wait(ctx context.Context, req *api.ControllerWaitReq
 		return &api.ControllerWaitResponse{}, errgrpc.ToGRPC(err)
 	}
 
-	if err := s.publisher.Publish(ctx, "sandboxes/exit", &eventtypes.SandboxExit{
+	if err := s.publisher.Publish(ctx, "/sandboxes/exit", &eventtypes.SandboxExit{
 		SandboxID:  req.GetSandboxID(),
 		ExitStatus: exitStatus.ExitStatus,
 		ExitedAt:   protobuf.ToTimestamp(exitStatus.ExitedAt),