Generalize the plugin package
Remove containerd specific parts of the plugin package to prepare its move out of the main repository. Separate the plugin registration singleton into a separate package. Separating out the plugin package and registration makes it easier to implement external plugins without creating a dependency loop. Signed-off-by: Derek McGowan <derek@mcg.dev>
This commit is contained in:
		| @@ -36,6 +36,7 @@ import ( | ||||
| 	"github.com/containerd/containerd/metadata" | ||||
| 	"github.com/containerd/containerd/mount" | ||||
| 	"github.com/containerd/containerd/plugin" | ||||
| 	"github.com/containerd/containerd/plugin/registry" | ||||
| 	"github.com/containerd/containerd/plugins" | ||||
| 	"github.com/containerd/log" | ||||
| 	digest "github.com/opencontainers/go-digest" | ||||
| @@ -48,7 +49,7 @@ const ( | ||||
| ) | ||||
|  | ||||
| func init() { | ||||
| 	plugin.Register(&plugin.Registration{ | ||||
| 	registry.Register(&plugin.Registration{ | ||||
| 		Type: plugins.DiffPlugin, | ||||
| 		ID:   "windows-lcow", | ||||
| 		Requires: []plugin.Type{ | ||||
|   | ||||
| @@ -23,11 +23,12 @@ import ( | ||||
| 	"github.com/containerd/containerd/metadata" | ||||
| 	"github.com/containerd/containerd/platforms" | ||||
| 	"github.com/containerd/containerd/plugin" | ||||
| 	"github.com/containerd/containerd/plugin/registry" | ||||
| 	"github.com/containerd/containerd/plugins" | ||||
| ) | ||||
|  | ||||
| func init() { | ||||
| 	plugin.Register(&plugin.Registration{ | ||||
| 	registry.Register(&plugin.Registration{ | ||||
| 		Type: plugins.DiffPlugin, | ||||
| 		ID:   "walking", | ||||
| 		Requires: []plugin.Type{ | ||||
|   | ||||
| @@ -39,6 +39,7 @@ import ( | ||||
| 	"github.com/containerd/containerd/pkg/epoch" | ||||
| 	"github.com/containerd/containerd/platforms" | ||||
| 	"github.com/containerd/containerd/plugin" | ||||
| 	"github.com/containerd/containerd/plugin/registry" | ||||
| 	"github.com/containerd/containerd/plugins" | ||||
| 	"github.com/containerd/log" | ||||
| 	"github.com/opencontainers/go-digest" | ||||
| @@ -46,7 +47,7 @@ import ( | ||||
| ) | ||||
|  | ||||
| func init() { | ||||
| 	plugin.Register(&plugin.Registration{ | ||||
| 	registry.Register(&plugin.Registration{ | ||||
| 		Type: plugins.DiffPlugin, | ||||
| 		ID:   "windows", | ||||
| 		Requires: []plugin.Type{ | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Derek McGowan
					Derek McGowan