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

[test]Resolve containerd dependency conflicts #1860

Closed
wants to merge 1 commit into from
Closed

[test]Resolve containerd dependency conflicts #1860

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ require (
github.com/cenkalti/backoff/v4 v4.2.1
github.com/containerd/cgroups/v3 v3.0.2
github.com/containerd/console v1.0.3
github.com/containerd/containerd v1.7.0
github.com/containerd/containerd v1.7.3
github.com/containerd/go-runc v1.0.0
github.com/containerd/protobuild v0.3.0
github.com/containerd/ttrpc v1.2.2
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,8 +231,8 @@ github.com/containerd/containerd v1.5.7/go.mod h1:gyvv6+ugqY25TiXxcZC3L5yOeYgEw0
github.com/containerd/containerd v1.5.8/go.mod h1:YdFSv5bTFLpG2HIYmfqDpSYYTDX+mc5qtSuYx1YUb/s=
github.com/containerd/containerd v1.6.1/go.mod h1:1nJz5xCZPusx6jJU8Frfct988y0NpumIq9ODB0kLtoE=
github.com/containerd/containerd v1.6.6/go.mod h1:ZoP1geJldzCVY3Tonoz7b1IXk8rIX0Nltt5QE4OMNk0=
github.com/containerd/containerd v1.7.0 h1:G/ZQr3gMZs6ZT0qPUZ15znx5QSdQdASW11nXTLTM2Pg=
github.com/containerd/containerd v1.7.0/go.mod h1:QfR7Efgb/6X2BDpTPJRvPTYDE9rsF0FsXX9J8sIs/sc=
github.com/containerd/containerd v1.7.3 h1:cKwYKkP1eTj54bP3wCdXXBymmKRQMrWjkLSWZZJDa8o=
github.com/containerd/containerd v1.7.3/go.mod h1:32FOM4/O0RkNg7AjQj3hDzN9cUGtu+HMvaKUNiqCZB8=
github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
github.com/containerd/continuity v0.0.0-20190815185530-f2a389ac0a02/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
github.com/containerd/continuity v0.0.0-20191127005431-f65d91d395eb/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
Expand Down
15 changes: 12 additions & 3 deletions test/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require (
github.com/Microsoft/go-winio v0.6.1
github.com/Microsoft/hcsshim v0.10.0-rc.8
github.com/containerd/cgroups/v3 v3.0.2
github.com/containerd/containerd v1.7.0
github.com/containerd/containerd v1.7.3
github.com/containerd/go-runc v1.0.0
github.com/containerd/ttrpc v1.2.2
github.com/containerd/typeurl/v2 v2.1.1
Expand All @@ -24,7 +24,7 @@ require (
golang.org/x/sys v0.10.0
google.golang.org/grpc v1.57.0
google.golang.org/protobuf v1.31.0
k8s.io/cri-api v0.26.2
k8s.io/cri-api v0.27.1
)

require (
Expand Down Expand Up @@ -110,6 +110,15 @@ require (

replace (
github.com/Microsoft/hcsshim => ../
// keep CRI version frozen for cri-containerd tests
// containerd v1.7.1+ uses "k8s.io/cri-api" v0.26.0, and we cannot upgrade that dependency past 0.25.x
// because cri-containerd tests use "k8s.io/cri-api/pkg/apis/runtime/v1alpha2", which is removed
// in "k8s.io/cri-api" v0.26.0.
// "k8s.io/cri-api/pkg/apis/runtime/v1" changes between 0.25 and 0.27.
// This causes an issue when importing from "github.com/containerd/containerd/pkg/cri/*", wich ultimetly
// relies on "k8s.io/cri-api/pkg/apis/runtime/v1".
//
// todo: delete this when test/cri-containerd is moved out or upgraded off of "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
github.com/containerd/containerd => github.com/containerd/containerd v1.7.0
// keep CRI version frozen for cri-containerd tests, which need "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
k8s.io/cri-api => k8s.io/cri-api v0.25.8
)
389 changes: 0 additions & 389 deletions test/go.sum
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions test/internal/oci/cri.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ func LinuxSandboxRuntimeConfig(name string) *runtime.PodSandboxConfig {
}

// based off of:
// containerd\pkg\cri\server\sandbox_run_windows.go
// containerd\pkg\cri\server\container_create.go
// containerd\pkg\cri\server\container_create_windows.go
// github.com/containerd/containerd/pkg/cri/server/sandbox_run_windows.go
// github.com/containerd/containerd/pkg/cri/server/container_create.go
// github.com/containerd/containerd/pkg/cri/server/container_create_windows.go

func LinuxSandboxImageConfig(pause bool) *imagespec.ImageConfig {
entry := []string{"/bin/sh", "-c", TailNullArgs}
Expand Down
308 changes: 308 additions & 0 deletions vendor/github.com/Microsoft/go-winio/pkg/bindfilter/bind_filter.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading