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.

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

chore: move to containerd 2.0 API #8766

Merged
merged 1 commit into from
May 24, 2024

Conversation

smira
Copy link
Member

@smira smira commented May 20, 2024

Lots of module moves/renames.

@smira smira added this to the v1.8 milestone May 20, 2024
smira added a commit to smira/go-talos-support that referenced this pull request May 21, 2024
Use a constant from Talos machinery to avoid importing containerd API.

Required for siderolabs/talos#8766

Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com>
@smira smira force-pushed the chore/containerd-2.0 branch 2 times, most recently from 47424a2 to 888e56b Compare May 21, 2024 18:25
@smira
Copy link
Member Author

smira commented May 21, 2024

/ok-to-test

@smira smira force-pushed the chore/containerd-2.0 branch 3 times, most recently from 28efc43 to 5bacc9d Compare May 21, 2024 18:47
smira added a commit to smira/talos that referenced this pull request May 22, 2024
This only updates the binaries, the API update will be handled via
PR siderolabs#8766.

Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com>
smira added a commit to smira/talos that referenced this pull request May 22, 2024
This only updates the binaries, the API update will be handled via
PR siderolabs#8766.

Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com>
smira added a commit to smira/talos that referenced this pull request May 22, 2024
This only updates the binaries, the API update will be handled via
PR siderolabs#8766.

Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com>
@smira smira force-pushed the chore/containerd-2.0 branch 2 times, most recently from 8e28668 to 1c9075d Compare May 24, 2024 13:20
@smira smira marked this pull request as ready for review May 24, 2024 13:20
@@ -95,11 +92,6 @@ func Pull(ctx context.Context, reg config.Registries, client *containerd.Client,
containerd.WithPullUnpack,
containerd.WithResolver(resolver),
containerd.WithChildLabelMap(images.ChildGCLabelsFilterLayers),
containerd.WithUnpackOpts(
[]containerd.UnpackOpt{
containerd.WithUnpackDuplicationSuppressor(unpackDuplicationSuppressor),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not needed anymore?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we can't use it anymore (as the required parts became private), but I don't think we need it, as this is only needed when multiple requests for the same image to be pulled arrive.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

and it's only an optimization - it makes such pull operations run faster

Lots of module moves/renames.

Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com>
@smira
Copy link
Member Author

smira commented May 24, 2024

/m

@talos-bot talos-bot merged commit c2b19dc into siderolabs:main May 24, 2024
47 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants