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

Switch to github.com/containerd/plugin

Browse Source 
Signed-off-by: Derek McGowan <derek@mcg.dev>
This commit is contained in:
Derek McGowan
2023-10-31 21:44:03 -07:00
parent a72adffa65
commit 9db21401c4
86 changed files with 998 additions and 334 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/server/config/config.go
View File

@@ -36,8 +36,8 @@ import (
"github.com/pelletier/go-toml/v2"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/plugin"
"github.com/containerd/log"
"github.com/containerd/plugin"
)
// CurrentConfigVersion is the max config version which is supported

12
services/server/server.go
View File

@@ -59,15 +59,15 @@ import (
"github.com/containerd/containerd/v2/pkg/dialer"
"github.com/containerd/containerd/v2/pkg/timeout"
"github.com/containerd/containerd/v2/platforms"
"github.com/containerd/containerd/v2/plugin"
"github.com/containerd/containerd/v2/plugin/dynamic"
"github.com/containerd/containerd/v2/plugin/registry"
"github.com/containerd/containerd/v2/plugins"
sbproxy "github.com/containerd/containerd/v2/sandbox/proxy"
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"
"github.com/containerd/plugin"
"github.com/containerd/plugin/dynamic"
"github.com/containerd/plugin/registry"
)
// CreateTopLevelDirectories creates the top-level root and state directories.
@@ -341,9 +341,9 @@ func New(ctx context.Context, config *srvconfig.Config) (*Server, error) {
// recordConfigDeprecations attempts to record use of any deprecated config field. Failures are logged and ignored.
func recordConfigDeprecations(ctx context.Context, config *srvconfig.Config, set *plugin.Set) {
// record any detected deprecations without blocking server startup
plugin, err := set.GetByID(plugins.WarningPlugin, plugins.DeprecationsPlugin)
if err != nil {
log.G(ctx).WithError(err).Warn("failed to load warning service to record deprecations")
plugin := set.Get(plugins.WarningPlugin, plugins.DeprecationsPlugin)
if plugin == nil {
log.G(ctx).Warn("failed to find warning service to record deprecations")
return
}
instance, err := plugin.Instance()

4
services/server/server_test.go
View File

@@ -20,9 +20,9 @@ import (
"context"
"testing"
"github.com/containerd/containerd/v2/plugin"
"github.com/containerd/containerd/v2/plugin/registry"
srvconfig "github.com/containerd/containerd/v2/services/server/config"
"github.com/containerd/plugin"
"github.com/containerd/plugin/registry"
"github.com/stretchr/testify/assert"
)