github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #9254 from adisky/cri-streaming-from-k8s

Browse Source 
Use staging k8s.io/kubelet/cri/streaming package
This commit is contained in:
Maksym Pavlenko
2023-10-19 12:32:12 -07:00
committed by GitHub
parent f7af7fce8a 03d81f595f
commit f90f80d9b3
275 changed files with 7417 additions and 31858 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/cri/config/config_unix.go
View File

@@ -22,8 +22,8 @@ import (
"time"
"github.com/containerd/containerd"
"github.com/containerd/containerd/pkg/cri/streaming"
"github.com/pelletier/go-toml/v2"
"k8s.io/kubelet/pkg/cri/streaming"
)
// DefaultConfig returns default configurations of cri plugin.

2
pkg/cri/config/config_windows.go
View File

@@ -22,7 +22,7 @@ import (
"time"
"github.com/containerd/containerd"
"github.com/containerd/containerd/pkg/cri/streaming"
"k8s.io/kubelet/pkg/cri/streaming"
)
// DefaultConfig returns default configurations of cri plugin.