From d96223f6f486947a5bee25f31f3cba4ce1b3ff40 Mon Sep 17 00:00:00 2001 From: Sean Sullivan Date: Mon, 22 May 2023 10:03:17 -0700 Subject: [PATCH] Refactor wsstream library from apiserver to apimachinery Kubernetes-commit: 8f3109da7913ef17c6656893f12f0e29ceabbde0 --- pkg/cri/streaming/portforward/portforward.go | 2 +- pkg/cri/streaming/portforward/websocket.go | 2 +- pkg/cri/streaming/remotecommand/httpstream.go | 2 +- pkg/cri/streaming/remotecommand/websocket.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/cri/streaming/portforward/portforward.go b/pkg/cri/streaming/portforward/portforward.go index df0fe5a..7aa668c 100644 --- a/pkg/cri/streaming/portforward/portforward.go +++ b/pkg/cri/streaming/portforward/portforward.go @@ -23,8 +23,8 @@ import ( "time" "k8s.io/apimachinery/pkg/types" + "k8s.io/apimachinery/pkg/util/httpstream/wsstream" "k8s.io/apimachinery/pkg/util/runtime" - "k8s.io/apiserver/pkg/util/wsstream" ) // PortForwarder knows how to forward content from a data stream to/from a port diff --git a/pkg/cri/streaming/portforward/websocket.go b/pkg/cri/streaming/portforward/websocket.go index cbedb5b..3700a7e 100644 --- a/pkg/cri/streaming/portforward/websocket.go +++ b/pkg/cri/streaming/portforward/websocket.go @@ -31,9 +31,9 @@ import ( api "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" + "k8s.io/apimachinery/pkg/util/httpstream/wsstream" "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apiserver/pkg/endpoints/responsewriter" - "k8s.io/apiserver/pkg/util/wsstream" ) const ( diff --git a/pkg/cri/streaming/remotecommand/httpstream.go b/pkg/cri/streaming/remotecommand/httpstream.go index 8c18b2e..92ab045 100644 --- a/pkg/cri/streaming/remotecommand/httpstream.go +++ b/pkg/cri/streaming/remotecommand/httpstream.go @@ -29,9 +29,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/httpstream" "k8s.io/apimachinery/pkg/util/httpstream/spdy" + "k8s.io/apimachinery/pkg/util/httpstream/wsstream" remotecommandconsts "k8s.io/apimachinery/pkg/util/remotecommand" "k8s.io/apimachinery/pkg/util/runtime" - "k8s.io/apiserver/pkg/util/wsstream" "k8s.io/client-go/tools/remotecommand" "k8s.io/klog/v2" diff --git a/pkg/cri/streaming/remotecommand/websocket.go b/pkg/cri/streaming/remotecommand/websocket.go index a81d225..2590088 100644 --- a/pkg/cri/streaming/remotecommand/websocket.go +++ b/pkg/cri/streaming/remotecommand/websocket.go @@ -21,9 +21,9 @@ import ( "net/http" "time" + "k8s.io/apimachinery/pkg/util/httpstream/wsstream" "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apiserver/pkg/endpoints/responsewriter" - "k8s.io/apiserver/pkg/util/wsstream" ) const (