diff --git a/integration/build_local_containerd_helper_test_linux.go b/integration/build_local_containerd_helper_test_linux.go index 8bd8f057c..956744cb1 100644 --- a/integration/build_local_containerd_helper_test_linux.go +++ b/integration/build_local_containerd_helper_test_linux.go @@ -19,5 +19,6 @@ package integration import ( // Register for linux platforms _ "github.com/containerd/containerd/runtime/v1/linux" + _ "github.com/containerd/containerd/services/sandbox" // WithInMemoryServices will fail otherwise _ "github.com/containerd/containerd/snapshots/overlay/plugin" ) diff --git a/services.go b/services.go index 4dbef29c1..bd4351cf2 100644 --- a/services.go +++ b/services.go @@ -24,7 +24,7 @@ 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" - 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/containers" "github.com/containerd/containerd/content" @@ -165,14 +165,14 @@ func WithIntrospectionService(in introspection.Service) ServicesOpt { } // WithSandboxStore sets the sandbox store. -func WithSandboxStore(client sandboxsapi.StoreClient) ServicesOpt { +func WithSandboxStore(client sandboxapi.StoreClient) ServicesOpt { return func(s *services) { s.sandboxStore = NewRemoteSandboxStore(client) } } // WithSandboxController sets the sandbox controller. -func WithSandboxController(client sandboxsapi.ControllerClient) ServicesOpt { +func WithSandboxController(client sandboxapi.ControllerClient) ServicesOpt { return func(s *services) { s.sandboxController = NewSandboxRemoteController(client) } @@ -227,6 +227,12 @@ func WithInMemoryServices(ic *plugin.InitContext) ClientOpt { srv.IntrospectionService: func(s interface{}) ServicesOpt { 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] if p == nil {