github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Move services/server to cmd/containerd/server

Browse Source 
Signed-off-by: Derek McGowan <derek@mcg.dev>
This commit is contained in:
Derek McGowan
2024-01-17 09:52:48 -08:00
parent 228ad5a5ca
commit ce41d1c90a
20 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/containerd/command/config.go
View File

@@ -21,11 +21,11 @@ import (
"os" "os"
"path/filepath" "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/core/images"
"github.com/containerd/containerd/v2/defaults" "github.com/containerd/containerd/v2/defaults"
"github.com/containerd/containerd/v2/pkg/timeout" "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" "github.com/containerd/plugin/registry"
ocispec "github.com/opencontainers/image-spec/specs-go/v1" ocispec "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/pelletier/go-toml/v2" "github.com/pelletier/go-toml/v2"

4
cmd/containerd/command/main.go
View File

@@ -27,12 +27,12 @@ import (
"runtime" "runtime"
"time" "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/core/mount"
"github.com/containerd/containerd/v2/defaults" "github.com/containerd/containerd/v2/defaults"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
_ "github.com/containerd/containerd/v2/metrics" // import containerd build info _ "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/sys"
"github.com/containerd/containerd/v2/version" "github.com/containerd/containerd/v2/version"
"github.com/containerd/log" "github.com/containerd/log"

2
cmd/containerd/command/main_unix.go
View File

@@ -23,7 +23,7 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"github.com/containerd/containerd/v2/services/server" "github.com/containerd/containerd/v2/cmd/containerd/server"
"github.com/containerd/log" "github.com/containerd/log"
"golang.org/x/sys/unix" "golang.org/x/sys/unix"
) )

2
cmd/containerd/command/main_windows.go
View File

@@ -26,7 +26,7 @@ import (
"github.com/Microsoft/go-winio/pkg/etw" "github.com/Microsoft/go-winio/pkg/etw"
"github.com/Microsoft/go-winio/pkg/etwlogrus" "github.com/Microsoft/go-winio/pkg/etwlogrus"
"github.com/Microsoft/go-winio/pkg/guid" "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/containerd/log"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"golang.org/x/sys/windows" "golang.org/x/sys/windows"

2
cmd/containerd/command/service_unsupported.go
View File

@@ -19,7 +19,7 @@
package command package command
import ( import (
"github.com/containerd/containerd/v2/services/server" "github.com/containerd/containerd/v2/cmd/containerd/server"
"github.com/urfave/cli" "github.com/urfave/cli"
) )

2
cmd/containerd/command/service_windows.go
View File

@@ -24,8 +24,8 @@ import (
"path/filepath" "path/filepath"
"time" "time"
"github.com/containerd/containerd/v2/cmd/containerd/server"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/services/server"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/urfave/cli" "github.com/urfave/cli"
"golang.org/x/sys/windows" "golang.org/x/sys/windows"

0
services/server/config/config.go → cmd/containerd/server/config/config.go
View File

0
services/server/config/config_test.go → cmd/containerd/server/config/config_test.go
View File

0
services/server/namespace.go → cmd/containerd/server/namespace.go
View File

2
services/server/server.go → cmd/containerd/server/server.go
View File

@@ -50,6 +50,7 @@ import (
diffapi "github.com/containerd/containerd/v2/api/services/diff/v1" diffapi "github.com/containerd/containerd/v2/api/services/diff/v1"
sbapi "github.com/containerd/containerd/v2/api/services/sandbox/v1" sbapi "github.com/containerd/containerd/v2/api/services/sandbox/v1"
ssapi "github.com/containerd/containerd/v2/api/services/snapshots/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" csproxy "github.com/containerd/containerd/v2/core/content/proxy"
"github.com/containerd/containerd/v2/core/diff" "github.com/containerd/containerd/v2/core/diff"
diffproxy "github.com/containerd/containerd/v2/core/diff/proxy" 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/platforms"
"github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/plugins/content/local" "github.com/containerd/containerd/v2/plugins/content/local"
srvconfig "github.com/containerd/containerd/v2/services/server/config"
"github.com/containerd/containerd/v2/services/warning" "github.com/containerd/containerd/v2/services/warning"
ssproxy "github.com/containerd/containerd/v2/snapshots/proxy" ssproxy "github.com/containerd/containerd/v2/snapshots/proxy"
"github.com/containerd/containerd/v2/sys" "github.com/containerd/containerd/v2/sys"

2
services/server/server_linux.go → cmd/containerd/server/server_linux.go
View File

@@ -23,7 +23,7 @@ import (
"github.com/containerd/cgroups/v3" "github.com/containerd/cgroups/v3"
cgroup1 "github.com/containerd/cgroups/v3/cgroup1" cgroup1 "github.com/containerd/cgroups/v3/cgroup1"
cgroupsv2 "github.com/containerd/cgroups/v3/cgroup2" 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/containerd/v2/sys"
"github.com/containerd/log" "github.com/containerd/log"
"github.com/containerd/ttrpc" "github.com/containerd/ttrpc"

2
services/server/server_solaris.go → cmd/containerd/server/server_solaris.go
View File

@@ -19,7 +19,7 @@ package server
import ( import (
"context" "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 { func apply(_ context.Context, _ *srvconfig.Config) error {

2
services/server/server_test.go → cmd/containerd/server/server_test.go
View File

@@ -20,7 +20,7 @@ import (
"context" "context"
"testing" "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"
"github.com/containerd/plugin/registry" "github.com/containerd/plugin/registry"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"

2
services/server/server_unsupported.go → cmd/containerd/server/server_unsupported.go
View File

@@ -21,7 +21,7 @@ package server
import ( import (
"context" "context"
srvconfig "github.com/containerd/containerd/v2/services/server/config" srvconfig "github.com/containerd/containerd/v2/cmd/containerd/server/config"
"github.com/containerd/ttrpc" "github.com/containerd/ttrpc"
) )

2
services/server/server_windows.go → cmd/containerd/server/server_windows.go
View File

@@ -19,7 +19,7 @@ package server
import ( import (
"context" "context"
srvconfig "github.com/containerd/containerd/v2/services/server/config" srvconfig "github.com/containerd/containerd/v2/cmd/containerd/server/config"
"github.com/containerd/ttrpc" "github.com/containerd/ttrpc"
) )

4
contrib/fuzz/daemon.go
View File

@@ -23,9 +23,9 @@ import (
"sync" "sync"
"time" "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/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/containerd/v2/sys"
"github.com/containerd/log" "github.com/containerd/log"
) )

4
integration/build_local_containerd_helper_test.go
View File

@@ -24,12 +24,12 @@ import (
"time" "time"
containerd "github.com/containerd/containerd/v2/client" 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/core/content"
"github.com/containerd/containerd/v2/pkg/cri/constants" "github.com/containerd/containerd/v2/pkg/cri/constants"
"github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/platforms"
"github.com/containerd/containerd/v2/plugins" "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/log/logtest"
"github.com/containerd/plugin" "github.com/containerd/plugin"
"github.com/opencontainers/go-digest" "github.com/opencontainers/go-digest"

2
integration/client/restart_monitor_test.go
View File

@@ -33,10 +33,10 @@ import (
eventtypes "github.com/containerd/containerd/v2/api/events" eventtypes "github.com/containerd/containerd/v2/api/events"
. "github.com/containerd/containerd/v2/client" . "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/oci"
"github.com/containerd/containerd/v2/pkg/testutil" "github.com/containerd/containerd/v2/pkg/testutil"
"github.com/containerd/containerd/v2/runtime/restart" "github.com/containerd/containerd/v2/runtime/restart"
srvconfig "github.com/containerd/containerd/v2/services/server/config"
"github.com/containerd/typeurl/v2" "github.com/containerd/typeurl/v2"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )

2
pkg/cri/server/base/cri_base.go
View File

@@ -30,12 +30,12 @@ import (
imagespec "github.com/opencontainers/image-spec/specs-go/v1" imagespec "github.com/opencontainers/image-spec/specs-go/v1"
"k8s.io/klog/v2" "k8s.io/klog/v2"
srvconfig "github.com/containerd/containerd/v2/cmd/containerd/server/config"
"github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/oci"
criconfig "github.com/containerd/containerd/v2/pkg/cri/config" criconfig "github.com/containerd/containerd/v2/pkg/cri/config"
"github.com/containerd/containerd/v2/pkg/cri/constants" "github.com/containerd/containerd/v2/pkg/cri/constants"
"github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/platforms"
"github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"
srvconfig "github.com/containerd/containerd/v2/services/server/config"
"github.com/containerd/containerd/v2/services/warning" "github.com/containerd/containerd/v2/services/warning"
) )

2
plugins/cri/images/plugin.go
View File

@@ -22,6 +22,7 @@ import (
"path/filepath" "path/filepath"
containerd "github.com/containerd/containerd/v2/client" 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/core/metadata"
"github.com/containerd/containerd/v2/events" "github.com/containerd/containerd/v2/events"
criconfig "github.com/containerd/containerd/v2/pkg/cri/config" 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/pkg/cri/server/images"
"github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/platforms"
"github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"
srvconfig "github.com/containerd/containerd/v2/services/server/config"
"github.com/containerd/containerd/v2/snapshots" "github.com/containerd/containerd/v2/snapshots"
"github.com/containerd/log" "github.com/containerd/log"
"github.com/containerd/plugin" "github.com/containerd/plugin"