diff --git a/cmd/containerd/command/config.go b/cmd/containerd/command/config.go index 4bd14bb30..0e08f5afa 100644 --- a/cmd/containerd/command/config.go +++ b/cmd/containerd/command/config.go @@ -21,11 +21,11 @@ import ( "os" "path/filepath" + "github.com/containerd/containerd/v2/cmd/containerd/server" + srvconfig "github.com/containerd/containerd/v2/cmd/containerd/server/config" "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/defaults" "github.com/containerd/containerd/v2/pkg/timeout" - "github.com/containerd/containerd/v2/services/server" - srvconfig "github.com/containerd/containerd/v2/services/server/config" "github.com/containerd/plugin/registry" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/pelletier/go-toml/v2" diff --git a/cmd/containerd/command/main.go b/cmd/containerd/command/main.go index e927730bd..c3340d683 100644 --- a/cmd/containerd/command/main.go +++ b/cmd/containerd/command/main.go @@ -27,12 +27,12 @@ import ( "runtime" "time" + "github.com/containerd/containerd/v2/cmd/containerd/server" + srvconfig "github.com/containerd/containerd/v2/cmd/containerd/server/config" "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/defaults" "github.com/containerd/containerd/v2/errdefs" _ "github.com/containerd/containerd/v2/metrics" // import containerd build info - "github.com/containerd/containerd/v2/services/server" - srvconfig "github.com/containerd/containerd/v2/services/server/config" "github.com/containerd/containerd/v2/sys" "github.com/containerd/containerd/v2/version" "github.com/containerd/log" diff --git a/cmd/containerd/command/main_unix.go b/cmd/containerd/command/main_unix.go index f41538a56..e160c7b9b 100644 --- a/cmd/containerd/command/main_unix.go +++ b/cmd/containerd/command/main_unix.go @@ -23,7 +23,7 @@ import ( "os" "path/filepath" - "github.com/containerd/containerd/v2/services/server" + "github.com/containerd/containerd/v2/cmd/containerd/server" "github.com/containerd/log" "golang.org/x/sys/unix" ) diff --git a/cmd/containerd/command/main_windows.go b/cmd/containerd/command/main_windows.go index a36cc73be..ff583f4be 100644 --- a/cmd/containerd/command/main_windows.go +++ b/cmd/containerd/command/main_windows.go @@ -26,7 +26,7 @@ import ( "github.com/Microsoft/go-winio/pkg/etw" "github.com/Microsoft/go-winio/pkg/etwlogrus" "github.com/Microsoft/go-winio/pkg/guid" - "github.com/containerd/containerd/v2/services/server" + "github.com/containerd/containerd/v2/cmd/containerd/server" "github.com/containerd/log" "github.com/sirupsen/logrus" "golang.org/x/sys/windows" diff --git a/cmd/containerd/command/service_unsupported.go b/cmd/containerd/command/service_unsupported.go index a5bab3d0e..27943b497 100644 --- a/cmd/containerd/command/service_unsupported.go +++ b/cmd/containerd/command/service_unsupported.go @@ -19,7 +19,7 @@ package command import ( - "github.com/containerd/containerd/v2/services/server" + "github.com/containerd/containerd/v2/cmd/containerd/server" "github.com/urfave/cli" ) diff --git a/cmd/containerd/command/service_windows.go b/cmd/containerd/command/service_windows.go index f3f206435..bd84d5a30 100644 --- a/cmd/containerd/command/service_windows.go +++ b/cmd/containerd/command/service_windows.go @@ -24,8 +24,8 @@ import ( "path/filepath" "time" + "github.com/containerd/containerd/v2/cmd/containerd/server" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/services/server" "github.com/sirupsen/logrus" "github.com/urfave/cli" "golang.org/x/sys/windows" diff --git a/services/server/config/config.go b/cmd/containerd/server/config/config.go similarity index 100% rename from services/server/config/config.go rename to cmd/containerd/server/config/config.go diff --git a/services/server/config/config_test.go b/cmd/containerd/server/config/config_test.go similarity index 100% rename from services/server/config/config_test.go rename to cmd/containerd/server/config/config_test.go diff --git a/services/server/namespace.go b/cmd/containerd/server/namespace.go similarity index 100% rename from services/server/namespace.go rename to cmd/containerd/server/namespace.go diff --git a/services/server/server.go b/cmd/containerd/server/server.go similarity index 99% rename from services/server/server.go rename to cmd/containerd/server/server.go index 92afdea67..f9fb0960a 100644 --- a/services/server/server.go +++ b/cmd/containerd/server/server.go @@ -50,6 +50,7 @@ import ( diffapi "github.com/containerd/containerd/v2/api/services/diff/v1" sbapi "github.com/containerd/containerd/v2/api/services/sandbox/v1" ssapi "github.com/containerd/containerd/v2/api/services/snapshots/v1" + srvconfig "github.com/containerd/containerd/v2/cmd/containerd/server/config" csproxy "github.com/containerd/containerd/v2/core/content/proxy" "github.com/containerd/containerd/v2/core/diff" diffproxy "github.com/containerd/containerd/v2/core/diff/proxy" @@ -61,7 +62,6 @@ import ( "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins/content/local" - srvconfig "github.com/containerd/containerd/v2/services/server/config" "github.com/containerd/containerd/v2/services/warning" ssproxy "github.com/containerd/containerd/v2/snapshots/proxy" "github.com/containerd/containerd/v2/sys" diff --git a/services/server/server_linux.go b/cmd/containerd/server/server_linux.go similarity index 96% rename from services/server/server_linux.go rename to cmd/containerd/server/server_linux.go index 1cd818883..cbede2ceb 100644 --- a/services/server/server_linux.go +++ b/cmd/containerd/server/server_linux.go @@ -23,7 +23,7 @@ import ( "github.com/containerd/cgroups/v3" cgroup1 "github.com/containerd/cgroups/v3/cgroup1" cgroupsv2 "github.com/containerd/cgroups/v3/cgroup2" - srvconfig "github.com/containerd/containerd/v2/services/server/config" + srvconfig "github.com/containerd/containerd/v2/cmd/containerd/server/config" "github.com/containerd/containerd/v2/sys" "github.com/containerd/log" "github.com/containerd/ttrpc" diff --git a/services/server/server_solaris.go b/cmd/containerd/server/server_solaris.go similarity index 90% rename from services/server/server_solaris.go rename to cmd/containerd/server/server_solaris.go index 3d29176f0..8677710e5 100644 --- a/services/server/server_solaris.go +++ b/cmd/containerd/server/server_solaris.go @@ -19,7 +19,7 @@ package server import ( "context" - srvconfig "github.com/containerd/containerd/v2/services/server/config" + srvconfig "github.com/containerd/containerd/v2/cmd/containerd/server/config" ) func apply(_ context.Context, _ *srvconfig.Config) error { diff --git a/services/server/server_test.go b/cmd/containerd/server/server_test.go similarity index 98% rename from services/server/server_test.go rename to cmd/containerd/server/server_test.go index b05e796cf..ab5230997 100644 --- a/services/server/server_test.go +++ b/cmd/containerd/server/server_test.go @@ -20,7 +20,7 @@ import ( "context" "testing" - srvconfig "github.com/containerd/containerd/v2/services/server/config" + srvconfig "github.com/containerd/containerd/v2/cmd/containerd/server/config" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" "github.com/stretchr/testify/assert" diff --git a/services/server/server_unsupported.go b/cmd/containerd/server/server_unsupported.go similarity index 91% rename from services/server/server_unsupported.go rename to cmd/containerd/server/server_unsupported.go index a90a9e725..edb433868 100644 --- a/services/server/server_unsupported.go +++ b/cmd/containerd/server/server_unsupported.go @@ -21,7 +21,7 @@ package server import ( "context" - srvconfig "github.com/containerd/containerd/v2/services/server/config" + srvconfig "github.com/containerd/containerd/v2/cmd/containerd/server/config" "github.com/containerd/ttrpc" ) diff --git a/services/server/server_windows.go b/cmd/containerd/server/server_windows.go similarity index 91% rename from services/server/server_windows.go rename to cmd/containerd/server/server_windows.go index 1a05c352c..4d3b7a598 100644 --- a/services/server/server_windows.go +++ b/cmd/containerd/server/server_windows.go @@ -19,7 +19,7 @@ package server import ( "context" - srvconfig "github.com/containerd/containerd/v2/services/server/config" + srvconfig "github.com/containerd/containerd/v2/cmd/containerd/server/config" "github.com/containerd/ttrpc" ) diff --git a/contrib/fuzz/daemon.go b/contrib/fuzz/daemon.go index 3077414e8..2088bba04 100644 --- a/contrib/fuzz/daemon.go +++ b/contrib/fuzz/daemon.go @@ -23,9 +23,9 @@ import ( "sync" "time" + "github.com/containerd/containerd/v2/cmd/containerd/server" + "github.com/containerd/containerd/v2/cmd/containerd/server/config" "github.com/containerd/containerd/v2/defaults" - "github.com/containerd/containerd/v2/services/server" - "github.com/containerd/containerd/v2/services/server/config" "github.com/containerd/containerd/v2/sys" "github.com/containerd/log" ) diff --git a/integration/build_local_containerd_helper_test.go b/integration/build_local_containerd_helper_test.go index 4a4344a8b..7e9f48968 100644 --- a/integration/build_local_containerd_helper_test.go +++ b/integration/build_local_containerd_helper_test.go @@ -24,12 +24,12 @@ import ( "time" containerd "github.com/containerd/containerd/v2/client" + ctrdsrv "github.com/containerd/containerd/v2/cmd/containerd/server" + srvconfig "github.com/containerd/containerd/v2/cmd/containerd/server/config" "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/pkg/cri/constants" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" - ctrdsrv "github.com/containerd/containerd/v2/services/server" - srvconfig "github.com/containerd/containerd/v2/services/server/config" "github.com/containerd/log/logtest" "github.com/containerd/plugin" "github.com/opencontainers/go-digest" diff --git a/integration/client/restart_monitor_test.go b/integration/client/restart_monitor_test.go index ae33b7d90..5fe24e0a9 100644 --- a/integration/client/restart_monitor_test.go +++ b/integration/client/restart_monitor_test.go @@ -33,10 +33,10 @@ import ( eventtypes "github.com/containerd/containerd/v2/api/events" . "github.com/containerd/containerd/v2/client" + srvconfig "github.com/containerd/containerd/v2/cmd/containerd/server/config" "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/testutil" "github.com/containerd/containerd/v2/runtime/restart" - srvconfig "github.com/containerd/containerd/v2/services/server/config" "github.com/containerd/typeurl/v2" "github.com/stretchr/testify/require" ) diff --git a/pkg/cri/server/base/cri_base.go b/pkg/cri/server/base/cri_base.go index 09e9de899..888a8a9cb 100644 --- a/pkg/cri/server/base/cri_base.go +++ b/pkg/cri/server/base/cri_base.go @@ -30,12 +30,12 @@ import ( imagespec "github.com/opencontainers/image-spec/specs-go/v1" "k8s.io/klog/v2" + srvconfig "github.com/containerd/containerd/v2/cmd/containerd/server/config" "github.com/containerd/containerd/v2/oci" criconfig "github.com/containerd/containerd/v2/pkg/cri/config" "github.com/containerd/containerd/v2/pkg/cri/constants" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" - srvconfig "github.com/containerd/containerd/v2/services/server/config" "github.com/containerd/containerd/v2/services/warning" ) diff --git a/plugins/cri/images/plugin.go b/plugins/cri/images/plugin.go index f1fba8393..98c87b78b 100644 --- a/plugins/cri/images/plugin.go +++ b/plugins/cri/images/plugin.go @@ -22,6 +22,7 @@ import ( "path/filepath" containerd "github.com/containerd/containerd/v2/client" + srvconfig "github.com/containerd/containerd/v2/cmd/containerd/server/config" "github.com/containerd/containerd/v2/core/metadata" "github.com/containerd/containerd/v2/events" criconfig "github.com/containerd/containerd/v2/pkg/cri/config" @@ -29,7 +30,6 @@ import ( "github.com/containerd/containerd/v2/pkg/cri/server/images" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" - srvconfig "github.com/containerd/containerd/v2/services/server/config" "github.com/containerd/containerd/v2/snapshots" "github.com/containerd/log" "github.com/containerd/plugin"