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

runtime/opts: move WithNamespaceCgroupDeletion from containerd to its own package

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
 }

runtime/opts/opts_linux.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package containerd
+package opts
 
 import (
 	"context"