Merge pull request #4506 from dmcgowan/refactor-overlay-plugin

estesp · web-flow · commit efa0e809135e · 2020-08-27T08:48:58.000-04:00
Separate overlay implementation from plugin
diff --git a/cmd/containerd/builtins_linux.go b/cmd/containerd/builtins_linux.go
@@ -23,5 +23,5 @@ import (
 	_ "github.com/containerd/containerd/runtime/v2"
 	_ "github.com/containerd/containerd/runtime/v2/runc/options"
 	_ "github.com/containerd/containerd/snapshots/native"
-	_ "github.com/containerd/containerd/snapshots/overlay"
+	_ "github.com/containerd/containerd/snapshots/overlay/plugin"
 )
diff --git a/snapshots/overlay/overlay.go b/snapshots/overlay/overlay.go
@@ -29,38 +29,12 @@ import (
 
 	"github.com/containerd/containerd/log"
 	"github.com/containerd/containerd/mount"
-	"github.com/containerd/containerd/platforms"
-	"github.com/containerd/containerd/plugin"
 	"github.com/containerd/containerd/snapshots"
 	"github.com/containerd/containerd/snapshots/storage"
 	"github.com/containerd/continuity/fs"
 	"github.com/pkg/errors"
 )
 
-func init() {
-	plugin.Register(&plugin.Registration{
-		Type:   plugin.SnapshotPlugin,
-		ID:     "overlayfs",
-		Config: &Config{},
-		InitFn: func(ic *plugin.InitContext) (interface{}, error) {
-			ic.Meta.Platforms = append(ic.Meta.Platforms, platforms.DefaultSpec())
-
-			config, ok := ic.Config.(*Config)
-			if !ok {
-				return nil, errors.New("invalid overlay configuration")
-			}
-
-			root := ic.Root
-			if config.RootPath != "" {
-				root = config.RootPath
-			}
-
-			ic.Meta.Exports["root"] = root
-			return NewSnapshotter(root, AsynchronousRemove)
-		},
-	})
-}
-
 // SnapshotterConfig is used to configure the overlay snapshotter instance
 type SnapshotterConfig struct {
 	asyncRemove bool
diff --git a/snapshots/overlay/plugin/plugin.go b/snapshots/overlay/plugin/plugin.go
@@ -18,8 +18,40 @@
 
 package overlay
 
+import (
+	"errors"
+
+	"github.com/containerd/containerd/platforms"
+	"github.com/containerd/containerd/plugin"
+	"github.com/containerd/containerd/snapshots/overlay"
+)
+
 // Config represents configuration for the overlay plugin.
 type Config struct {
 	// Root directory for the plugin
 	RootPath string `toml:"root_path"`
 }
+
+func init() {
+	plugin.Register(&plugin.Registration{
+		Type:   plugin.SnapshotPlugin,
+		ID:     "overlayfs",
+		Config: &Config{},
+		InitFn: func(ic *plugin.InitContext) (interface{}, error) {
+			ic.Meta.Platforms = append(ic.Meta.Platforms, platforms.DefaultSpec())
+
+			config, ok := ic.Config.(*Config)
+			if !ok {
+				return nil, errors.New("invalid overlay configuration")
+			}
+
+			root := ic.Root
+			if config.RootPath != "" {
+				root = config.RootPath
+			}
+
+			ic.Meta.Exports["root"] = root
+			return overlay.NewSnapshotter(root, overlay.AsynchronousRemove)
+		},
+	})
+}

Original file line number	Diff line number	Diff line change
`@@ -23,5 +23,5 @@ import (`
`23`	`23`	`_ "github.com/containerd/containerd/runtime/v2"`
`24`	`24`	`_ "github.com/containerd/containerd/runtime/v2/runc/options"`
`25`	`25`	`_ "github.com/containerd/containerd/snapshots/native"`
`26`		`- _ "github.com/containerd/containerd/snapshots/overlay"`
	`26`	`+ _ "github.com/containerd/containerd/snapshots/overlay/plugin"`
`27`	`27`	`)`