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

Make local copy of kubelet/cri/streaming

Browse Source 
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
This commit is contained in:
Davanum Srinivas 2020-06-22 13:54:34 -04:00
parent 22b55461b3
commit 2909022a6e
No known key found for this signature in database
GPG Key ID: 80D83A796103BF59
16 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/config/config_unix.go
View File

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

2
pkg/config/config_windows.go
View File

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

2
pkg/server/service.go
View File

@ -28,12 +28,12 @@ import (
"github.com/containerd/containerd" "github.com/containerd/containerd"
"github.com/containerd/containerd/oci" "github.com/containerd/containerd/oci"
"github.com/containerd/containerd/plugin" "github.com/containerd/containerd/plugin"
"github.com/containerd/cri/pkg/streaming"
cni "github.com/containerd/go-cni" cni "github.com/containerd/go-cni"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"google.golang.org/grpc" "google.golang.org/grpc"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2" runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
"k8s.io/kubernetes/pkg/kubelet/cri/streaming"
"github.com/containerd/cri/pkg/store/label" "github.com/containerd/cri/pkg/store/label"

2
pkg/server/streaming.go
View File

@ -30,10 +30,10 @@ import (
"k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/client-go/tools/remotecommand" "k8s.io/client-go/tools/remotecommand"
k8scert "k8s.io/client-go/util/cert" k8scert "k8s.io/client-go/util/cert"
"k8s.io/kubernetes/pkg/kubelet/cri/streaming"
"k8s.io/utils/exec" "k8s.io/utils/exec"
ctrdutil "github.com/containerd/cri/pkg/containerd/util" ctrdutil "github.com/containerd/cri/pkg/containerd/util"
"github.com/containerd/cri/pkg/streaming"
) )
type streamListenerMode int type streamListenerMode int

0
vendor/k8s.io/kubernetes/pkg/kubelet/cri/streaming/errors.go → pkg/streaming/errors.go
View File

0
vendor/k8s.io/kubernetes/pkg/kubelet/cri/streaming/portforward/constants.go → pkg/streaming/portforward/constants.go
View File

0
vendor/k8s.io/kubernetes/pkg/kubelet/cri/streaming/portforward/httpstream.go → pkg/streaming/portforward/httpstream.go
View File

0
vendor/k8s.io/kubernetes/pkg/kubelet/cri/streaming/portforward/portforward.go → pkg/streaming/portforward/portforward.go
View File

0
vendor/k8s.io/kubernetes/pkg/kubelet/cri/streaming/portforward/websocket.go → pkg/streaming/portforward/websocket.go
View File

0
vendor/k8s.io/kubernetes/pkg/kubelet/cri/streaming/remotecommand/attach.go → pkg/streaming/remotecommand/attach.go
View File

0
vendor/k8s.io/kubernetes/pkg/kubelet/cri/streaming/remotecommand/doc.go → pkg/streaming/remotecommand/doc.go
View File

0
vendor/k8s.io/kubernetes/pkg/kubelet/cri/streaming/remotecommand/exec.go → pkg/streaming/remotecommand/exec.go
View File

0
vendor/k8s.io/kubernetes/pkg/kubelet/cri/streaming/remotecommand/httpstream.go → pkg/streaming/remotecommand/httpstream.go
View File

0
vendor/k8s.io/kubernetes/pkg/kubelet/cri/streaming/remotecommand/websocket.go → pkg/streaming/remotecommand/websocket.go
View File

0
vendor/k8s.io/kubernetes/pkg/kubelet/cri/streaming/request_cache.go → pkg/streaming/request_cache.go
View File

5
vendor/k8s.io/kubernetes/pkg/kubelet/cri/streaming/server.go → pkg/streaming/server.go
View File

@ -35,8 +35,9 @@ import (
remotecommandconsts "k8s.io/apimachinery/pkg/util/remotecommand" remotecommandconsts "k8s.io/apimachinery/pkg/util/remotecommand"
"k8s.io/client-go/tools/remotecommand" "k8s.io/client-go/tools/remotecommand"
runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1alpha2" runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
"k8s.io/kubernetes/pkg/kubelet/cri/streaming/portforward"
remotecommandserver "k8s.io/kubernetes/pkg/kubelet/cri/streaming/remotecommand" "github.com/containerd/cri/pkg/streaming/portforward"
remotecommandserver "github.com/containerd/cri/pkg/streaming/remotecommand"
) )
// Server is the library interface to serve the stream requests. // Server is the library interface to serve the stream requests.