Skip to content

Commit 2909022

Browse files
dimsdims
committed
Make local copy of kubelet/cri/streaming
Signed-off-by: Davanum Srinivas <[email protected]>
1 parent 22b5546 commit 2909022

16 files changed

Lines changed: 7 additions & 6 deletions

File tree

‎pkg/config/config_unix.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ package config
2020

2121
import (
2222
"github.com/containerd/containerd"
23-
"k8s.io/kubernetes/pkg/kubelet/cri/streaming"
23+
"github.com/containerd/cri/pkg/streaming"
2424
)
2525

2626
// DefaultConfig returns default configurations of cri plugin.

‎pkg/config/config_windows.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"path/filepath"
2424

2525
"github.com/containerd/containerd"
26-
"k8s.io/kubernetes/pkg/kubelet/cri/streaming"
26+
"github.com/containerd/cri/pkg/streaming"
2727
)
2828

2929
// DefaultConfig returns default configurations of cri plugin.

‎pkg/server/service.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ import (
2828
"github.com/containerd/containerd"
2929
"github.com/containerd/containerd/oci"
3030
"github.com/containerd/containerd/plugin"
31+
"github.com/containerd/cri/pkg/streaming"
3132
cni "github.com/containerd/go-cni"
3233
"github.com/pkg/errors"
3334
"github.com/sirupsen/logrus"
3435
"google.golang.org/grpc"
3536
runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
36-
"k8s.io/kubernetes/pkg/kubelet/cri/streaming"
3737

3838
"github.com/containerd/cri/pkg/store/label"
3939

‎pkg/server/streaming.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ import (
3030
"k8s.io/apimachinery/pkg/util/runtime"
3131
"k8s.io/client-go/tools/remotecommand"
3232
k8scert "k8s.io/client-go/util/cert"
33-
"k8s.io/kubernetes/pkg/kubelet/cri/streaming"
3433
"k8s.io/utils/exec"
3534

3635
ctrdutil "github.com/containerd/cri/pkg/containerd/util"
36+
"github.com/containerd/cri/pkg/streaming"
3737
)
3838

3939
type streamListenerMode int

vendor/k8s.io/kubernetes/pkg/kubelet/cri/streaming/errors.go renamed to pkg/streaming/errors.go

File renamed without changes.

vendor/k8s.io/kubernetes/pkg/kubelet/cri/streaming/portforward/constants.go renamed to pkg/streaming/portforward/constants.go

File renamed without changes.

vendor/k8s.io/kubernetes/pkg/kubelet/cri/streaming/portforward/httpstream.go renamed to pkg/streaming/portforward/httpstream.go

File renamed without changes.

vendor/k8s.io/kubernetes/pkg/kubelet/cri/streaming/portforward/portforward.go renamed to pkg/streaming/portforward/portforward.go

File renamed without changes.

vendor/k8s.io/kubernetes/pkg/kubelet/cri/streaming/portforward/websocket.go renamed to pkg/streaming/portforward/websocket.go

File renamed without changes.

vendor/k8s.io/kubernetes/pkg/kubelet/cri/streaming/remotecommand/attach.go renamed to pkg/streaming/remotecommand/attach.go

File renamed without changes.

0 commit comments

Comments
 (0)