diff --git a/src/runtime/pkg/containerd-shim-v2/errors.go b/src/runtime/pkg/containerd-shim-v2/errors.go index d4e33e8c1d..77ad23897b 100644 --- a/src/runtime/pkg/containerd-shim-v2/errors.go +++ b/src/runtime/pkg/containerd-shim-v2/errors.go @@ -13,7 +13,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - vc "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/types" + vc "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/types" ) // toGRPC maps the virtcontainers error into a grpc error, diff --git a/src/runtime/pkg/containerd-shim-v2/errors_test.go b/src/runtime/pkg/containerd-shim-v2/errors_test.go index 3657ffbec5..8f2d686e76 100644 --- a/src/runtime/pkg/containerd-shim-v2/errors_test.go +++ b/src/runtime/pkg/containerd-shim-v2/errors_test.go @@ -10,7 +10,7 @@ import ( "syscall" "testing" - vc "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/types" + vc "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/types" "github.com/stretchr/testify/assert" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/src/runtime/virtcontainers/acrn.go b/src/runtime/virtcontainers/acrn.go index a15e42d337..f96faa4d72 100644 --- a/src/runtime/virtcontainers/acrn.go +++ b/src/runtime/virtcontainers/acrn.go @@ -23,9 +23,9 @@ import ( "github.com/kata-containers/kata-containers/src/runtime/pkg/katautils/katatrace" "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/device/config" persistapi "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/persist/api" - vcTypes "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/types" "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/uuid" "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/types" + vcTypes "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/types" "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/utils" ) diff --git a/src/runtime/virtcontainers/agent.go b/src/runtime/virtcontainers/agent.go index 0ada23c6b1..089d099e2e 100644 --- a/src/runtime/virtcontainers/agent.go +++ b/src/runtime/virtcontainers/agent.go @@ -12,8 +12,8 @@ import ( persistapi "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/persist/api" pbTypes "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/agent/protocols" "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/agent/protocols/grpc" - vcTypes "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/types" "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/types" + vcTypes "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/types" specs "github.com/opencontainers/runtime-spec/specs-go" "golang.org/x/net/context" ) diff --git a/src/runtime/virtcontainers/api.go b/src/runtime/virtcontainers/api.go index 68529f08f8..67e7608acb 100644 --- a/src/runtime/virtcontainers/api.go +++ b/src/runtime/virtcontainers/api.go @@ -14,7 +14,7 @@ import ( deviceConfig "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/device/config" "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/cgroups" "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/compatoci" - vcTypes "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/types" + vcTypes "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/types" "github.com/sirupsen/logrus" ) diff --git a/src/runtime/virtcontainers/bridgedmacvlan_endpoint.go b/src/runtime/virtcontainers/bridgedmacvlan_endpoint.go index 67b22a6910..be1cd8abea 100644 --- a/src/runtime/virtcontainers/bridgedmacvlan_endpoint.go +++ b/src/runtime/virtcontainers/bridgedmacvlan_endpoint.go @@ -11,7 +11,7 @@ import ( "github.com/containernetworking/plugins/pkg/ns" persistapi "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/persist/api" - vcTypes "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/types" + vcTypes "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/types" ) var macvlanTrace = getNetworkTrace(BridgedMacvlanEndpointType) diff --git a/src/runtime/virtcontainers/clh.go b/src/runtime/virtcontainers/clh.go index 591efa5aa0..ede620d623 100644 --- a/src/runtime/virtcontainers/clh.go +++ b/src/runtime/virtcontainers/clh.go @@ -28,8 +28,8 @@ import ( "github.com/kata-containers/kata-containers/src/runtime/pkg/katautils/katatrace" "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/device/config" - vcTypes "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/types" "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/types" + vcTypes "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/types" "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/utils" ) diff --git a/src/runtime/virtcontainers/container.go b/src/runtime/virtcontainers/container.go index 60a409a527..08deba243f 100644 --- a/src/runtime/virtcontainers/container.go +++ b/src/runtime/virtcontainers/container.go @@ -22,8 +22,8 @@ import ( "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/device/manager" "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/agent/protocols/grpc" vcAnnotations "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/annotations" - vcTypes "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/types" "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/types" + vcTypes "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/types" "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/utils" specs "github.com/opencontainers/runtime-spec/specs-go" diff --git a/src/runtime/virtcontainers/device/config/config.go b/src/runtime/virtcontainers/device/config/config.go index 4f27d9358b..ca3c40d888 100644 --- a/src/runtime/virtcontainers/device/config/config.go +++ b/src/runtime/virtcontainers/device/config/config.go @@ -15,7 +15,7 @@ import ( "strings" "github.com/go-ini/ini" - vcTypes "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/types" + vcTypes "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/types" "golang.org/x/sys/unix" ) diff --git a/src/runtime/virtcontainers/endpoint.go b/src/runtime/virtcontainers/endpoint.go index 21d0b2a0a3..173df85997 100644 --- a/src/runtime/virtcontainers/endpoint.go +++ b/src/runtime/virtcontainers/endpoint.go @@ -10,7 +10,7 @@ import ( "fmt" persistapi "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/persist/api" - vcTypes "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/types" + vcTypes "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/types" ) // Endpoint represents a physical or virtual network interface. diff --git a/src/runtime/virtcontainers/ipvlan_endpoint.go b/src/runtime/virtcontainers/ipvlan_endpoint.go index 45c5823d0a..4f8f8a115c 100644 --- a/src/runtime/virtcontainers/ipvlan_endpoint.go +++ b/src/runtime/virtcontainers/ipvlan_endpoint.go @@ -11,7 +11,7 @@ import ( "github.com/containernetworking/plugins/pkg/ns" persistapi "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/persist/api" - vcTypes "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/types" + vcTypes "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/types" ) var ipvlanTrace = getNetworkTrace(IPVlanEndpointType) diff --git a/src/runtime/virtcontainers/kata_agent.go b/src/runtime/virtcontainers/kata_agent.go index 1c5c910163..7d366192ce 100644 --- a/src/runtime/virtcontainers/kata_agent.go +++ b/src/runtime/virtcontainers/kata_agent.go @@ -28,9 +28,9 @@ import ( vcAnnotations "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/annotations" vccgroups "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/cgroups" "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/rootless" - vcTypes "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/types" "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/uuid" "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/types" + vcTypes "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/types" "github.com/gogo/protobuf/proto" "github.com/opencontainers/runtime-spec/specs-go" diff --git a/src/runtime/virtcontainers/kata_agent_test.go b/src/runtime/virtcontainers/kata_agent_test.go index c8f5c1b99d..6e329919ed 100644 --- a/src/runtime/virtcontainers/kata_agent_test.go +++ b/src/runtime/virtcontainers/kata_agent_test.go @@ -31,8 +31,8 @@ import ( vcAnnotations "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/annotations" "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/mock" "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/rootless" - vcTypes "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/types" "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/types" + vcTypes "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/types" ) var ( diff --git a/src/runtime/virtcontainers/macvtap_endpoint.go b/src/runtime/virtcontainers/macvtap_endpoint.go index 28cb91b8fd..0124a23600 100644 --- a/src/runtime/virtcontainers/macvtap_endpoint.go +++ b/src/runtime/virtcontainers/macvtap_endpoint.go @@ -11,7 +11,7 @@ import ( "os" persistapi "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/persist/api" - vcTypes "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/types" + vcTypes "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/types" ) var macvtapTrace = getNetworkTrace(MacvtapEndpointType) diff --git a/src/runtime/virtcontainers/mock_agent.go b/src/runtime/virtcontainers/mock_agent.go index 6bb450094c..b66441cb2a 100644 --- a/src/runtime/virtcontainers/mock_agent.go +++ b/src/runtime/virtcontainers/mock_agent.go @@ -12,8 +12,8 @@ import ( persistapi "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/persist/api" pbTypes "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/agent/protocols" "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/agent/protocols/grpc" - vcTypes "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/types" "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/types" + vcTypes "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/types" specs "github.com/opencontainers/runtime-spec/specs-go" "golang.org/x/net/context" ) diff --git a/src/runtime/virtcontainers/persist/api/device.go b/src/runtime/virtcontainers/persist/api/device.go index 2ac88fa8ba..acb05fc674 100644 --- a/src/runtime/virtcontainers/persist/api/device.go +++ b/src/runtime/virtcontainers/persist/api/device.go @@ -6,7 +6,7 @@ package persistapi -import vcTypes "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/types" +import vcTypes "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/types" // ============= sandbox level resources ============= diff --git a/src/runtime/virtcontainers/persist/api/network.go b/src/runtime/virtcontainers/persist/api/network.go index 020fca06ae..7283aba3cb 100644 --- a/src/runtime/virtcontainers/persist/api/network.go +++ b/src/runtime/virtcontainers/persist/api/network.go @@ -7,7 +7,7 @@ package persistapi import ( - vcTypes "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/types" + vcTypes "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/types" "github.com/vishvananda/netlink" ) diff --git a/src/runtime/virtcontainers/physical_endpoint.go b/src/runtime/virtcontainers/physical_endpoint.go index a8703aee2d..f213d9ccb1 100644 --- a/src/runtime/virtcontainers/physical_endpoint.go +++ b/src/runtime/virtcontainers/physical_endpoint.go @@ -17,7 +17,7 @@ import ( "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/device/drivers" persistapi "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/persist/api" "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/cgroups" - vcTypes "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/types" + vcTypes "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/types" "github.com/safchain/ethtool" ) diff --git a/src/runtime/virtcontainers/qemu.go b/src/runtime/virtcontainers/qemu.go index e3e6ade866..7700747e8c 100644 --- a/src/runtime/virtcontainers/qemu.go +++ b/src/runtime/virtcontainers/qemu.go @@ -35,9 +35,9 @@ import ( pkgUtils "github.com/kata-containers/kata-containers/src/runtime/pkg/utils" "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/device/config" persistapi "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/persist/api" - vcTypes "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/types" "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/uuid" "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/types" + vcTypes "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/types" "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/utils" ) diff --git a/src/runtime/virtcontainers/sandbox.go b/src/runtime/virtcontainers/sandbox.go index 6b34d597c6..73c57c8b30 100644 --- a/src/runtime/virtcontainers/sandbox.go +++ b/src/runtime/virtcontainers/sandbox.go @@ -41,8 +41,8 @@ import ( "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/compatoci" "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/cpuset" "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/rootless" - vcTypes "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/types" "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/types" + vcTypes "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/types" "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/utils" ) diff --git a/src/runtime/virtcontainers/tap_endpoint.go b/src/runtime/virtcontainers/tap_endpoint.go index 5cbcb2532b..6cd3f2781b 100644 --- a/src/runtime/virtcontainers/tap_endpoint.go +++ b/src/runtime/virtcontainers/tap_endpoint.go @@ -13,8 +13,8 @@ import ( "github.com/vishvananda/netlink" persistapi "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/persist/api" - vcTypes "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/types" "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/uuid" + vcTypes "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/types" ) var tapTrace = getNetworkTrace(TapEndpointType) diff --git a/src/runtime/virtcontainers/tuntap_endpoint.go b/src/runtime/virtcontainers/tuntap_endpoint.go index 0e899c2b42..6573082edf 100644 --- a/src/runtime/virtcontainers/tuntap_endpoint.go +++ b/src/runtime/virtcontainers/tuntap_endpoint.go @@ -15,7 +15,7 @@ import ( "github.com/vishvananda/netlink" persistapi "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/persist/api" - vcTypes "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/types" + vcTypes "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/types" ) var tuntapTrace = getNetworkTrace(TuntapEndpointType) diff --git a/src/runtime/virtcontainers/pkg/types/errors.go b/src/runtime/virtcontainers/types/errors.go similarity index 100% rename from src/runtime/virtcontainers/pkg/types/errors.go rename to src/runtime/virtcontainers/types/errors.go diff --git a/src/runtime/virtcontainers/pkg/types/pcipath.go b/src/runtime/virtcontainers/types/pcipath.go similarity index 100% rename from src/runtime/virtcontainers/pkg/types/pcipath.go rename to src/runtime/virtcontainers/types/pcipath.go diff --git a/src/runtime/virtcontainers/pkg/types/pcipath_test.go b/src/runtime/virtcontainers/types/pcipath_test.go similarity index 100% rename from src/runtime/virtcontainers/pkg/types/pcipath_test.go rename to src/runtime/virtcontainers/types/pcipath_test.go diff --git a/src/runtime/virtcontainers/veth_endpoint.go b/src/runtime/virtcontainers/veth_endpoint.go index 8a566b13a9..ffeb86992c 100644 --- a/src/runtime/virtcontainers/veth_endpoint.go +++ b/src/runtime/virtcontainers/veth_endpoint.go @@ -11,7 +11,7 @@ import ( "github.com/containernetworking/plugins/pkg/ns" persistapi "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/persist/api" - vcTypes "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/types" + vcTypes "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/types" ) var vethTrace = getNetworkTrace(VethEndpointType) diff --git a/src/runtime/virtcontainers/vhostuser_endpoint.go b/src/runtime/virtcontainers/vhostuser_endpoint.go index 4be986cb65..a564e58c6e 100644 --- a/src/runtime/virtcontainers/vhostuser_endpoint.go +++ b/src/runtime/virtcontainers/vhostuser_endpoint.go @@ -13,7 +13,7 @@ import ( "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/device/config" persistapi "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/persist/api" - vcTypes "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/types" + vcTypes "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/types" "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/utils" )