Merge pull request #9882 from abel-von/sandbox-controller-v2

sandbox: make podsandbox controller plugin type of PodSandboxPlugin

internal/cri/server/podsandbox/controller.go

@@ -46,7 +46,7 @@ import (
 
 func init() {
 	registry.Register(&plugin.Registration{
-		Type: plugins.SandboxControllerPlugin,
+		Type: plugins.PodSandboxPlugin,
 		ID:   "podsandbox",
 		Requires: []plugin.Type{
 			plugins.EventPlugin,

internal/cri/server/restart.go

@@ -111,12 +111,11 @@ func (c *criService) recover(ctx context.Context) error {
 		}
 
 		var (
-			state      = sandboxstore.StateUnknown
-			controller = c.client.SandboxController(sbx.Sandboxer)
-			endpoint   sandboxstore.Endpoint
+			state    = sandboxstore.StateUnknown
+			endpoint sandboxstore.Endpoint
 		)
 
-		status, err := controller.Status(ctx, sbx.ID, false)
+		status, err := c.sandboxService.SandboxStatus(ctx, sbx.Sandboxer, sbx.ID, false)
 		if err != nil {
 			log.G(ctx).
 				WithError(err).