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

Add deprecation warnings to CRI image server configuration

Browse Source 
Signed-off-by: Derek McGowan <derek@mcg.dev>
This commit is contained in:
Derek McGowan 2024-01-28 23:14:19 -08:00
parent 65b3922df7
commit 64b4778fc2
No known key found for this signature in database
GPG Key ID: F58C5D0A4405ACDB
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,6 +30,7 @@ import (
"github.com/containerd/containerd/v2/pkg/cri/server/images" "github.com/containerd/containerd/v2/pkg/cri/server/images"
"github.com/containerd/containerd/v2/pkg/events" "github.com/containerd/containerd/v2/pkg/events"
"github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/plugins/services/warning"
"github.com/containerd/log" "github.com/containerd/log"
"github.com/containerd/platforms" "github.com/containerd/platforms"
"github.com/containerd/plugin" "github.com/containerd/plugin"
@ -50,6 +51,7 @@ func init() {
plugins.SandboxStorePlugin, plugins.SandboxStorePlugin,
plugins.ServicePlugin, // For client plugins.ServicePlugin, // For client
plugins.SnapshotPlugin, // For root directory properties plugins.SnapshotPlugin, // For root directory properties
plugins.WarningPlugin,
}, },
InitFn: func(ic *plugin.InitContext) (interface{}, error) { InitFn: func(ic *plugin.InitContext) (interface{}, error) {
m, err := ic.GetSingle(plugins.MetadataPlugin) m, err := ic.GetSingle(plugins.MetadataPlugin)
@ -63,6 +65,19 @@ func init() {
return nil, err return nil, err
} }
if warnings, err := criconfig.ValidateImageConfig(ic.Context, &config); err != nil {
return nil, fmt.Errorf("invalid cri image config: %w", err)
} else if len(warnings) > 0 {
ws, err := ic.GetSingle(plugins.WarningPlugin)
if err != nil {
return nil, err
}
warn := ws.(warning.Service)
for _, w := range warnings {
warn.Emit(ic.Context, w)
}
}
options := &images.CRIImageServiceOptions{ options := &images.CRIImageServiceOptions{
Content: mdb.ContentStore(), Content: mdb.ContentStore(),
Images: metadata.NewImageStore(mdb), Images: metadata.NewImageStore(mdb),