From 658f77979c7396376d526614ef57e442bdb67bed Mon Sep 17 00:00:00 2001 From: Julio Montes Date: Thu, 30 Jan 2020 14:41:33 +0000 Subject: [PATCH] rootless: move pkg/rootless to virtcontainers rootless is used in katautils, cli and virtcontainers. It makes more sense if it's part of virtcontainer, this way virtcontainers won't depend on other runtime subpackages Signed-off-by: Julio Montes --- cli/main.go | 2 +- cli/main_test.go | 2 +- pkg/katautils/network.go | 2 +- pkg/katautils/oci.go | 2 +- pkg/katautils/oci_test.go | 2 +- virtcontainers/acrn.go | 2 +- virtcontainers/api_test.go | 2 +- virtcontainers/cgroups.go | 2 +- virtcontainers/container.go | 2 +- virtcontainers/kata_agent.go | 2 +- virtcontainers/kata_agent_test.go | 2 +- virtcontainers/network.go | 2 +- virtcontainers/persist/fs/fs.go | 2 +- {pkg => virtcontainers/pkg}/rootless/rootless.go | 0 {pkg => virtcontainers/pkg}/rootless/rootless_test.go | 0 virtcontainers/sandbox.go | 2 +- virtcontainers/store/filesystem_backend.go | 2 +- 17 files changed, 15 insertions(+), 15 deletions(-) rename {pkg => virtcontainers/pkg}/rootless/rootless.go (100%) rename {pkg => virtcontainers/pkg}/rootless/rootless_test.go (100%) diff --git a/cli/main.go b/cli/main.go index d263af02a..d2ca4835e 100644 --- a/cli/main.go +++ b/cli/main.go @@ -18,12 +18,12 @@ import ( "syscall" "github.com/kata-containers/runtime/pkg/katautils" - "github.com/kata-containers/runtime/pkg/rootless" "github.com/kata-containers/runtime/pkg/signals" vc "github.com/kata-containers/runtime/virtcontainers" exp "github.com/kata-containers/runtime/virtcontainers/experimental" vf "github.com/kata-containers/runtime/virtcontainers/factory" "github.com/kata-containers/runtime/virtcontainers/pkg/oci" + "github.com/kata-containers/runtime/virtcontainers/pkg/rootless" specs "github.com/opencontainers/runtime-spec/specs-go" opentracing "github.com/opentracing/opentracing-go" "github.com/sirupsen/logrus" diff --git a/cli/main_test.go b/cli/main_test.go index e6b92c334..911159fae 100644 --- a/cli/main_test.go +++ b/cli/main_test.go @@ -24,10 +24,10 @@ import ( "github.com/dlespiau/covertool/pkg/cover" ktu "github.com/kata-containers/runtime/pkg/katatestutils" "github.com/kata-containers/runtime/pkg/katautils" - "github.com/kata-containers/runtime/pkg/rootless" vc "github.com/kata-containers/runtime/virtcontainers" "github.com/kata-containers/runtime/virtcontainers/pkg/compatoci" "github.com/kata-containers/runtime/virtcontainers/pkg/oci" + "github.com/kata-containers/runtime/virtcontainers/pkg/rootless" "github.com/kata-containers/runtime/virtcontainers/pkg/vcmock" "github.com/kata-containers/runtime/virtcontainers/types" specs "github.com/opencontainers/runtime-spec/specs-go" diff --git a/pkg/katautils/network.go b/pkg/katautils/network.go index b01d13cee..714fb4614 100644 --- a/pkg/katautils/network.go +++ b/pkg/katautils/network.go @@ -16,8 +16,8 @@ import ( "github.com/containernetworking/plugins/pkg/ns" "github.com/containernetworking/plugins/pkg/testutils" - "github.com/kata-containers/runtime/pkg/rootless" vc "github.com/kata-containers/runtime/virtcontainers" + "github.com/kata-containers/runtime/virtcontainers/pkg/rootless" "golang.org/x/sys/unix" ) diff --git a/pkg/katautils/oci.go b/pkg/katautils/oci.go index ad0eaf2e0..6de8101e9 100644 --- a/pkg/katautils/oci.go +++ b/pkg/katautils/oci.go @@ -13,7 +13,7 @@ import ( "path/filepath" "strings" - "github.com/kata-containers/runtime/pkg/rootless" + "github.com/kata-containers/runtime/virtcontainers/pkg/rootless" ) const ctrsMappingDirMode = os.FileMode(0750) diff --git a/pkg/katautils/oci_test.go b/pkg/katautils/oci_test.go index f6588e7cc..a5e67a140 100644 --- a/pkg/katautils/oci_test.go +++ b/pkg/katautils/oci_test.go @@ -13,7 +13,7 @@ import ( "path/filepath" "testing" - "github.com/kata-containers/runtime/pkg/rootless" + "github.com/kata-containers/runtime/virtcontainers/pkg/rootless" "github.com/stretchr/testify/assert" ) diff --git a/virtcontainers/acrn.go b/virtcontainers/acrn.go index 1b1c7f7df..099de8e25 100644 --- a/virtcontainers/acrn.go +++ b/virtcontainers/acrn.go @@ -21,11 +21,11 @@ import ( "github.com/pkg/errors" "github.com/sirupsen/logrus" - "github.com/kata-containers/runtime/pkg/rootless" "github.com/kata-containers/runtime/virtcontainers/device/config" "github.com/kata-containers/runtime/virtcontainers/persist" persistapi "github.com/kata-containers/runtime/virtcontainers/persist/api" "github.com/kata-containers/runtime/virtcontainers/persist/fs" + "github.com/kata-containers/runtime/virtcontainers/pkg/rootless" "github.com/kata-containers/runtime/virtcontainers/pkg/uuid" "github.com/kata-containers/runtime/virtcontainers/types" "github.com/kata-containers/runtime/virtcontainers/utils" diff --git a/virtcontainers/api_test.go b/virtcontainers/api_test.go index 999999696..7461ef130 100644 --- a/virtcontainers/api_test.go +++ b/virtcontainers/api_test.go @@ -16,11 +16,11 @@ import ( "testing" ktu "github.com/kata-containers/runtime/pkg/katatestutils" - "github.com/kata-containers/runtime/pkg/rootless" "github.com/kata-containers/runtime/virtcontainers/persist" "github.com/kata-containers/runtime/virtcontainers/persist/fs" "github.com/kata-containers/runtime/virtcontainers/pkg/annotations" "github.com/kata-containers/runtime/virtcontainers/pkg/mock" + "github.com/kata-containers/runtime/virtcontainers/pkg/rootless" vcTypes "github.com/kata-containers/runtime/virtcontainers/pkg/types" "github.com/kata-containers/runtime/virtcontainers/types" specs "github.com/opencontainers/runtime-spec/specs-go" diff --git a/virtcontainers/cgroups.go b/virtcontainers/cgroups.go index 3aa71db9d..7c6cf78be 100644 --- a/virtcontainers/cgroups.go +++ b/virtcontainers/cgroups.go @@ -15,7 +15,7 @@ import ( "strings" "github.com/containerd/cgroups" - "github.com/kata-containers/runtime/pkg/rootless" + "github.com/kata-containers/runtime/virtcontainers/pkg/rootless" libcontcgroups "github.com/opencontainers/runc/libcontainer/cgroups" libcontcgroupsfs "github.com/opencontainers/runc/libcontainer/cgroups/fs" libcontcgroupssystemd "github.com/opencontainers/runc/libcontainer/cgroups/systemd" diff --git a/virtcontainers/container.go b/virtcontainers/container.go index 4690e8bc0..2a9f2269e 100644 --- a/virtcontainers/container.go +++ b/virtcontainers/container.go @@ -26,9 +26,9 @@ import ( "github.com/sirupsen/logrus" "golang.org/x/sys/unix" - "github.com/kata-containers/runtime/pkg/rootless" "github.com/kata-containers/runtime/virtcontainers/device/config" "github.com/kata-containers/runtime/virtcontainers/device/manager" + "github.com/kata-containers/runtime/virtcontainers/pkg/rootless" "github.com/kata-containers/runtime/virtcontainers/store" ) diff --git a/virtcontainers/kata_agent.go b/virtcontainers/kata_agent.go index bf8e6b8f2..fa3f33987 100644 --- a/virtcontainers/kata_agent.go +++ b/virtcontainers/kata_agent.go @@ -22,12 +22,12 @@ import ( aTypes "github.com/kata-containers/agent/pkg/types" kataclient "github.com/kata-containers/agent/protocols/client" "github.com/kata-containers/agent/protocols/grpc" - "github.com/kata-containers/runtime/pkg/rootless" "github.com/kata-containers/runtime/virtcontainers/device/config" persistapi "github.com/kata-containers/runtime/virtcontainers/persist/api" "github.com/kata-containers/runtime/virtcontainers/persist/fs" vcAnnotations "github.com/kata-containers/runtime/virtcontainers/pkg/annotations" ns "github.com/kata-containers/runtime/virtcontainers/pkg/nsenter" + "github.com/kata-containers/runtime/virtcontainers/pkg/rootless" vcTypes "github.com/kata-containers/runtime/virtcontainers/pkg/types" "github.com/kata-containers/runtime/virtcontainers/pkg/uuid" "github.com/kata-containers/runtime/virtcontainers/store" diff --git a/virtcontainers/kata_agent_test.go b/virtcontainers/kata_agent_test.go index dcd6db82c..27534220f 100644 --- a/virtcontainers/kata_agent_test.go +++ b/virtcontainers/kata_agent_test.go @@ -26,13 +26,13 @@ import ( aTypes "github.com/kata-containers/agent/pkg/types" pb "github.com/kata-containers/agent/protocols/grpc" - "github.com/kata-containers/runtime/pkg/rootless" "github.com/kata-containers/runtime/virtcontainers/device/api" "github.com/kata-containers/runtime/virtcontainers/device/config" "github.com/kata-containers/runtime/virtcontainers/device/drivers" "github.com/kata-containers/runtime/virtcontainers/device/manager" "github.com/kata-containers/runtime/virtcontainers/persist" "github.com/kata-containers/runtime/virtcontainers/pkg/mock" + "github.com/kata-containers/runtime/virtcontainers/pkg/rootless" vcTypes "github.com/kata-containers/runtime/virtcontainers/pkg/types" "github.com/kata-containers/runtime/virtcontainers/types" ) diff --git a/virtcontainers/network.go b/virtcontainers/network.go index c6c199b83..d70c53604 100644 --- a/virtcontainers/network.go +++ b/virtcontainers/network.go @@ -25,7 +25,7 @@ import ( "github.com/vishvananda/netns" "golang.org/x/sys/unix" - "github.com/kata-containers/runtime/pkg/rootless" + "github.com/kata-containers/runtime/virtcontainers/pkg/rootless" vcTypes "github.com/kata-containers/runtime/virtcontainers/pkg/types" "github.com/kata-containers/runtime/virtcontainers/pkg/uuid" "github.com/kata-containers/runtime/virtcontainers/utils" diff --git a/virtcontainers/persist/fs/fs.go b/virtcontainers/persist/fs/fs.go index 33acebecd..34f30d519 100644 --- a/virtcontainers/persist/fs/fs.go +++ b/virtcontainers/persist/fs/fs.go @@ -14,8 +14,8 @@ import ( "path/filepath" "syscall" - "github.com/kata-containers/runtime/pkg/rootless" persistapi "github.com/kata-containers/runtime/virtcontainers/persist/api" + "github.com/kata-containers/runtime/virtcontainers/pkg/rootless" "github.com/sirupsen/logrus" ) diff --git a/pkg/rootless/rootless.go b/virtcontainers/pkg/rootless/rootless.go similarity index 100% rename from pkg/rootless/rootless.go rename to virtcontainers/pkg/rootless/rootless.go diff --git a/pkg/rootless/rootless_test.go b/virtcontainers/pkg/rootless/rootless_test.go similarity index 100% rename from pkg/rootless/rootless_test.go rename to virtcontainers/pkg/rootless/rootless_test.go diff --git a/virtcontainers/sandbox.go b/virtcontainers/sandbox.go index 19caccc15..9f5f831b0 100644 --- a/virtcontainers/sandbox.go +++ b/virtcontainers/sandbox.go @@ -26,7 +26,6 @@ import ( "github.com/vishvananda/netlink" "github.com/kata-containers/agent/protocols/grpc" - "github.com/kata-containers/runtime/pkg/rootless" "github.com/kata-containers/runtime/virtcontainers/device/api" "github.com/kata-containers/runtime/virtcontainers/device/config" "github.com/kata-containers/runtime/virtcontainers/device/drivers" @@ -36,6 +35,7 @@ import ( persistapi "github.com/kata-containers/runtime/virtcontainers/persist/api" "github.com/kata-containers/runtime/virtcontainers/pkg/annotations" "github.com/kata-containers/runtime/virtcontainers/pkg/compatoci" + "github.com/kata-containers/runtime/virtcontainers/pkg/rootless" vcTypes "github.com/kata-containers/runtime/virtcontainers/pkg/types" "github.com/kata-containers/runtime/virtcontainers/store" "github.com/kata-containers/runtime/virtcontainers/types" diff --git a/virtcontainers/store/filesystem_backend.go b/virtcontainers/store/filesystem_backend.go index b74699f66..124d339ce 100644 --- a/virtcontainers/store/filesystem_backend.go +++ b/virtcontainers/store/filesystem_backend.go @@ -14,7 +14,7 @@ import ( "path/filepath" "syscall" - "github.com/kata-containers/runtime/pkg/rootless" + "github.com/kata-containers/runtime/virtcontainers/pkg/rootless" "github.com/kata-containers/runtime/virtcontainers/pkg/uuid" opentracing "github.com/opentracing/opentracing-go" "github.com/sirupsen/logrus"