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

Add sandbox to in memory services

Browse Source 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
This commit is contained in:
Maksym Pavlenko
2022-07-29 14:00:06 -07:00
parent e47c433d57
commit f51014f8d5
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
integration/build_local_containerd_helper_test_linux.go
View File

@@ -19,5 +19,6 @@ package integration
import ( import (
// Register for linux platforms // Register for linux platforms
_ "github.com/containerd/containerd/runtime/v1/linux" _ "github.com/containerd/containerd/runtime/v1/linux"
_ "github.com/containerd/containerd/services/sandbox" // WithInMemoryServices will fail otherwise
_ "github.com/containerd/containerd/snapshots/overlay/plugin" _ "github.com/containerd/containerd/snapshots/overlay/plugin"
) )

12
services.go
View File

@@ -24,7 +24,7 @@ import (
imagesapi "github.com/containerd/containerd/api/services/images/v1" imagesapi "github.com/containerd/containerd/api/services/images/v1"
introspectionapi "github.com/containerd/containerd/api/services/introspection/v1" introspectionapi "github.com/containerd/containerd/api/services/introspection/v1"
namespacesapi "github.com/containerd/containerd/api/services/namespaces/v1" namespacesapi "github.com/containerd/containerd/api/services/namespaces/v1"
sandboxsapi "github.com/containerd/containerd/api/services/sandbox/v1" sandboxapi "github.com/containerd/containerd/api/services/sandbox/v1"
"github.com/containerd/containerd/api/services/tasks/v1" "github.com/containerd/containerd/api/services/tasks/v1"
"github.com/containerd/containerd/containers" "github.com/containerd/containerd/containers"
"github.com/containerd/containerd/content" "github.com/containerd/containerd/content"
@@ -165,14 +165,14 @@ func WithIntrospectionService(in introspection.Service) ServicesOpt {
} }
// WithSandboxStore sets the sandbox store. // WithSandboxStore sets the sandbox store.
func WithSandboxStore(client sandboxsapi.StoreClient) ServicesOpt { func WithSandboxStore(client sandboxapi.StoreClient) ServicesOpt {
return func(s *services) { return func(s *services) {
s.sandboxStore = NewRemoteSandboxStore(client) s.sandboxStore = NewRemoteSandboxStore(client)
} }
} }
// WithSandboxController sets the sandbox controller. // WithSandboxController sets the sandbox controller.
func WithSandboxController(client sandboxsapi.ControllerClient) ServicesOpt { func WithSandboxController(client sandboxapi.ControllerClient) ServicesOpt {
return func(s *services) { return func(s *services) {
s.sandboxController = NewSandboxRemoteController(client) s.sandboxController = NewSandboxRemoteController(client)
} }
@@ -227,6 +227,12 @@ func WithInMemoryServices(ic *plugin.InitContext) ClientOpt {
srv.IntrospectionService: func(s interface{}) ServicesOpt { srv.IntrospectionService: func(s interface{}) ServicesOpt {
return WithIntrospectionClient(s.(introspectionapi.IntrospectionClient)) return WithIntrospectionClient(s.(introspectionapi.IntrospectionClient))
}, },
srv.SandboxStoreService: func(s interface{}) ServicesOpt {
return WithSandboxStore(s.(sandboxapi.StoreClient))
},
srv.SandboxControllerService: func(s interface{}) ServicesOpt {
return WithSandboxController(s.(sandboxapi.ControllerClient))
},
} { } {
p := plugins[s] p := plugins[s]
if p == nil { if p == nil {