From 6624a70d92781deff967c224b1f458b99a57bbe6 Mon Sep 17 00:00:00 2001 From: Tibor Vass Date: Tue, 20 Aug 2019 22:00:48 +0000 Subject: [PATCH] runtime/opts: move WithNamespaceCgroupDeletion from containerd to its own package The cgroup dependency brings in quite a lot only for WithNamespaceCgroupDeletion, which is a namespaces.DeleteOpt. Signed-off-by: Tibor Vass --- cmd/ctr/commands/namespaces/namespaces_linux.go | 8 ++++---- namespaces_opts_linux.go => runtime/opts/opts_linux.go | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) rename namespaces_opts_linux.go => runtime/opts/opts_linux.go (98%) diff --git a/cmd/ctr/commands/namespaces/namespaces_linux.go b/cmd/ctr/commands/namespaces/namespaces_linux.go index 0300bb103..8562822a1 100644 --- 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/namespaces_opts_linux.go b/runtime/opts/opts_linux.go similarity index 98% rename from namespaces_opts_linux.go rename to runtime/opts/opts_linux.go index 6b8cc8f85..012bdb2b8 100644 --- a/namespaces_opts_linux.go +++ b/runtime/opts/opts_linux.go @@ -14,7 +14,7 @@ limitations under the License. */ -package containerd +package opts import ( "context"