Skip to content

[pull] main from containerd:main #297

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

Merged
pull merged 2 commits into from
Apr 6, 2026
+2 −2
Merged

[pull] main from containerd:main #297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1615e07
replace one more k8s.io/apimachinery/ reference
SergeyKanzhelev Apr 3, 2026
e373060
Merge pull request #13157 from SergeyKanzhelev/forgottenRename
mxpv Apr 6, 2026
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 @@ -87,6 +87,7 @@ require (
k8s.io/cri-api v0.36.0-beta.0
k8s.io/cri-streaming v0.36.0-beta.0
k8s.io/klog/v2 v2.140.0
k8s.io/streaming v0.36.0-beta.0
tags.cncf.io/container-device-interface v1.1.0
)

Expand Down Expand Up @@ -154,7 +155,6 @@ require (
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/api v0.36.0-beta.0 // indirect
k8s.io/kube-openapi v0.0.0-20260319004828-5883c5ee87b9 // indirect
k8s.io/streaming v0.36.0-beta.0 // indirect
k8s.io/utils v0.0.0-20260319190234-28399d86e0b5 // indirect
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
sigs.k8s.io/randfill v1.0.0 // indirect
Expand Down
2 changes: 1 addition & 1 deletion internal/cri/server/streaming.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"io"
"math"

"k8s.io/apimachinery/pkg/util/runtime"
remotecommand "k8s.io/cri-streaming/pkg/streaming/remotecommand"
"k8s.io/streaming/pkg/runtime"

executil "github.com/containerd/containerd/v2/internal/cri/executil"
ctrdutil "github.com/containerd/containerd/v2/internal/cri/util"
Expand Down
Loading