switch over references to the new package

dims · dims · commit 6f3252733c4f · 2024-08-10T21:12:40.000-04:00
Signed-off-by: Davanum Srinivas &lt;davanum@gmail.com&gt;
diff --git a/pkg/cri/streaming/portforward/portforward.go b/pkg/cri/streaming/portforward/portforward.go
@@ -39,7 +39,8 @@ import (
 
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/runtime"
-	"k8s.io/apiserver/pkg/util/wsstream"
+
+	"github.com/containerd/containerd/pkg/cri/streaming/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
@@ -48,7 +48,8 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/apiserver/pkg/server/httplog"
-	"k8s.io/apiserver/pkg/util/wsstream"
+
+	"github.com/containerd/containerd/pkg/cri/streaming/wsstream"
 )
 
 const (
diff --git a/pkg/cri/streaming/remotecommand/httpstream.go b/pkg/cri/streaming/remotecommand/httpstream.go
@@ -48,10 +48,11 @@ import (
 	"k8s.io/apimachinery/pkg/util/httpstream/spdy"
 	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"
+
+	"github.com/containerd/containerd/pkg/cri/streaming/wsstream"
 )
 
 // Options contains details about which streams are required for
diff --git a/pkg/cri/streaming/remotecommand/websocket.go b/pkg/cri/streaming/remotecommand/websocket.go
@@ -39,7 +39,8 @@ import (
 
 	"k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/apiserver/pkg/server/httplog"
-	"k8s.io/apiserver/pkg/util/wsstream"
+
+	"github.com/containerd/containerd/pkg/cri/streaming/wsstream"
 )
 
 const (

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,8 @@ import (`
`39`	`39`
`40`	`40`	`"k8s.io/apimachinery/pkg/types"`
`41`	`41`	`"k8s.io/apimachinery/pkg/util/runtime"`
`42`		`- "k8s.io/apiserver/pkg/util/wsstream"`
	`42`	`+`
	`43`	`+ "github.com/containerd/containerd/pkg/cri/streaming/wsstream"`
`43`	`44`	`)`
`44`	`45`
`45`	`46`	`// PortForwarder knows how to forward content from a data stream to/from a port`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,8 @@ import (`
`48`	`48`	`"k8s.io/apimachinery/pkg/types"`
`49`	`49`	`"k8s.io/apimachinery/pkg/util/runtime"`
`50`	`50`	`"k8s.io/apiserver/pkg/server/httplog"`
`51`		`- "k8s.io/apiserver/pkg/util/wsstream"`
	`51`	`+`
	`52`	`+ "github.com/containerd/containerd/pkg/cri/streaming/wsstream"`
`52`	`53`	`)`
`53`	`54`
`54`	`55`	`const (`