Merge pull request #9275 from abel-von/sandbox-plugin-1019

sandbox: podsandbox controller init its own client

services/sandbox/controller_service.go

@@ -31,7 +31,6 @@ import (
 	"github.com/containerd/containerd/v2/plugins"
 	"github.com/containerd/containerd/v2/protobuf"
 	"github.com/containerd/containerd/v2/sandbox"
-	"github.com/containerd/containerd/v2/services"
 	"github.com/containerd/log"
 	"github.com/containerd/plugin"
 	"github.com/containerd/plugin/registry"
@@ -42,15 +41,20 @@ func init() {
 		Type: plugins.GRPCPlugin,
 		ID:   "sandbox-controllers",
 		Requires: []plugin.Type{
-			plugins.ServicePlugin,
+			plugins.SandboxControllerPlugin,
 			plugins.EventPlugin,
 		},
 		InitFn: func(ic *plugin.InitContext) (interface{}, error) {
-			i, err := ic.GetByID(plugins.ServicePlugin, services.SandboxControllersService)
+			sandboxers, err := ic.GetByType(plugins.SandboxControllerPlugin)
 			if err != nil {
 				return nil, err
 			}
-			sc := i.(map[string]sandbox.Controller)
+
+			sc := make(map[string]sandbox.Controller)
+			for name, p := range sandboxers {
+				sc[name] = p.(sandbox.Controller)
+			}
+
 			ep, err := ic.GetSingle(plugins.EventPlugin)
 			if err != nil {
 				return nil, err

services/sandbox/sandboxers.go

@@ -1,46 +0,0 @@
-/*
-   Copyright The containerd Authors.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-*/
-
-package sandbox
-
-import (
-	"github.com/containerd/containerd/v2/plugins"
-	"github.com/containerd/containerd/v2/sandbox"
-	"github.com/containerd/containerd/v2/services"
-	"github.com/containerd/plugin"
-	"github.com/containerd/plugin/registry"
-)
-
-func init() {
-	registry.Register(&plugin.Registration{
-		Type: plugins.ServicePlugin,
-		ID:   services.SandboxControllersService,
-		Requires: []plugin.Type{
-			plugins.SandboxControllerPlugin,
-		},
-		InitFn: func(ic *plugin.InitContext) (interface{}, error) {
-			sandboxesRaw, err := ic.GetByType(plugins.SandboxControllerPlugin)
-			if err != nil {
-				return nil, err
-			}
-			sandboxers := make(map[string]sandbox.Controller)
-			for name, srv := range sandboxesRaw {
-				sandboxers[name] = srv.(sandbox.Controller)
-			}
-			return sandboxers, nil
-		},
-	})
-}