Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(containerd): Use img platform in exporter instead of strict host platform #4477

Merged
merged 20 commits into from
Jul 19, 2023
Merged

fix(containerd): Use img platform in exporter instead of strict host platform #4477

Changes from 13 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
32f9858
match with img platform instead of host platform
AliDatadog May 26, 2023
5c33f65
client matching pull spec
AliDatadog May 26, 2023
148bc99
use default platform
AliDatadog May 26, 2023
466bb99
pull with platforms default strict
AliDatadog May 26, 2023
bcae982
use withplatform to pull and add debug log
AliDatadog May 26, 2023
e643ab0
looks like we are trying to scan a i386 image
AliDatadog May 26, 2023
340b2b6
revert changes on test, use the right platform match
AliDatadog May 26, 2023
ab1b1ad
try with Config.Platform
AliDatadog May 26, 2023
a1a647e
use spect.platform
AliDatadog May 26, 2023
a704f7f
fix function usage
AliDatadog May 26, 2023
7b093b3
try another way to retrieve the platform
AliDatadog May 26, 2023
71e934d
fix compilation
AliDatadog May 26, 2023
179c41b
read platforms from config manifest
AliDatadog May 26, 2023
2ce2c93
Merge remote-tracking branch 'upstream/main' into ali/fix-img-platform
AliDatadog Jun 22, 2023
cff92f5
use platform from RegistryOptions if available, otherwise get the act…
AliDatadog Jun 22, 2023
cb02f4f
goimport
AliDatadog Jun 22, 2023
054d76b
put platform in containerd client
AliDatadog Jul 6, 2023
e6503ca
fix panic
AliDatadog Jul 6, 2023
dbfe9bc
use DefaultStrict as default
AliDatadog Jul 17, 2023
2eba38d
Merge branch 'main' into ali/fix-img-platform
AliDatadog Jul 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 19 additions & 2 deletions pkg/fanal/image/daemon/containerd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (

"github.com/containerd/containerd"
"github.com/containerd/containerd/content"
"github.com/containerd/containerd/images"
"github.com/containerd/containerd/images/archive"
"github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/platforms"
Expand Down Expand Up @@ -56,8 +57,24 @@ func imageWriter(client *containerd.Client, img containerd.Image) imageSave {
return nil, xerrors.New("no image reference")
}
imgOpts := archive.WithImage(client.ImageService(), ref[0])
manifestOpts := archive.WithManifest(img.Target())
platOpts := archive.WithPlatform(platforms.DefaultStrict())
target := img.Target()
manifestOpts := archive.WithManifest(target)

manifest, err := images.Manifest(ctx, img.ContentStore(), target, img.Platform())
if err != nil {
return nil, xerrors.Errorf("error getting image manifest: %w", err)
}

ps, err := images.Platforms(ctx, img.ContentStore(), manifest.Config)
if err != nil {
return nil, xerrors.Errorf("error getting image platforms: %w", err)
}

if len(ps) == 0 {
return nil, xerrors.New("no platform")
}

platOpts := archive.WithPlatform(platforms.OnlyStrict(ps[0]))
AliDatadog marked this conversation as resolved.
Show resolved Hide resolved
pr, pw := io.Pipe()
go func() {
pw.CloseWithError(archive.Export(ctx, client.ContentStore(), pw, imgOpts, manifestOpts, platOpts))
Expand Down