diff --git a/integration/main_test.go b/integration/main_test.go index 88a5ced38..c68ddec7e 100644 --- a/integration/main_test.go +++ b/integration/main_test.go @@ -41,8 +41,8 @@ import ( "github.com/containerd/containerd/integration/remote" dialer "github.com/containerd/containerd/integration/util" - "github.com/containerd/containerd/pkg/constants" criconfig "github.com/containerd/containerd/pkg/cri/config" + "github.com/containerd/containerd/pkg/cri/constants" "github.com/containerd/containerd/pkg/cri/server" "github.com/containerd/containerd/pkg/util" ) diff --git a/pkg/containerd/util/util.go b/pkg/containerd/util/util.go index 27f2167af..22266ad58 100644 --- a/pkg/containerd/util/util.go +++ b/pkg/containerd/util/util.go @@ -22,7 +22,7 @@ import ( "github.com/containerd/containerd/namespaces" "golang.org/x/net/context" - "github.com/containerd/containerd/pkg/constants" + "github.com/containerd/containerd/pkg/cri/constants" ) // deferCleanupTimeout is the default timeout for containerd cleanup operations diff --git a/pkg/annotations/annotations.go b/pkg/cri/annotations/annotations.go similarity index 100% rename from pkg/annotations/annotations.go rename to pkg/cri/annotations/annotations.go diff --git a/pkg/cri/config/config_unix.go b/pkg/cri/config/config_unix.go index 6d8523abb..bbba13409 100644 --- a/pkg/cri/config/config_unix.go +++ b/pkg/cri/config/config_unix.go @@ -21,7 +21,7 @@ package config import ( "github.com/BurntSushi/toml" "github.com/containerd/containerd" - "github.com/containerd/containerd/pkg/streaming" + "github.com/containerd/containerd/pkg/cri/streaming" ) // DefaultConfig returns default configurations of cri plugin. diff --git a/pkg/cri/config/config_windows.go b/pkg/cri/config/config_windows.go index de4593bdb..44efd281f 100644 --- a/pkg/cri/config/config_windows.go +++ b/pkg/cri/config/config_windows.go @@ -23,7 +23,7 @@ import ( "path/filepath" "github.com/containerd/containerd" - "github.com/containerd/containerd/pkg/streaming" + "github.com/containerd/containerd/pkg/cri/streaming" ) // DefaultConfig returns default configurations of cri plugin. diff --git a/pkg/constants/constants.go b/pkg/cri/constants/constants.go similarity index 100% rename from pkg/constants/constants.go rename to pkg/cri/constants/constants.go diff --git a/pkg/cri/cri.go b/pkg/cri/cri.go index 1bf5b9163..1e5bf4120 100644 --- a/pkg/cri/cri.go +++ b/pkg/cri/cri.go @@ -39,9 +39,9 @@ import ( "github.com/sirupsen/logrus" "k8s.io/klog/v2" - "github.com/containerd/containerd/pkg/constants" criplatforms "github.com/containerd/containerd/pkg/containerd/platforms" criconfig "github.com/containerd/containerd/pkg/cri/config" + "github.com/containerd/containerd/pkg/cri/constants" "github.com/containerd/containerd/pkg/cri/server" ) diff --git a/pkg/cri/server/container_create_linux.go b/pkg/cri/server/container_create_linux.go index 3c69dd87d..6137c87de 100644 --- a/pkg/cri/server/container_create_linux.go +++ b/pkg/cri/server/container_create_linux.go @@ -34,8 +34,8 @@ import ( "github.com/pkg/errors" runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2" - "github.com/containerd/containerd/pkg/annotations" customopts "github.com/containerd/containerd/pkg/containerd/opts" + "github.com/containerd/containerd/pkg/cri/annotations" "github.com/containerd/containerd/pkg/cri/config" ) diff --git a/pkg/cri/server/container_create_linux_test.go b/pkg/cri/server/container_create_linux_test.go index 52bab35df..74f9869ea 100644 --- a/pkg/cri/server/container_create_linux_test.go +++ b/pkg/cri/server/container_create_linux_test.go @@ -40,9 +40,9 @@ import ( "github.com/stretchr/testify/require" runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2" - "github.com/containerd/containerd/pkg/annotations" "github.com/containerd/containerd/pkg/containerd/opts" ctrdutil "github.com/containerd/containerd/pkg/containerd/util" + "github.com/containerd/containerd/pkg/cri/annotations" "github.com/containerd/containerd/pkg/cri/config" ostesting "github.com/containerd/containerd/pkg/os/testing" "github.com/containerd/containerd/pkg/util" diff --git a/pkg/cri/server/container_create_test.go b/pkg/cri/server/container_create_test.go index e9b9746e3..9fdeabd27 100644 --- a/pkg/cri/server/container_create_test.go +++ b/pkg/cri/server/container_create_test.go @@ -28,9 +28,9 @@ import ( "github.com/stretchr/testify/require" runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2" - "github.com/containerd/containerd/pkg/constants" "github.com/containerd/containerd/pkg/containerd/opts" "github.com/containerd/containerd/pkg/cri/config" + "github.com/containerd/containerd/pkg/cri/constants" ) func checkMount(t *testing.T, mounts []runtimespec.Mount, src, dest, typ string, diff --git a/pkg/cri/server/container_create_windows.go b/pkg/cri/server/container_create_windows.go index 731417515..ea98bea42 100644 --- a/pkg/cri/server/container_create_windows.go +++ b/pkg/cri/server/container_create_windows.go @@ -24,8 +24,8 @@ import ( runtimespec "github.com/opencontainers/runtime-spec/specs-go" runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2" - "github.com/containerd/containerd/pkg/annotations" customopts "github.com/containerd/containerd/pkg/containerd/opts" + "github.com/containerd/containerd/pkg/cri/annotations" "github.com/containerd/containerd/pkg/cri/config" ) diff --git a/pkg/cri/server/container_create_windows_test.go b/pkg/cri/server/container_create_windows_test.go index 348a75f0d..e3a09bc8d 100644 --- a/pkg/cri/server/container_create_windows_test.go +++ b/pkg/cri/server/container_create_windows_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/assert" runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2" - "github.com/containerd/containerd/pkg/annotations" + "github.com/containerd/containerd/pkg/cri/annotations" "github.com/containerd/containerd/pkg/cri/config" ) diff --git a/pkg/cri/server/events.go b/pkg/cri/server/events.go index 49f6ac691..771693808 100644 --- a/pkg/cri/server/events.go +++ b/pkg/cri/server/events.go @@ -32,8 +32,8 @@ import ( "golang.org/x/net/context" "k8s.io/apimachinery/pkg/util/clock" - "github.com/containerd/containerd/pkg/constants" ctrdutil "github.com/containerd/containerd/pkg/containerd/util" + "github.com/containerd/containerd/pkg/cri/constants" "github.com/containerd/containerd/pkg/cri/store" containerstore "github.com/containerd/containerd/pkg/cri/store/container" sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" diff --git a/pkg/cri/server/sandbox_run.go b/pkg/cri/server/sandbox_run.go index 6ed3d5b9f..bd3c071ab 100644 --- a/pkg/cri/server/sandbox_run.go +++ b/pkg/cri/server/sandbox_run.go @@ -36,9 +36,9 @@ import ( "golang.org/x/net/context" runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2" - "github.com/containerd/containerd/pkg/annotations" customopts "github.com/containerd/containerd/pkg/containerd/opts" ctrdutil "github.com/containerd/containerd/pkg/containerd/util" + "github.com/containerd/containerd/pkg/cri/annotations" criconfig "github.com/containerd/containerd/pkg/cri/config" "github.com/containerd/containerd/pkg/cri/server/bandwidth" sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" diff --git a/pkg/cri/server/sandbox_run_linux.go b/pkg/cri/server/sandbox_run_linux.go index ee506470f..dcc085737 100644 --- a/pkg/cri/server/sandbox_run_linux.go +++ b/pkg/cri/server/sandbox_run_linux.go @@ -31,8 +31,8 @@ import ( "golang.org/x/sys/unix" runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2" - "github.com/containerd/containerd/pkg/annotations" customopts "github.com/containerd/containerd/pkg/containerd/opts" + "github.com/containerd/containerd/pkg/cri/annotations" osinterface "github.com/containerd/containerd/pkg/os" ) diff --git a/pkg/cri/server/sandbox_run_linux_test.go b/pkg/cri/server/sandbox_run_linux_test.go index 78f21d0c2..61b19705e 100644 --- a/pkg/cri/server/sandbox_run_linux_test.go +++ b/pkg/cri/server/sandbox_run_linux_test.go @@ -28,8 +28,8 @@ import ( "github.com/stretchr/testify/require" runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2" - "github.com/containerd/containerd/pkg/annotations" "github.com/containerd/containerd/pkg/containerd/opts" + "github.com/containerd/containerd/pkg/cri/annotations" ostesting "github.com/containerd/containerd/pkg/os/testing" ) diff --git a/pkg/cri/server/sandbox_run_test.go b/pkg/cri/server/sandbox_run_test.go index 3754cca2f..d47af13f3 100644 --- a/pkg/cri/server/sandbox_run_test.go +++ b/pkg/cri/server/sandbox_run_test.go @@ -27,7 +27,7 @@ import ( "github.com/stretchr/testify/assert" runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2" - "github.com/containerd/containerd/pkg/annotations" + "github.com/containerd/containerd/pkg/cri/annotations" criconfig "github.com/containerd/containerd/pkg/cri/config" sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" ) diff --git a/pkg/cri/server/sandbox_run_windows.go b/pkg/cri/server/sandbox_run_windows.go index 27404de25..0d2de91a5 100644 --- a/pkg/cri/server/sandbox_run_windows.go +++ b/pkg/cri/server/sandbox_run_windows.go @@ -26,8 +26,8 @@ import ( "github.com/pkg/errors" runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2" - "github.com/containerd/containerd/pkg/annotations" customopts "github.com/containerd/containerd/pkg/containerd/opts" + "github.com/containerd/containerd/pkg/cri/annotations" ) func (c *criService) sandboxContainerSpec(id string, config *runtime.PodSandboxConfig, diff --git a/pkg/cri/server/sandbox_run_windows_test.go b/pkg/cri/server/sandbox_run_windows_test.go index 7061fa431..880d63e2f 100644 --- a/pkg/cri/server/sandbox_run_windows_test.go +++ b/pkg/cri/server/sandbox_run_windows_test.go @@ -26,8 +26,8 @@ import ( "github.com/stretchr/testify/assert" runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2" - "github.com/containerd/containerd/pkg/annotations" "github.com/containerd/containerd/pkg/containerd/opts" + "github.com/containerd/containerd/pkg/cri/annotations" ) func getRunPodSandboxTestData() (*runtime.PodSandboxConfig, *imagespec.ImageConfig, func(*testing.T, string, *runtimespec.Spec)) { diff --git a/pkg/cri/server/service.go b/pkg/cri/server/service.go index 299ac9c5e..f324b5496 100644 --- a/pkg/cri/server/service.go +++ b/pkg/cri/server/service.go @@ -27,7 +27,7 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/oci" - "github.com/containerd/containerd/pkg/streaming" + "github.com/containerd/containerd/pkg/cri/streaming" "github.com/containerd/containerd/plugin" cni "github.com/containerd/go-cni" "github.com/pkg/errors" diff --git a/pkg/cri/server/streaming.go b/pkg/cri/server/streaming.go index d08759cff..bbc7e54db 100644 --- a/pkg/cri/server/streaming.go +++ b/pkg/cri/server/streaming.go @@ -33,7 +33,7 @@ import ( "k8s.io/utils/exec" ctrdutil "github.com/containerd/containerd/pkg/containerd/util" - "github.com/containerd/containerd/pkg/streaming" + "github.com/containerd/containerd/pkg/cri/streaming" ) type streamListenerMode int diff --git a/pkg/cri/server/version.go b/pkg/cri/server/version.go index 8c0e88611..55eb523d6 100644 --- a/pkg/cri/server/version.go +++ b/pkg/cri/server/version.go @@ -21,7 +21,7 @@ import ( "golang.org/x/net/context" runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2" - "github.com/containerd/containerd/pkg/constants" + "github.com/containerd/containerd/pkg/cri/constants" ) const ( diff --git a/pkg/streaming/errors.go b/pkg/cri/streaming/errors.go similarity index 100% rename from pkg/streaming/errors.go rename to pkg/cri/streaming/errors.go diff --git a/pkg/streaming/portforward/constants.go b/pkg/cri/streaming/portforward/constants.go similarity index 100% rename from pkg/streaming/portforward/constants.go rename to pkg/cri/streaming/portforward/constants.go diff --git a/pkg/streaming/portforward/httpstream.go b/pkg/cri/streaming/portforward/httpstream.go similarity index 100% rename from pkg/streaming/portforward/httpstream.go rename to pkg/cri/streaming/portforward/httpstream.go diff --git a/pkg/streaming/portforward/portforward.go b/pkg/cri/streaming/portforward/portforward.go similarity index 100% rename from pkg/streaming/portforward/portforward.go rename to pkg/cri/streaming/portforward/portforward.go diff --git a/pkg/streaming/portforward/websocket.go b/pkg/cri/streaming/portforward/websocket.go similarity index 100% rename from pkg/streaming/portforward/websocket.go rename to pkg/cri/streaming/portforward/websocket.go diff --git a/pkg/streaming/remotecommand/attach.go b/pkg/cri/streaming/remotecommand/attach.go similarity index 100% rename from pkg/streaming/remotecommand/attach.go rename to pkg/cri/streaming/remotecommand/attach.go diff --git a/pkg/streaming/remotecommand/doc.go b/pkg/cri/streaming/remotecommand/doc.go similarity index 100% rename from pkg/streaming/remotecommand/doc.go rename to pkg/cri/streaming/remotecommand/doc.go diff --git a/pkg/streaming/remotecommand/exec.go b/pkg/cri/streaming/remotecommand/exec.go similarity index 100% rename from pkg/streaming/remotecommand/exec.go rename to pkg/cri/streaming/remotecommand/exec.go diff --git a/pkg/streaming/remotecommand/httpstream.go b/pkg/cri/streaming/remotecommand/httpstream.go similarity index 100% rename from pkg/streaming/remotecommand/httpstream.go rename to pkg/cri/streaming/remotecommand/httpstream.go diff --git a/pkg/streaming/remotecommand/websocket.go b/pkg/cri/streaming/remotecommand/websocket.go similarity index 100% rename from pkg/streaming/remotecommand/websocket.go rename to pkg/cri/streaming/remotecommand/websocket.go diff --git a/pkg/streaming/request_cache.go b/pkg/cri/streaming/request_cache.go similarity index 100% rename from pkg/streaming/request_cache.go rename to pkg/cri/streaming/request_cache.go diff --git a/pkg/streaming/server.go b/pkg/cri/streaming/server.go similarity index 98% rename from pkg/streaming/server.go rename to pkg/cri/streaming/server.go index ee904dbda..4f54eeb47 100644 --- a/pkg/streaming/server.go +++ b/pkg/cri/streaming/server.go @@ -52,8 +52,8 @@ import ( "k8s.io/client-go/tools/remotecommand" runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1alpha2" - "github.com/containerd/containerd/pkg/streaming/portforward" - remotecommandserver "github.com/containerd/containerd/pkg/streaming/remotecommand" + "github.com/containerd/containerd/pkg/cri/streaming/portforward" + remotecommandserver "github.com/containerd/containerd/pkg/cri/streaming/remotecommand" ) // Server is the library interface to serve the stream requests.