Skip to content

Update containerd to v2.0.0-rc.2#157

Merged
dmcgowan merged 6 commits into
containerd:mainfrom
dmcgowan:update-containerd-v2.0.0-rc.2
May 28, 2024
Merged

Update containerd to v2.0.0-rc.2#157
dmcgowan merged 6 commits into
containerd:mainfrom
dmcgowan:update-containerd-v2.0.0-rc.2

Conversation

@dmcgowan

@dmcgowan dmcgowan commented May 27, 2024

Copy link
Copy Markdown
Member

Carries #148 with test fixes

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
- github.com/containerd/containerd/{containers,images,...} -> github.com/containerd/containerd/v2/core/{containers,images,...}
- github.com/containerd/containerd/{errdefs,logs,platforms} -> github.com/containerd/{errdefs,logs,platforms}
- github.com/containerd/typeurl -> github.com/containerd/typeurl/v2
- github.com/urfave/cli -> github.com/urfave/cli/v2 (See containerd/containerd PR 9809)
- github.com/gogo/protobuf -> github.com/containerd/containerd/v2/protobuf

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
@dmcgowan dmcgowan force-pushed the update-containerd-v2.0.0-rc.2 branch from 6cad2df to 970229f Compare May 27, 2024 00:17
Signed-off-by: Derek McGowan <derek@mcg.dev>
@dmcgowan dmcgowan force-pushed the update-containerd-v2.0.0-rc.2 branch 10 times, most recently from e03bcbb to 6324d9d Compare May 27, 2024 04:26
Signed-off-by: Derek McGowan <derek@mcg.dev>
@dmcgowan dmcgowan force-pushed the update-containerd-v2.0.0-rc.2 branch from 1894e73 to 0abc111 Compare May 27, 2024 04:40
@dmcgowan dmcgowan changed the title Update containerd v2.0.0-rc.2 Update containerd to v2.0.0-rc.2 May 27, 2024
@dmcgowan dmcgowan marked this pull request as ready for review May 27, 2024 04:46
@dmcgowan

Copy link
Copy Markdown
Member Author

Test fixed!

Switched to fetch all rather than pull since unpack happens later.
The argument ordering was wrong on one of the test, the updated cli library seems to be more strict about it.

@AkihiroSuda AkihiroSuda left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Thanks

@stefanberger stefanberger left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Thank you!

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