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

Fix image pulling with Transfer service

Browse Source 
Signed-off-by: Ethan Lowman <ethan.lowman@datadoghq.com>
This commit is contained in:
Ethan Lowman 2023-03-15 13:45:18 -04:00
parent eebd4ad531
commit 3e87f05b62
No known key found for this signature in database
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
plugins/transfer/plugin.go
View File

@ -20,16 +20,19 @@ import (
"fmt" "fmt"
"github.com/containerd/containerd" "github.com/containerd/containerd"
"github.com/containerd/containerd/diff"
"github.com/containerd/containerd/leases" "github.com/containerd/containerd/leases"
"github.com/containerd/containerd/metadata" "github.com/containerd/containerd/metadata"
"github.com/containerd/containerd/pkg/transfer/local" "github.com/containerd/containerd/pkg/transfer/local"
"github.com/containerd/containerd/pkg/unpack" "github.com/containerd/containerd/pkg/unpack"
"github.com/containerd/containerd/platforms" "github.com/containerd/containerd/platforms"
"github.com/containerd/containerd/plugin" "github.com/containerd/containerd/plugin"
"github.com/containerd/containerd/snapshots"
// Load packages with type registrations // Load packages with type registrations
_ "github.com/containerd/containerd/pkg/transfer/archive" _ "github.com/containerd/containerd/pkg/transfer/archive"
_ "github.com/containerd/containerd/pkg/transfer/image" _ "github.com/containerd/containerd/pkg/transfer/image"
_ "github.com/containerd/containerd/pkg/transfer/registry"
) )
// Register local transfer service plugin // Register local transfer service plugin
@ -40,6 +43,8 @@ func init() {
Requires: []plugin.Type{ Requires: []plugin.Type{
plugin.LeasePlugin, plugin.LeasePlugin,
plugin.MetadataPlugin, plugin.MetadataPlugin,
plugin.SnapshotPlugin,
plugin.DiffPlugin,
}, },
Config: defaultConfig(), Config: defaultConfig(),
InitFn: func(ic *plugin.InitContext) (interface{}, error) { InitFn: func(ic *plugin.InitContext) (interface{}, error) {
@ -54,6 +59,11 @@ func init() {
return nil, err return nil, err
} }
d, err := ic.Get(plugin.DiffPlugin)
if err != nil {
return nil, err
}
// Set configuration based on default or user input // Set configuration based on default or user input
var lc local.TransferConfig var lc local.TransferConfig
lc.MaxConcurrentDownloads = config.maxConcurrentDownloads lc.MaxConcurrentDownloads = config.maxConcurrentDownloads
@ -64,9 +74,16 @@ func init() {
return nil, fmt.Errorf("%s: platform configuration %v invalid", plugin.TransferPlugin, uc.platform) return nil, fmt.Errorf("%s: platform configuration %v invalid", plugin.TransferPlugin, uc.platform)
} }
s, err := ic.GetByID(plugin.SnapshotPlugin, uc.snapshotter)
if err != nil {
return nil, err
}
up := unpack.Platform{ up := unpack.Platform{
Platform: platforms.OnlyStrict(p), Platform: platforms.OnlyStrict(p),
SnapshotterKey: uc.snapshotter, SnapshotterKey: uc.snapshotter,
Snapshotter: s.(snapshots.Snapshotter),
Applier: d.(diff.Applier),
} }
lc.UnpackPlatforms = append(lc.UnpackPlatforms, up) lc.UnpackPlatforms = append(lc.UnpackPlatforms, up)
} }