Merge pull request #7576 from containerd/sb

Cleanup sandbox interfaces

pkg/cri/sbserver/podsandbox/sandbox_run.go

@@ -254,6 +254,11 @@ func (c *Controller) Start(ctx context.Context, id string) (_ *api.ControllerSta
 	return resp, nil
 }
 
+func (c *Controller) Create(ctx context.Context, _id string) error {
+	// Not used by pod-sandbox implementation as there is no need to split pause containers logic.
+	return nil
+}
+
 // untrustedWorkload returns true if the sandbox contains untrusted workload.
 func untrustedWorkload(config *runtime.PodSandboxConfig) bool {
 	return config.GetAnnotations()[annotations.UntrustedWorkload] == "true"

pkg/cri/sbserver/sandbox_run.go

@@ -170,6 +170,10 @@ func (c *criService) RunPodSandbox(ctx context.Context, r *runtime.RunPodSandbox
 
 	runtimeStart := time.Now()
 
+	if err := c.sandboxController.Create(ctx, id); err != nil {
+		return nil, fmt.Errorf("failed to create sandbox %q: %w", id, err)
+	}
+
 	resp, err := c.sandboxController.Start(ctx, id)
 	if err != nil {
 		return nil, fmt.Errorf("failed to start sandbox %q: %w", id, err)