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

Separate the CRI image config from the main plugin config

Browse Source 
This change simplifies the CRI plugin dependencies by not requiring the
CRI image plugin to depend on any other CRI components. Since other CRI
plugins depend on the image plugin, this allows prevents a dependency
cycle for CRI configurations on a base plugin.

Signed-off-by: Derek McGowan <derek@mcg.dev>
This commit is contained in:
Derek McGowan
2023-12-22 23:40:21 -08:00
parent ad4c9f8a9d
commit 3baf5edb8b
16 changed files with 454 additions and 362 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
integration/build_local_containerd_helper_test.go
View File

@@ -39,6 +39,7 @@ import (
_ "github.com/containerd/containerd/v2/gc/scheduler"
_ "github.com/containerd/containerd/v2/leases/plugin"
_ "github.com/containerd/containerd/v2/metadata/plugin"
_ "github.com/containerd/containerd/v2/plugins/cri/images"
_ "github.com/containerd/containerd/v2/runtime/v2"
_ "github.com/containerd/containerd/v2/runtime/v2/runc/options"
_ "github.com/containerd/containerd/v2/services/containers"
@@ -53,7 +54,7 @@ import (
_ "github.com/containerd/containerd/v2/services/tasks"
_ "github.com/containerd/containerd/v2/services/version"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
var (
@@ -72,7 +73,7 @@ func buildLocalContainerdClient(t *testing.T, tmpDir string, tweakInitFn tweakPl
// load plugins
loadPluginOnce.Do(func() {
loadedPlugins, loadedPluginsErr = ctrdsrv.LoadPlugins(ctx, &srvconfig.Config{})
assert.NoError(t, loadedPluginsErr)
require.NoError(t, loadedPluginsErr)
})
// init plugins
@@ -104,7 +105,7 @@ func buildLocalContainerdClient(t *testing.T, tmpDir string, tweakInitFn tweakPl
// load the plugin specific configuration if it is provided
if p.Config != nil {
pc, err := config.Decode(ctx, p.URI(), p.Config)
assert.NoError(t, err)
require.NoError(t, err)
initContext.Config = pc
}
@@ -114,10 +115,10 @@ func buildLocalContainerdClient(t *testing.T, tmpDir string, tweakInitFn tweakPl
}
result := p.Init(initContext)
assert.NoError(t, initialized.Add(result))
require.NoError(t, initialized.Add(result))
_, err := result.Instance()
assert.NoError(t, err)
require.NoError(t, err)
lastInitContext = initContext
}
@@ -129,7 +130,7 @@ func buildLocalContainerdClient(t *testing.T, tmpDir string, tweakInitFn tweakPl
containerd.WithInMemoryServices(lastInitContext),
containerd.WithInMemorySandboxControllers(lastInitContext),
)
assert.NoError(t, err)
require.NoError(t, err)
return client
}