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

Merge pull request #6811 from dmcgowan/lease-plugin

Browse Source
This commit is contained in:
Fu Wei 2022-04-18 18:26:31 +08:00 committed by GitHub
commit 7cbde74432
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 45 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/containerd/builtins.go
View File

@ -21,6 +21,7 @@ import (
_ "github.com/containerd/containerd/diff/walking/plugin"
_ "github.com/containerd/containerd/events/plugin"
_ "github.com/containerd/containerd/gc/scheduler"
_ "github.com/containerd/containerd/leases/plugin"
_ "github.com/containerd/containerd/runtime/restart/monitor"
_ "github.com/containerd/containerd/runtime/v2"
_ "github.com/containerd/containerd/services/containers"

8
services/leases/local.go → leases/plugin/local.go
View File

@ -14,7 +14,7 @@
limitations under the License.
*/
package leases
package plugin
import (
"context"
@ -23,15 +23,15 @@ import (
"github.com/containerd/containerd/leases"
"github.com/containerd/containerd/metadata"
"github.com/containerd/containerd/plugin"
"github.com/containerd/containerd/services"
)
func init() {
plugin.Register(&plugin.Registration{
Type: plugin.ServicePlugin,
ID: services.LeasesService,
Type: plugin.LeasePlugin,
ID: "manager",
Requires: []plugin.Type{
plugin.MetadataPlugin,
plugin.GCPlugin,
},
InitFn: func(ic *plugin.InitContext) (interface{}, error) {
m, err := ic.Get(plugin.MetadataPlugin)

28
pkg/cri/cri.go
View File

@ -113,19 +113,26 @@ func initCRIService(ic *plugin.InitContext) (interface{}, error) {
// getServicesOpts get service options from plugin context.
func getServicesOpts(ic *plugin.InitContext) ([]containerd.ServicesOpt, error) {
var opts []containerd.ServicesOpt
for t, fn := range map[plugin.Type]func(interface{}) containerd.ServicesOpt{
plugin.EventPlugin: func(i interface{}) containerd.ServicesOpt {
return containerd.WithEventService(i.(containerd.EventService))
},
plugin.LeasePlugin: func(i interface{}) containerd.ServicesOpt {
return containerd.WithLeasesService(i.(leases.Manager))
},
} {
i, err := ic.Get(t)
if err != nil {
return nil, fmt.Errorf("failed to get %q plugin: %w", t, err)
}
opts = append(opts, fn(i))
}
plugins, err := ic.GetByType(plugin.ServicePlugin)
if err != nil {
return nil, fmt.Errorf("failed to get service plugin: %w", err)
}
ep, err := ic.Get(plugin.EventPlugin)
if err != nil {
return nil, fmt.Errorf("failed to get event plugin: %w", err)
}
opts := []containerd.ServicesOpt{
containerd.WithEventService(ep.(containerd.EventService)),
}
for s, fn := range map[string]func(interface{}) containerd.ServicesOpt{
services.ContentService: func(s interface{}) containerd.ServicesOpt {
return containerd.WithContentStore(s.(content.Store))
@ -148,9 +155,6 @@ func getServicesOpts(ic *plugin.InitContext) ([]containerd.ServicesOpt, error) {
services.NamespacesService: func(s interface{}) containerd.ServicesOpt {
return containerd.WithNamespaceClient(s.(namespaces.NamespacesClient))
},
services.LeasesService: func(s interface{}) containerd.ServicesOpt {
return containerd.WithLeasesService(s.(leases.Manager))
},
services.IntrospectionService: func(s interface{}) containerd.ServicesOpt {
return containerd.WithIntrospectionClient(s.(introspectionapi.IntrospectionClient))
},

2
plugin/plugin.go
View File

@ -76,6 +76,8 @@ const (
GCPlugin Type = "io.containerd.gc.v1"
// EventPlugin implements event handling
EventPlugin Type = "io.containerd.event.v1"
// LeasePlugin implements lease manager
LeasePlugin Type = "io.containerd.lease.v1"
// TracingProcessorPlugin implements a open telemetry span processor
TracingProcessorPlugin Type = "io.containerd.tracing.processor.v1"
)

8
plugin/plugin_test.go
View File

@ -98,12 +98,12 @@ func TestContainerdPlugin(t *testing.T) {
Type: GRPCPlugin,
ID: "leases",
Requires: []Type{
ServicePlugin,
LeasePlugin,
},
})
Register(&Registration{
Type: ServicePlugin,
ID: services.LeasesService,
Type: LeasePlugin,
ID: "manager",
Requires: []Type{
MetadataPlugin,
},
@ -250,7 +250,6 @@ func TestContainerdPlugin(t *testing.T) {
"io.containerd.service.v1.introspection-service",
"io.containerd.service.v1.namespaces-service",
"io.containerd.service.v1.containers-service",
"io.containerd.service.v1.leases-service",
"io.containerd.differ.v1.walking",
"io.containerd.service.v1.diff-service",
"io.containerd.service.v1.snapshots-service",
@ -259,6 +258,7 @@ func TestContainerdPlugin(t *testing.T) {
"io.containerd.grpc.v1.content",
"io.containerd.grpc.v1.containers",
"io.containerd.grpc.v1.events",
"io.containerd.lease.v1.manager",
"io.containerd.grpc.v1.leases",
"io.containerd.grpc.v1.diff",
"io.containerd.grpc.v1.snapshots",

28
runtime/restart/monitor/monitor.go
View File

@ -91,19 +91,26 @@ func init() {
// getServicesOpts get service options from plugin context.
func getServicesOpts(ic *plugin.InitContext) ([]containerd.ServicesOpt, error) {
var opts []containerd.ServicesOpt
for t, fn := range map[plugin.Type]func(interface{}) containerd.ServicesOpt{
plugin.EventPlugin: func(i interface{}) containerd.ServicesOpt {
return containerd.WithEventService(i.(containerd.EventService))
},
plugin.LeasePlugin: func(i interface{}) containerd.ServicesOpt {
return containerd.WithLeasesService(i.(leases.Manager))
},
} {
i, err := ic.Get(t)
if err != nil {
return nil, fmt.Errorf("failed to get %q plugin: %w", t, err)
}
opts = append(opts, fn(i))
}
plugins, err := ic.GetByType(plugin.ServicePlugin)
if err != nil {
return nil, fmt.Errorf("failed to get service plugin: %w", err)
}
ep, err := ic.Get(plugin.EventPlugin)
if err != nil {
return nil, fmt.Errorf("failed to get event plugin: %w", err)
}
opts := []containerd.ServicesOpt{
containerd.WithEventService(ep.(containerd.EventService)),
}
for s, fn := range map[string]func(interface{}) containerd.ServicesOpt{
services.ContentService: func(s interface{}) containerd.ServicesOpt {
return containerd.WithContentStore(s.(content.Store))
@ -126,9 +133,6 @@ func getServicesOpts(ic *plugin.InitContext) ([]containerd.ServicesOpt, error) {
services.NamespacesService: func(s interface{}) containerd.ServicesOpt {
return containerd.WithNamespaceClient(s.(namespacesapi.NamespacesClient))
},
services.LeasesService: func(s interface{}) containerd.ServicesOpt {
return containerd.WithLeasesService(s.(leases.Manager))
},
} {
p := plugins[s]
if p == nil {

14
services/leases/service.go
View File

@ -18,13 +18,11 @@ package leases
import (
"context"
"errors"
api "github.com/containerd/containerd/api/services/leases/v1"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/leases"
"github.com/containerd/containerd/plugin"
"github.com/containerd/containerd/services"
ptypes "github.com/gogo/protobuf/types"
"google.golang.org/grpc"
)
@ -34,18 +32,10 @@ func init() {
Type: plugin.GRPCPlugin,
ID: "leases",
Requires: []plugin.Type{
plugin.ServicePlugin,
plugin.LeasePlugin,
},
InitFn: func(ic *plugin.InitContext) (interface{}, error) {
plugins, err := ic.GetByType(plugin.ServicePlugin)
if err != nil {
return nil, err
}
p, ok := plugins[services.LeasesService]
if !ok {
return nil, errors.New("leases service not found")
}
i, err := p.Instance()
i, err := ic.GetByID(plugin.LeasePlugin, "manager")
if err != nil {
return nil, err
}

2
services/services.go
View File

@ -29,8 +29,6 @@ const (
TasksService = "tasks-service"
// NamespacesService is id of namespaces service.
NamespacesService = "namespaces-service"
// LeasesService is id of leases service.
LeasesService = "leases-service"
// DiffService is id of diff service.
DiffService = "diff-service"
// IntrospectionService is the id of introspection service