github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Refactor sandbox controller interface

Browse Source 
Update the sandbox controller interface to use local types rather than
using the API types.

Signed-off-by: Derek McGowan <derek@mcg.dev>
This commit is contained in:
Derek McGowan
2023-01-18 21:53:34 -08:00
parent 20de989afc
commit 2717685dad
21 changed files with 378 additions and 355 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services.go
View File

@@ -24,7 +24,6 @@ import (
imagesapi "github.com/containerd/containerd/api/services/images/v1"
introspectionapi "github.com/containerd/containerd/api/services/introspection/v1"
namespacesapi "github.com/containerd/containerd/api/services/namespaces/v1"
sandboxapi "github.com/containerd/containerd/api/services/sandbox/v1"
"github.com/containerd/containerd/api/services/tasks/v1"
"github.com/containerd/containerd/containers"
"github.com/containerd/containerd/content"
@@ -33,7 +32,6 @@ import (
"github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/plugin"
"github.com/containerd/containerd/sandbox"
"github.com/containerd/containerd/sandbox/proxy"
srv "github.com/containerd/containerd/services"
"github.com/containerd/containerd/services/introspection"
"github.com/containerd/containerd/snapshots"
@@ -173,9 +171,9 @@ func WithSandboxStore(client sandbox.Store) ServicesOpt {
}
// WithSandboxController sets the sandbox controller.
func WithSandboxController(client sandboxapi.ControllerClient) ServicesOpt {
func WithSandboxController(client sandbox.Controller) ServicesOpt {
return func(s *services) {
s.sandboxController = proxy.NewSandboxController(client)
s.sandboxController = client
}
}
@@ -232,7 +230,7 @@ func WithInMemoryServices(ic *plugin.InitContext) ClientOpt {
return WithIntrospectionClient(s.(introspectionapi.IntrospectionClient))
},
srv.SandboxControllerService: func(s interface{}) ServicesOpt {
return WithSandboxController(s.(sandboxapi.ControllerClient))
return WithSandboxController(s.(sandbox.Controller))
},
} {
p := plugins[s]