Skip to content

vendor: github.com/containerd/containerd v1.7.6, and un-skip TestConvert#1910

Closed
thaJeztah wants to merge 2 commits intomicrosoft:mainfrom
thaJeztah:bump_containerd
Closed

vendor: github.com/containerd/containerd v1.7.6, and un-skip TestConvert#1910
thaJeztah wants to merge 2 commits intomicrosoft:mainfrom
thaJeztah:bump_containerd

Conversation

@thaJeztah
Copy link
Copy Markdown
Contributor

vendor: github.com/containerd/containerd v1.7.6

full diff: https://github.com/containerd/containerd/compare/v1.7.0..v1.7.6

[ci] un-skip TestConvert

This removes the skip that was added in 4ede1fd,
as the relevant changes were included in containerd v1.6.22 and v1.7.3.

This removes the skip that was added in 4ede1fd,
as the relevant changes were included in containerd [v1.6.22] and [v1.7.3].

[v1.6.22]: https://github.com/containerd/containerd/blob/v1.6.22/integration/client/convert_test.go
[v1.7.3]: https://github.com/containerd/containerd/blob/v1.7.3/integration/client/convert_test.go

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@kiashok
Copy link
Copy Markdown
Contributor

kiashok commented Sep 19, 2023

Looks like there are some lint erros updating to v1.7.6 @thaJeztah

@thaJeztah
Copy link
Copy Markdown
Contributor Author

Hmmm... worse; it looks like something doesn't compile 🫠

Not near a computer for a couple of hours, but looks like some dependency may need updating (or downgrading)

Error: level=error msg="[linters_context] typechecking error: D:\\a\\hcsshim\\hcsshim\\test\\gcs\\helper_cri_test.go:12:10: could not import github.com/containerd/containerd/pkg/cri/opts (-: # github.com/containerd/containerd/pkg/cri/opts\nC:\\Users\\runneradmin\\go\\pkg\\mod\\github.com\\containerd\\containerd@v1.7.6\\pkg\\cri\\opts\\spec_linux.go:144:67: undefined: v1.CDIDevice\nC:\\Users\\runneradmin\\go\\pkg\\mod\\github.com\\containerd\\containerd@v1.7.6\\pkg\\cri\\opts\\spec_linux_opts.go:166:13: mount.UidMappings undefined (type *\"k8s.io/cri-api/pkg/apis/runtime/v1\".Mount has no field or method UidMappings)\nC:\\Users\\runneradmin\\go\\pkg\\mod\\github.com\\containerd\\containerd@v1.7.6\\pkg\\cri\\opts\\spec_linux_opts.go:166:41: mount.GidMappings undefined (type *\"k8s.io/cri-api/pkg/apis/runtime/v1\".Mount has no field or method GidMappings))"

@thaJeztah
Copy link
Copy Markdown
Contributor Author

Oh! Maybe it's a build-tag missing somewhere; UIDMappings may be linux only

@helsaawy
Copy link
Copy Markdown
Contributor

its caused by the test/go.mod (shocking, I know): #1860
basically, in 1.7.0+, github.com/containerd/containerd/pkg/cri relies on k8s.io/cri-api/pkg/apis/runtime/v1, and upgrades to it to v0.27, but we freeze k8s.io/cri-api to v0.26 since we need k8s.io/cri-api/pkg/apis/runtime/v1alpha2. v0.26/v0.27 deleted a bunch of stuff, and added some new stuff, so theres an incompatibility (due to us needing v1alpha2 CRI APIs)...

@kiashok
Copy link
Copy Markdown
Contributor

kiashok commented Aug 20, 2025

We are on a newer version now.

@kiashok kiashok closed this Aug 20, 2025
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