Merge pull request #3564 from tiborvass/move-cgroups-dep-to-namespaces-pkg

dmcgowan · web-flow · commit b039c3918668 · 2019-09-03T10:38:53.000-07:00
runtime/opts: move WithNamespaceCgroupDeletion from containerd to its own package
diff --git a/cmd/ctr/commands/namespaces/namespaces_linux.go b/cmd/ctr/commands/namespaces/namespaces_linux.go
@@ -17,15 +17,15 @@
 package namespaces
 
 import (
-	"github.com/containerd/containerd"
 	"github.com/containerd/containerd/namespaces"
+	"github.com/containerd/containerd/runtime/opts"
 	"github.com/urfave/cli"
 )
 
 func deleteOpts(context *cli.Context) []namespaces.DeleteOpts {
-	var opts []namespaces.DeleteOpts
+	var delOpts []namespaces.DeleteOpts
 	if context.Bool("cgroup") {
-		opts = append(opts, containerd.WithNamespaceCgroupDeletion)
+		delOpts = append(delOpts, opts.WithNamespaceCgroupDeletion)
 	}
-	return opts
+	return delOpts
 }
diff --git a/runtime/opts/opts_linux.go b/runtime/opts/opts_linux.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package containerd
+package opts
 
 import (
 	"context"

Original file line number	Diff line number	Diff line change
`@@ -17,15 +17,15 @@`
`17`	`17`	`package namespaces`
`18`	`18`
`19`	`19`	`import (`
`20`		`- "github.com/containerd/containerd"`
`21`	`20`	`"github.com/containerd/containerd/namespaces"`
	`21`	`+ "github.com/containerd/containerd/runtime/opts"`
`22`	`22`	`"github.com/urfave/cli"`
`23`	`23`	`)`
`24`	`24`
`25`	`25`	`func deleteOpts(context *cli.Context) []namespaces.DeleteOpts {`
`26`		`- var opts []namespaces.DeleteOpts`
	`26`	`+ var delOpts []namespaces.DeleteOpts`
`27`	`27`	`if context.Bool("cgroup") {`
`28`		`- opts = append(opts, containerd.WithNamespaceCgroupDeletion)`
	`28`	`+ delOpts = append(delOpts, opts.WithNamespaceCgroupDeletion)`
`29`	`29`	`}`
`30`		`- return opts`
	`30`	`+ return delOpts`
`31`	`31`	`}`