Skip to content

Commit 765e926

Browse files
committed
Avoid using internal packages for streaming/ package
Signed-off-by: Davanum Srinivas <[email protected]>
1 parent a75ee74 commit 765e926

File tree

8 files changed

+9
-9
lines changed

8 files changed

+9
-9
lines changed

pkg/kubelet/server/portforward/BUILD

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ go_library(
1616
],
1717
importpath = "k8s.io/kubernetes/pkg/kubelet/server/portforward",
1818
deps = [
19-
"//pkg/apis/core:go_default_library",
19+
"//staging/src/k8s.io/api/core/v1:go_default_library",
2020
"//staging/src/k8s.io/apimachinery/pkg/types:go_default_library",
2121
"//staging/src/k8s.io/apimachinery/pkg/util/httpstream:go_default_library",
2222
"//staging/src/k8s.io/apimachinery/pkg/util/httpstream/spdy:go_default_library",
@@ -35,7 +35,7 @@ go_test(
3535
],
3636
embed = [":go_default_library"],
3737
deps = [
38-
"//pkg/apis/core:go_default_library",
38+
"//staging/src/k8s.io/api/core/v1:go_default_library",
3939
"//staging/src/k8s.io/apimachinery/pkg/util/httpstream:go_default_library",
4040
],
4141
)

pkg/kubelet/server/portforward/httpstream.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ import (
2424
"sync"
2525
"time"
2626

27+
api "k8s.io/api/core/v1"
2728
"k8s.io/apimachinery/pkg/types"
2829
"k8s.io/apimachinery/pkg/util/httpstream"
2930
"k8s.io/apimachinery/pkg/util/httpstream/spdy"
3031
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
31-
api "k8s.io/kubernetes/pkg/apis/core"
3232

3333
"k8s.io/klog"
3434
)

pkg/kubelet/server/portforward/httpstream_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import (
2121
"testing"
2222
"time"
2323

24+
api "k8s.io/api/core/v1"
2425
"k8s.io/apimachinery/pkg/util/httpstream"
25-
api "k8s.io/kubernetes/pkg/apis/core"
2626
)
2727

2828
func TestHTTPStreamReceived(t *testing.T) {

pkg/kubelet/server/portforward/websocket.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ import (
2828

2929
"k8s.io/klog"
3030

31+
api "k8s.io/api/core/v1"
3132
"k8s.io/apimachinery/pkg/types"
3233
"k8s.io/apimachinery/pkg/util/runtime"
3334
"k8s.io/apiserver/pkg/server/httplog"
3435
"k8s.io/apiserver/pkg/util/wsstream"
35-
api "k8s.io/kubernetes/pkg/apis/core"
3636
)
3737

3838
const (

pkg/kubelet/server/remotecommand/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ go_library(
1616
],
1717
importpath = "k8s.io/kubernetes/pkg/kubelet/server/remotecommand",
1818
deps = [
19-
"//pkg/apis/core:go_default_library",
19+
"//staging/src/k8s.io/api/core/v1:go_default_library",
2020
"//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library",
2121
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
2222
"//staging/src/k8s.io/apimachinery/pkg/types:go_default_library",

pkg/kubelet/server/remotecommand/httpstream.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import (
2424
"net/http"
2525
"time"
2626

27+
api "k8s.io/api/core/v1"
2728
apierrors "k8s.io/apimachinery/pkg/api/errors"
2829
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2930
"k8s.io/apimachinery/pkg/util/httpstream"
@@ -32,7 +33,6 @@ import (
3233
"k8s.io/apimachinery/pkg/util/runtime"
3334
"k8s.io/apiserver/pkg/util/wsstream"
3435
"k8s.io/client-go/tools/remotecommand"
35-
api "k8s.io/kubernetes/pkg/apis/core"
3636

3737
"k8s.io/klog"
3838
)

pkg/kubelet/server/streaming/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ go_test(
3636
],
3737
embed = [":go_default_library"],
3838
deps = [
39-
"//pkg/apis/core:go_default_library",
4039
"//pkg/kubelet/server/portforward:go_default_library",
40+
"//staging/src/k8s.io/api/core/v1:go_default_library",
4141
"//staging/src/k8s.io/apimachinery/pkg/util/clock:go_default_library",
4242
"//staging/src/k8s.io/client-go/rest:go_default_library",
4343
"//staging/src/k8s.io/client-go/tools/remotecommand:go_default_library",

pkg/kubelet/server/streaming/server_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ import (
3030
"github.com/stretchr/testify/assert"
3131
"github.com/stretchr/testify/require"
3232

33+
api "k8s.io/api/core/v1"
3334
restclient "k8s.io/client-go/rest"
3435
"k8s.io/client-go/tools/remotecommand"
3536
"k8s.io/client-go/transport/spdy"
3637
runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
37-
api "k8s.io/kubernetes/pkg/apis/core"
3838
kubeletportforward "k8s.io/kubernetes/pkg/kubelet/server/portforward"
3939
)
4040

0 commit comments

Comments
 (0)