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

Bump cri-dockerd #7347

Merged
merged 1 commit into from
Apr 24, 2023
Merged

Bump cri-dockerd #7347

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
3 changes: 3 additions & 0 deletions .drone.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -746,6 +746,9 @@ steps:
- cd ../secretsencryption
- vagrant destroy -f
- go test -v -timeout=30m ./secretsencryption_test.go -ci -local
- cd ../startup
- vagrant destroy -f
- go test -v -timeout=30m ./startup_test.go -ci -local
dereknola marked this conversation as resolved.
Show resolved Hide resolved
- |
if [ "$DRONE_BUILD_EVENT" = "pull_request" ]; then
cd ../upgradecluster
Expand Down
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 @@ -4,7 +4,7 @@ go 1.20

replace (
github.com/Microsoft/hcsshim => github.com/Microsoft/hcsshim v0.8.25
github.com/Mirantis/cri-dockerd => github.com/k3s-io/cri-dockerd v0.3.2 // k3s/release-1.27
github.com/Mirantis/cri-dockerd => github.com/k3s-io/cri-dockerd v0.3.2-k3s2 // k3s/release-1.27
github.com/cloudnativelabs/kube-router/v2 => github.com/k3s-io/kube-router/v2 v2.0.1-0.20230411195838-cced939a8ba1
github.com/containerd/cgroups => github.com/containerd/cgroups v1.0.1
github.com/containerd/containerd => github.com/k3s-io/containerd v1.5.18-k3s1
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 @@ -567,8 +567,8 @@ github.com/k3s-io/cadvisor v0.46.0-k3s1 h1:gaxTdqiMHl3nbvlF4Jq2D3J+vTiLwhI8rYBAq
github.com/k3s-io/cadvisor v0.46.0-k3s1/go.mod h1:n0SMyEENgkEGCmhaMRife+OArnPEHEK2z8NQf5n+Szw=
github.com/k3s-io/containerd v1.5.18-k3s1 h1:D0vel+NKZ4/FnYDwFqMQ06OA3jca87rUMeWN782ABU8=
github.com/k3s-io/containerd v1.5.18-k3s1/go.mod h1:vCILl/gWFsZXZVuIrDefia9pbKe7cpWbpavHNET9axM=
github.com/k3s-io/cri-dockerd v0.3.2 h1:lwr4FZI6B3PBzXcY3j3pjdKSDq2YV6SGYZRlCSZpn9c=
github.com/k3s-io/cri-dockerd v0.3.2/go.mod h1:onvl6UEUJSF5doO0NpPhOuOdVJVTVFX6HbS5g4ngTto=
github.com/k3s-io/cri-dockerd v0.3.2-k3s2 h1:RU97q4dfiELLKyyNqXszRvtL0rIehycd6jJK4n0WBaE=
github.com/k3s-io/cri-dockerd v0.3.2-k3s2/go.mod h1:onvl6UEUJSF5doO0NpPhOuOdVJVTVFX6HbS5g4ngTto=
github.com/k3s-io/cri-tools v1.26.0-rc.0-k3s1 h1:yWVy9pS0T1BWBMZBPRy2Q29gaLmaGknQHSnx+HStrVM=
github.com/k3s-io/cri-tools v1.26.0-rc.0-k3s1/go.mod h1:tARBj7XZ6i52ChmdHcHgcN0viYrfkANLHZWIEIsGcbs=
github.com/k3s-io/etcd/api/v3 v3.5.7-k3s1 h1:mPDG69VFjlw1xS/gC35WiZ1L6AFxAupvrzOjEu7+TYo=
Expand Down