Skip to content

Commit 9269d97

Browse files
dimsdims
committed
hide wsstream under internal/ to prevent external use
Signed-off-by: Davanum Srinivas <[email protected]>
1 parent 59815fa commit 9269d97

8 files changed

Lines changed: 8 additions & 8 deletions

File tree

pkg/cri/streaming/wsstream/conn.go renamed to pkg/cri/streaming/internal/wsstream/conn.go

File renamed without changes.

pkg/cri/streaming/wsstream/conn_test.go renamed to pkg/cri/streaming/internal/wsstream/conn_test.go

File renamed without changes.

pkg/cri/streaming/wsstream/stream.go renamed to pkg/cri/streaming/internal/wsstream/stream.go

File renamed without changes.

pkg/cri/streaming/wsstream/stream_test.go renamed to pkg/cri/streaming/internal/wsstream/stream_test.go

File renamed without changes.

‎pkg/cri/streaming/portforward/portforward.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ import (
3737
"net/http"
3838
"time"
3939

40+
"github.com/containerd/containerd/pkg/cri/streaming/internal/wsstream"
41+
4042
"k8s.io/apimachinery/pkg/types"
4143
"k8s.io/apimachinery/pkg/util/runtime"
42-
43-
"github.com/containerd/containerd/pkg/cri/streaming/wsstream"
4444
)
4545

4646
// PortForwarder knows how to forward content from a data stream to/from a port

‎pkg/cri/streaming/portforward/websocket.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,14 @@ import (
4242
"sync"
4343
"time"
4444

45+
"github.com/containerd/containerd/pkg/cri/streaming/internal/wsstream"
46+
4547
"k8s.io/klog/v2"
4648

4749
api "k8s.io/api/core/v1"
4850
"k8s.io/apimachinery/pkg/types"
4951
"k8s.io/apimachinery/pkg/util/runtime"
5052
"k8s.io/apiserver/pkg/server/httplog"
51-
52-
"github.com/containerd/containerd/pkg/cri/streaming/wsstream"
5353
)
5454

5555
const (

‎pkg/cri/streaming/remotecommand/httpstream.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ import (
4141
"net/http"
4242
"time"
4343

44+
"github.com/containerd/containerd/pkg/cri/streaming/internal/wsstream"
45+
4446
api "k8s.io/api/core/v1"
4547
apierrors "k8s.io/apimachinery/pkg/api/errors"
4648
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -51,8 +53,6 @@ import (
5153
"k8s.io/client-go/tools/remotecommand"
5254

5355
"k8s.io/klog/v2"
54-
55-
"github.com/containerd/containerd/pkg/cri/streaming/wsstream"
5656
)
5757

5858
// Options contains details about which streams are required for

‎pkg/cri/streaming/remotecommand/websocket.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ import (
3737
"net/http"
3838
"time"
3939

40+
"github.com/containerd/containerd/pkg/cri/streaming/internal/wsstream"
41+
4042
"k8s.io/apimachinery/pkg/util/runtime"
4143
"k8s.io/apiserver/pkg/server/httplog"
42-
43-
"github.com/containerd/containerd/pkg/cri/streaming/wsstream"
4444
)
4545

4646
const (

0 commit comments

Comments
 (0)