From 674d78b2ab6e1e6b365b053413ad5b500225542b Mon Sep 17 00:00:00 2001 From: "Dr. Stefan Schimanski" Date: Tue, 24 Jan 2017 15:43:13 +0100 Subject: [PATCH] pkg/util: move httpstream to k8s.io/apimachinery --- cmd/kube-aggregator/pkg/apiserver/BUILD | 2 +- .../pkg/apiserver/handler_proxy.go | 2 +- pkg/client/unversioned/portforward/BUILD | 4 +- .../unversioned/portforward/portforward.go | 2 +- .../portforward/portforward_test.go | 2 +- pkg/client/unversioned/remotecommand/BUILD | 6 +- .../remotecommand/remotecommand.go | 4 +- .../remotecommand/remotecommand_test.go | 2 +- pkg/client/unversioned/remotecommand/v1.go | 2 +- .../unversioned/remotecommand/v2_test.go | 2 +- pkg/genericapiserver/endpoints/handlers/BUILD | 2 +- .../endpoints/handlers/proxy.go | 2 +- .../registry/generic/rest/BUILD | 4 +- .../registry/generic/rest/proxy.go | 2 +- .../registry/generic/rest/proxy_test.go | 2 +- pkg/kubelet/server/BUILD | 4 +- pkg/kubelet/server/portforward/BUILD | 6 +- pkg/kubelet/server/portforward/portforward.go | 4 +- .../server/portforward/portforward_test.go | 2 +- pkg/kubelet/server/remotecommand/BUILD | 4 +- .../server/remotecommand/httpstream.go | 4 +- pkg/kubelet/server/server_test.go | 4 +- pkg/util/BUILD | 1 - pkg/util/httpstream/BUILD | 42 -------------- pkg/util/httpstream/spdy/BUILD | 57 ------------------- .../apimachinery/pkg}/util/httpstream/doc.go | 2 +- .../pkg}/util/httpstream/httpstream.go | 0 .../pkg}/util/httpstream/httpstream_test.go | 0 .../pkg}/util/httpstream/spdy/connection.go | 2 +- .../util/httpstream/spdy/connection_test.go | 2 +- .../pkg}/util/httpstream/spdy/roundtripper.go | 2 +- .../util/httpstream/spdy/roundtripper_test.go | 2 +- .../pkg}/util/httpstream/spdy/upgrade.go | 2 +- .../pkg}/util/httpstream/spdy/upgrade_test.go | 0 vendor/BUILD | 52 +++++++++++++++++ 35 files changed, 92 insertions(+), 140 deletions(-) delete mode 100644 pkg/util/httpstream/BUILD delete mode 100644 pkg/util/httpstream/spdy/BUILD rename {pkg => staging/src/k8s.io/apimachinery/pkg}/util/httpstream/doc.go (90%) rename {pkg => staging/src/k8s.io/apimachinery/pkg}/util/httpstream/httpstream.go (100%) rename {pkg => staging/src/k8s.io/apimachinery/pkg}/util/httpstream/httpstream_test.go (100%) rename {pkg => staging/src/k8s.io/apimachinery/pkg}/util/httpstream/spdy/connection.go (99%) rename {pkg => staging/src/k8s.io/apimachinery/pkg}/util/httpstream/spdy/connection_test.go (98%) rename {pkg => staging/src/k8s.io/apimachinery/pkg}/util/httpstream/spdy/roundtripper.go (99%) rename {pkg => staging/src/k8s.io/apimachinery/pkg}/util/httpstream/spdy/roundtripper_test.go (99%) rename {pkg => staging/src/k8s.io/apimachinery/pkg}/util/httpstream/spdy/upgrade.go (98%) rename {pkg => staging/src/k8s.io/apimachinery/pkg}/util/httpstream/spdy/upgrade_test.go (100%) diff --git a/cmd/kube-aggregator/pkg/apiserver/BUILD b/cmd/kube-aggregator/pkg/apiserver/BUILD index 4bcb9fd359..0bb93d52d0 100644 --- a/cmd/kube-aggregator/pkg/apiserver/BUILD +++ b/cmd/kube-aggregator/pkg/apiserver/BUILD @@ -61,7 +61,6 @@ go_library( "//pkg/genericapiserver/registry/generic/rest:go_default_library", "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/genericapiserver/server:go_default_library", - "//pkg/util/httpstream/spdy:go_default_library", "//pkg/util/workqueue:go_default_library", "//pkg/version:go_default_library", "//vendor:github.com/golang/glog", @@ -69,6 +68,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apimachinery/pkg/util/httpstream/spdy", "//vendor:k8s.io/apimachinery/pkg/util/runtime", "//vendor:k8s.io/apimachinery/pkg/util/wait", "//vendor:k8s.io/apiserver/pkg/endpoints/request", diff --git a/cmd/kube-aggregator/pkg/apiserver/handler_proxy.go b/cmd/kube-aggregator/pkg/apiserver/handler_proxy.go index 2f8a35ce67..fad8a2c612 100644 --- a/cmd/kube-aggregator/pkg/apiserver/handler_proxy.go +++ b/cmd/kube-aggregator/pkg/apiserver/handler_proxy.go @@ -22,12 +22,12 @@ import ( "sync" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/util/httpstream/spdy" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" restclient "k8s.io/client-go/rest" "k8s.io/client-go/transport" "k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers/responsewriters" genericrest "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/rest" - "k8s.io/kubernetes/pkg/util/httpstream/spdy" apiregistrationapi "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration" ) diff --git a/pkg/client/unversioned/portforward/BUILD b/pkg/client/unversioned/portforward/BUILD index a549554e88..ce7444cc56 100644 --- a/pkg/client/unversioned/portforward/BUILD +++ b/pkg/client/unversioned/portforward/BUILD @@ -18,7 +18,7 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/kubelet/server/portforward:go_default_library", - "//pkg/util/httpstream:go_default_library", + "//vendor:k8s.io/apimachinery/pkg/util/httpstream", "//vendor:k8s.io/apimachinery/pkg/util/runtime", ], ) @@ -31,8 +31,8 @@ go_test( deps = [ "//pkg/client/unversioned/remotecommand:go_default_library", "//pkg/kubelet/server/portforward:go_default_library", - "//pkg/util/httpstream:go_default_library", "//vendor:k8s.io/apimachinery/pkg/types", + "//vendor:k8s.io/apimachinery/pkg/util/httpstream", "//vendor:k8s.io/client-go/rest", ], ) diff --git a/pkg/client/unversioned/portforward/portforward.go b/pkg/client/unversioned/portforward/portforward.go index 33230a810f..50def7df29 100644 --- a/pkg/client/unversioned/portforward/portforward.go +++ b/pkg/client/unversioned/portforward/portforward.go @@ -27,10 +27,10 @@ import ( "strings" "sync" + "k8s.io/apimachinery/pkg/util/httpstream" "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/kubelet/server/portforward" - "k8s.io/kubernetes/pkg/util/httpstream" ) // PortForwarder knows how to listen for local connections and forward them to diff --git a/pkg/client/unversioned/portforward/portforward_test.go b/pkg/client/unversioned/portforward/portforward_test.go index 9fec342713..e174d0de32 100644 --- a/pkg/client/unversioned/portforward/portforward_test.go +++ b/pkg/client/unversioned/portforward/portforward_test.go @@ -32,10 +32,10 @@ import ( "time" "k8s.io/apimachinery/pkg/types" + "k8s.io/apimachinery/pkg/util/httpstream" restclient "k8s.io/client-go/rest" "k8s.io/kubernetes/pkg/client/unversioned/remotecommand" "k8s.io/kubernetes/pkg/kubelet/server/portforward" - "k8s.io/kubernetes/pkg/util/httpstream" ) type fakeDialer struct { diff --git a/pkg/client/unversioned/remotecommand/BUILD b/pkg/client/unversioned/remotecommand/BUILD index b39f068453..840a3e23a6 100644 --- a/pkg/client/unversioned/remotecommand/BUILD +++ b/pkg/client/unversioned/remotecommand/BUILD @@ -24,11 +24,11 @@ go_library( "//pkg/api:go_default_library", "//pkg/kubelet/server/remotecommand:go_default_library", "//pkg/util/exec:go_default_library", - "//pkg/util/httpstream:go_default_library", - "//pkg/util/httpstream/spdy:go_default_library", "//pkg/util/term:go_default_library", "//vendor:github.com/golang/glog", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/util/httpstream", + "//vendor:k8s.io/apimachinery/pkg/util/httpstream/spdy", "//vendor:k8s.io/apimachinery/pkg/util/runtime", "//vendor:k8s.io/client-go/rest", "//vendor:k8s.io/client-go/transport", @@ -48,11 +48,11 @@ go_test( "//pkg/api:go_default_library", "//pkg/api/testapi:go_default_library", "//pkg/kubelet/server/remotecommand:go_default_library", - "//pkg/util/httpstream:go_default_library", "//pkg/util/term:go_default_library", "//vendor:github.com/stretchr/testify/require", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/types", + "//vendor:k8s.io/apimachinery/pkg/util/httpstream", "//vendor:k8s.io/apimachinery/pkg/util/wait", "//vendor:k8s.io/client-go/rest", ], diff --git a/pkg/client/unversioned/remotecommand/remotecommand.go b/pkg/client/unversioned/remotecommand/remotecommand.go index 1086f36913..1d713e2eab 100644 --- a/pkg/client/unversioned/remotecommand/remotecommand.go +++ b/pkg/client/unversioned/remotecommand/remotecommand.go @@ -24,11 +24,11 @@ import ( "github.com/golang/glog" + "k8s.io/apimachinery/pkg/util/httpstream" + "k8s.io/apimachinery/pkg/util/httpstream/spdy" restclient "k8s.io/client-go/rest" "k8s.io/client-go/transport" "k8s.io/kubernetes/pkg/kubelet/server/remotecommand" - "k8s.io/kubernetes/pkg/util/httpstream" - "k8s.io/kubernetes/pkg/util/httpstream/spdy" "k8s.io/kubernetes/pkg/util/term" ) diff --git a/pkg/client/unversioned/remotecommand/remotecommand_test.go b/pkg/client/unversioned/remotecommand/remotecommand_test.go index 1d4886e788..70929c4ed6 100644 --- a/pkg/client/unversioned/remotecommand/remotecommand_test.go +++ b/pkg/client/unversioned/remotecommand/remotecommand_test.go @@ -33,11 +33,11 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/types" + "k8s.io/apimachinery/pkg/util/httpstream" restclient "k8s.io/client-go/rest" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/kubelet/server/remotecommand" - "k8s.io/kubernetes/pkg/util/httpstream" "k8s.io/kubernetes/pkg/util/term" ) diff --git a/pkg/client/unversioned/remotecommand/v1.go b/pkg/client/unversioned/remotecommand/v1.go index 11d5d7b595..a62c1c23da 100644 --- a/pkg/client/unversioned/remotecommand/v1.go +++ b/pkg/client/unversioned/remotecommand/v1.go @@ -23,8 +23,8 @@ import ( "net/http" "github.com/golang/glog" + "k8s.io/apimachinery/pkg/util/httpstream" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/util/httpstream" ) // streamProtocolV1 implements the first version of the streaming exec & attach diff --git a/pkg/client/unversioned/remotecommand/v2_test.go b/pkg/client/unversioned/remotecommand/v2_test.go index 106c27ce7f..6e7c05927e 100644 --- a/pkg/client/unversioned/remotecommand/v2_test.go +++ b/pkg/client/unversioned/remotecommand/v2_test.go @@ -24,9 +24,9 @@ import ( "testing" "time" + "k8s.io/apimachinery/pkg/util/httpstream" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/util/httpstream" ) type fakeReader struct { diff --git a/pkg/genericapiserver/endpoints/handlers/BUILD b/pkg/genericapiserver/endpoints/handlers/BUILD index d161b0c6ba..e7f8b2a0bc 100644 --- a/pkg/genericapiserver/endpoints/handlers/BUILD +++ b/pkg/genericapiserver/endpoints/handlers/BUILD @@ -46,7 +46,6 @@ go_library( "//pkg/genericapiserver/endpoints/handlers/responsewriters:go_default_library", "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/util:go_default_library", - "//pkg/util/httpstream:go_default_library", "//vendor:github.com/emicklei/go-restful", "//vendor:github.com/evanphx/json-patch", "//vendor:github.com/golang/glog", @@ -60,6 +59,7 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/runtime/serializer/streaming", "//vendor:k8s.io/apimachinery/pkg/types", + "//vendor:k8s.io/apimachinery/pkg/util/httpstream", "//vendor:k8s.io/apimachinery/pkg/util/net", "//vendor:k8s.io/apimachinery/pkg/util/runtime", "//vendor:k8s.io/apimachinery/pkg/util/strategicpatch", diff --git a/pkg/genericapiserver/endpoints/handlers/proxy.go b/pkg/genericapiserver/endpoints/handlers/proxy.go index b2eb1609c9..44bcb28b17 100644 --- a/pkg/genericapiserver/endpoints/handlers/proxy.go +++ b/pkg/genericapiserver/endpoints/handlers/proxy.go @@ -30,6 +30,7 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/util/httpstream" "k8s.io/apimachinery/pkg/util/net" "k8s.io/apiserver/pkg/endpoints/metrics" "k8s.io/apiserver/pkg/endpoints/request" @@ -37,7 +38,6 @@ import ( proxyutil "k8s.io/apiserver/pkg/util/proxy" "k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers/responsewriters" "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" - "k8s.io/kubernetes/pkg/util/httpstream" "github.com/golang/glog" ) diff --git a/pkg/genericapiserver/registry/generic/rest/BUILD b/pkg/genericapiserver/registry/generic/rest/BUILD index c330215938..046827c306 100644 --- a/pkg/genericapiserver/registry/generic/rest/BUILD +++ b/pkg/genericapiserver/registry/generic/rest/BUILD @@ -19,11 +19,11 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/genericapiserver/registry/rest:go_default_library", - "//pkg/util/httpstream:go_default_library", "//vendor:github.com/golang/glog", "//vendor:github.com/mxk/go-flowrate/flowrate", "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", + "//vendor:k8s.io/apimachinery/pkg/util/httpstream", "//vendor:k8s.io/apimachinery/pkg/util/net", "//vendor:k8s.io/apimachinery/pkg/util/runtime", "//vendor:k8s.io/apiserver/pkg/features", @@ -43,12 +43,12 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/util/httpstream:go_default_library", "//vendor:github.com/stretchr/testify/assert", "//vendor:github.com/stretchr/testify/require", "//vendor:golang.org/x/net/websocket", "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", + "//vendor:k8s.io/apimachinery/pkg/util/httpstream", "//vendor:k8s.io/apimachinery/pkg/util/net", "//vendor:k8s.io/apiserver/pkg/features", "//vendor:k8s.io/apiserver/pkg/util/feature", diff --git a/pkg/genericapiserver/registry/generic/rest/proxy.go b/pkg/genericapiserver/registry/generic/rest/proxy.go index 58e2911c25..b38e1468ef 100644 --- a/pkg/genericapiserver/registry/generic/rest/proxy.go +++ b/pkg/genericapiserver/registry/generic/rest/proxy.go @@ -30,12 +30,12 @@ import ( "time" "k8s.io/apimachinery/pkg/api/errors" + "k8s.io/apimachinery/pkg/util/httpstream" utilnet "k8s.io/apimachinery/pkg/util/net" utilruntime "k8s.io/apimachinery/pkg/util/runtime" genericfeatures "k8s.io/apiserver/pkg/features" utilfeature "k8s.io/apiserver/pkg/util/feature" "k8s.io/apiserver/pkg/util/proxy" - "k8s.io/kubernetes/pkg/util/httpstream" "github.com/golang/glog" "github.com/mxk/go-flowrate/flowrate" diff --git a/pkg/genericapiserver/registry/generic/rest/proxy_test.go b/pkg/genericapiserver/registry/generic/rest/proxy_test.go index f6c9f4bd17..6daaf55f30 100644 --- a/pkg/genericapiserver/registry/generic/rest/proxy_test.go +++ b/pkg/genericapiserver/registry/generic/rest/proxy_test.go @@ -41,11 +41,11 @@ import ( "golang.org/x/net/websocket" + "k8s.io/apimachinery/pkg/util/httpstream" utilnet "k8s.io/apimachinery/pkg/util/net" "k8s.io/apiserver/pkg/features" utilfeature "k8s.io/apiserver/pkg/util/feature" "k8s.io/apiserver/pkg/util/proxy" - "k8s.io/kubernetes/pkg/util/httpstream" ) const fakeStatusCode = 567 diff --git a/pkg/kubelet/server/BUILD b/pkg/kubelet/server/BUILD index cb9dcc3306..1a90c4fcd4 100644 --- a/pkg/kubelet/server/BUILD +++ b/pkg/kubelet/server/BUILD @@ -66,8 +66,6 @@ go_test( "//pkg/kubelet/container/testing:go_default_library", "//pkg/kubelet/server/remotecommand:go_default_library", "//pkg/kubelet/server/stats:go_default_library", - "//pkg/util/httpstream:go_default_library", - "//pkg/util/httpstream/spdy:go_default_library", "//pkg/util/term:go_default_library", "//pkg/volume:go_default_library", "//vendor:github.com/google/cadvisor/info/v1", @@ -77,6 +75,8 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/types", + "//vendor:k8s.io/apimachinery/pkg/util/httpstream", + "//vendor:k8s.io/apimachinery/pkg/util/httpstream/spdy", "//vendor:k8s.io/apimachinery/pkg/util/sets", "//vendor:k8s.io/apiserver/pkg/authentication/user", "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", diff --git a/pkg/kubelet/server/portforward/BUILD b/pkg/kubelet/server/portforward/BUILD index dea6efab18..ee1978fd59 100644 --- a/pkg/kubelet/server/portforward/BUILD +++ b/pkg/kubelet/server/portforward/BUILD @@ -17,10 +17,10 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/util/httpstream:go_default_library", - "//pkg/util/httpstream/spdy:go_default_library", "//vendor:github.com/golang/glog", "//vendor:k8s.io/apimachinery/pkg/types", + "//vendor:k8s.io/apimachinery/pkg/util/httpstream", + "//vendor:k8s.io/apimachinery/pkg/util/httpstream/spdy", "//vendor:k8s.io/apimachinery/pkg/util/runtime", ], ) @@ -32,7 +32,7 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/util/httpstream:go_default_library", + "//vendor:k8s.io/apimachinery/pkg/util/httpstream", ], ) diff --git a/pkg/kubelet/server/portforward/portforward.go b/pkg/kubelet/server/portforward/portforward.go index e7f6bea88f..2737752c36 100644 --- a/pkg/kubelet/server/portforward/portforward.go +++ b/pkg/kubelet/server/portforward/portforward.go @@ -28,10 +28,10 @@ import ( "github.com/golang/glog" "k8s.io/apimachinery/pkg/types" + "k8s.io/apimachinery/pkg/util/httpstream" + "k8s.io/apimachinery/pkg/util/httpstream/spdy" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/util/httpstream" - "k8s.io/kubernetes/pkg/util/httpstream/spdy" ) // PortForwarder knows how to forward content from a data stream to/from a port diff --git a/pkg/kubelet/server/portforward/portforward_test.go b/pkg/kubelet/server/portforward/portforward_test.go index cfaed56082..542ad71c1d 100644 --- a/pkg/kubelet/server/portforward/portforward_test.go +++ b/pkg/kubelet/server/portforward/portforward_test.go @@ -21,8 +21,8 @@ import ( "testing" "time" + "k8s.io/apimachinery/pkg/util/httpstream" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/util/httpstream" ) func TestPortForwardStreamReceived(t *testing.T) { diff --git a/pkg/kubelet/server/remotecommand/BUILD b/pkg/kubelet/server/remotecommand/BUILD index 062b1f4906..c27eb774ac 100644 --- a/pkg/kubelet/server/remotecommand/BUILD +++ b/pkg/kubelet/server/remotecommand/BUILD @@ -21,13 +21,13 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/util/exec:go_default_library", - "//pkg/util/httpstream:go_default_library", - "//pkg/util/httpstream/spdy:go_default_library", "//pkg/util/term:go_default_library", "//vendor:github.com/golang/glog", "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/types", + "//vendor:k8s.io/apimachinery/pkg/util/httpstream", + "//vendor:k8s.io/apimachinery/pkg/util/httpstream/spdy", "//vendor:k8s.io/apimachinery/pkg/util/runtime", "//vendor:k8s.io/apiserver/pkg/server/httplog", "//vendor:k8s.io/apiserver/pkg/util/wsstream", diff --git a/pkg/kubelet/server/remotecommand/httpstream.go b/pkg/kubelet/server/remotecommand/httpstream.go index 8393edc445..49f6a08c58 100644 --- a/pkg/kubelet/server/remotecommand/httpstream.go +++ b/pkg/kubelet/server/remotecommand/httpstream.go @@ -26,11 +26,11 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" 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/runtime" "k8s.io/apiserver/pkg/util/wsstream" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/util/httpstream" - "k8s.io/kubernetes/pkg/util/httpstream/spdy" "k8s.io/kubernetes/pkg/util/term" "github.com/golang/glog" diff --git a/pkg/kubelet/server/server_test.go b/pkg/kubelet/server/server_test.go index a4d271861c..053cae4893 100644 --- a/pkg/kubelet/server/server_test.go +++ b/pkg/kubelet/server/server_test.go @@ -41,6 +41,8 @@ import ( apierrs "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + "k8s.io/apimachinery/pkg/util/httpstream" + "k8s.io/apimachinery/pkg/util/httpstream/spdy" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apiserver/pkg/authentication/user" "k8s.io/apiserver/pkg/authorization/authorizer" @@ -52,8 +54,6 @@ import ( kubecontainertesting "k8s.io/kubernetes/pkg/kubelet/container/testing" "k8s.io/kubernetes/pkg/kubelet/server/remotecommand" "k8s.io/kubernetes/pkg/kubelet/server/stats" - "k8s.io/kubernetes/pkg/util/httpstream" - "k8s.io/kubernetes/pkg/util/httpstream/spdy" "k8s.io/kubernetes/pkg/util/term" "k8s.io/kubernetes/pkg/volume" ) diff --git a/pkg/util/BUILD b/pkg/util/BUILD index 3f2f544c95..3418ef6f41 100644 --- a/pkg/util/BUILD +++ b/pkg/util/BUILD @@ -62,7 +62,6 @@ filegroup( "//pkg/util/framer:all-srcs", "//pkg/util/goroutinemap:all-srcs", "//pkg/util/hash:all-srcs", - "//pkg/util/httpstream:all-srcs", "//pkg/util/i18n:all-srcs", "//pkg/util/initsystem:all-srcs", "//pkg/util/interrupt:all-srcs", diff --git a/pkg/util/httpstream/BUILD b/pkg/util/httpstream/BUILD deleted file mode 100644 index bad58a9228..0000000000 --- a/pkg/util/httpstream/BUILD +++ /dev/null @@ -1,42 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", - "go_test", -) - -go_library( - name = "go_default_library", - srcs = [ - "doc.go", - "httpstream.go", - ], - tags = ["automanaged"], -) - -go_test( - name = "go_default_test", - srcs = ["httpstream_test.go"], - library = ":go_default_library", - tags = ["automanaged"], - deps = ["//pkg/api:go_default_library"], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [ - ":package-srcs", - "//pkg/util/httpstream/spdy:all-srcs", - ], - tags = ["automanaged"], -) diff --git a/pkg/util/httpstream/spdy/BUILD b/pkg/util/httpstream/spdy/BUILD deleted file mode 100644 index 695033053a..0000000000 --- a/pkg/util/httpstream/spdy/BUILD +++ /dev/null @@ -1,57 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", - "go_test", -) - -go_library( - name = "go_default_library", - srcs = [ - "connection.go", - "roundtripper.go", - "upgrade.go", - ], - tags = ["automanaged"], - deps = [ - "//pkg/api:go_default_library", - "//pkg/util/httpstream:go_default_library", - "//vendor:github.com/docker/spdystream", - "//vendor:github.com/golang/glog", - "//vendor:k8s.io/apimachinery/pkg/api/errors", - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/util/runtime", - "//vendor:k8s.io/apimachinery/third_party/forked/golang/netutil", - ], -) - -go_test( - name = "go_default_test", - srcs = [ - "connection_test.go", - "roundtripper_test.go", - "upgrade_test.go", - ], - library = ":go_default_library", - tags = ["automanaged"], - deps = [ - "//pkg/util/httpstream:go_default_library", - "//vendor:github.com/elazarl/goproxy", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], -) diff --git a/pkg/util/httpstream/doc.go b/staging/src/k8s.io/apimachinery/pkg/util/httpstream/doc.go similarity index 90% rename from pkg/util/httpstream/doc.go rename to staging/src/k8s.io/apimachinery/pkg/util/httpstream/doc.go index 5e4f4fa3d3..5893df5bd2 100644 --- a/pkg/util/httpstream/doc.go +++ b/staging/src/k8s.io/apimachinery/pkg/util/httpstream/doc.go @@ -16,4 +16,4 @@ limitations under the License. // Package httpstream adds multiplexed streaming support to HTTP requests and // responses via connection upgrades. -package httpstream // import "k8s.io/kubernetes/pkg/util/httpstream" +package httpstream // import "k8s.io/apimachinery/pkg/util/httpstream" diff --git a/pkg/util/httpstream/httpstream.go b/staging/src/k8s.io/apimachinery/pkg/util/httpstream/httpstream.go similarity index 100% rename from pkg/util/httpstream/httpstream.go rename to staging/src/k8s.io/apimachinery/pkg/util/httpstream/httpstream.go diff --git a/pkg/util/httpstream/httpstream_test.go b/staging/src/k8s.io/apimachinery/pkg/util/httpstream/httpstream_test.go similarity index 100% rename from pkg/util/httpstream/httpstream_test.go rename to staging/src/k8s.io/apimachinery/pkg/util/httpstream/httpstream_test.go diff --git a/pkg/util/httpstream/spdy/connection.go b/staging/src/k8s.io/apimachinery/pkg/util/httpstream/spdy/connection.go similarity index 99% rename from pkg/util/httpstream/spdy/connection.go rename to staging/src/k8s.io/apimachinery/pkg/util/httpstream/spdy/connection.go index da63a02982..3dc8e23ae1 100644 --- a/pkg/util/httpstream/spdy/connection.go +++ b/staging/src/k8s.io/apimachinery/pkg/util/httpstream/spdy/connection.go @@ -24,7 +24,7 @@ import ( "github.com/docker/spdystream" "github.com/golang/glog" - "k8s.io/kubernetes/pkg/util/httpstream" + "k8s.io/apimachinery/pkg/util/httpstream" ) // connection maintains state about a spdystream.Connection and its associated diff --git a/pkg/util/httpstream/spdy/connection_test.go b/staging/src/k8s.io/apimachinery/pkg/util/httpstream/spdy/connection_test.go similarity index 98% rename from pkg/util/httpstream/spdy/connection_test.go rename to staging/src/k8s.io/apimachinery/pkg/util/httpstream/spdy/connection_test.go index a73fd1329f..f94e2b3ba4 100644 --- a/pkg/util/httpstream/spdy/connection_test.go +++ b/staging/src/k8s.io/apimachinery/pkg/util/httpstream/spdy/connection_test.go @@ -24,7 +24,7 @@ import ( "testing" "time" - "k8s.io/kubernetes/pkg/util/httpstream" + "k8s.io/apimachinery/pkg/util/httpstream" ) func runProxy(t *testing.T, backendUrl string, proxyUrl chan<- string, proxyDone chan<- struct{}) { diff --git a/pkg/util/httpstream/spdy/roundtripper.go b/staging/src/k8s.io/apimachinery/pkg/util/httpstream/spdy/roundtripper.go similarity index 99% rename from pkg/util/httpstream/spdy/roundtripper.go rename to staging/src/k8s.io/apimachinery/pkg/util/httpstream/spdy/roundtripper.go index c0c8f44f0a..8678d33553 100644 --- a/pkg/util/httpstream/spdy/roundtripper.go +++ b/staging/src/k8s.io/apimachinery/pkg/util/httpstream/spdy/roundtripper.go @@ -30,9 +30,9 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/util/httpstream" "k8s.io/apimachinery/third_party/forked/golang/netutil" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/util/httpstream" ) // SpdyRoundTripper knows how to upgrade an HTTP request to one that supports diff --git a/pkg/util/httpstream/spdy/roundtripper_test.go b/staging/src/k8s.io/apimachinery/pkg/util/httpstream/spdy/roundtripper_test.go similarity index 99% rename from pkg/util/httpstream/spdy/roundtripper_test.go rename to staging/src/k8s.io/apimachinery/pkg/util/httpstream/spdy/roundtripper_test.go index 4a5262ec64..95c36b46b8 100644 --- a/pkg/util/httpstream/spdy/roundtripper_test.go +++ b/staging/src/k8s.io/apimachinery/pkg/util/httpstream/spdy/roundtripper_test.go @@ -27,7 +27,7 @@ import ( "testing" "github.com/elazarl/goproxy" - "k8s.io/kubernetes/pkg/util/httpstream" + "k8s.io/apimachinery/pkg/util/httpstream" ) // be sure to unset environment variable https_proxy (if exported) before testing, otherwise the testing will fail unexpectedly. diff --git a/pkg/util/httpstream/spdy/upgrade.go b/staging/src/k8s.io/apimachinery/pkg/util/httpstream/spdy/upgrade.go similarity index 98% rename from pkg/util/httpstream/spdy/upgrade.go rename to staging/src/k8s.io/apimachinery/pkg/util/httpstream/spdy/upgrade.go index 1fe7ab69bc..2f2ef259a6 100644 --- a/pkg/util/httpstream/spdy/upgrade.go +++ b/staging/src/k8s.io/apimachinery/pkg/util/httpstream/spdy/upgrade.go @@ -22,7 +22,7 @@ import ( "strings" "k8s.io/apimachinery/pkg/util/runtime" - "k8s.io/kubernetes/pkg/util/httpstream" + "k8s.io/apimachinery/pkg/util/httpstream" ) const HeaderSpdy31 = "SPDY/3.1" diff --git a/pkg/util/httpstream/spdy/upgrade_test.go b/staging/src/k8s.io/apimachinery/pkg/util/httpstream/spdy/upgrade_test.go similarity index 100% rename from pkg/util/httpstream/spdy/upgrade_test.go rename to staging/src/k8s.io/apimachinery/pkg/util/httpstream/spdy/upgrade_test.go diff --git a/vendor/BUILD b/vendor/BUILD index e91e09132f..22148148a3 100644 --- a/vendor/BUILD +++ b/vendor/BUILD @@ -13821,3 +13821,55 @@ go_library( tags = ["automanaged"], deps = ["//vendor:k8s.io/apimachinery/pkg/runtime"], ) + +go_test( + name = "k8s.io/apimachinery/pkg/util/httpstream_test", + srcs = ["k8s.io/apimachinery/pkg/util/httpstream/httpstream_test.go"], + library = ":k8s.io/apimachinery/pkg/util/httpstream", + tags = ["automanaged"], + deps = ["//pkg/api:go_default_library"], +) + +go_library( + name = "k8s.io/apimachinery/pkg/util/httpstream", + srcs = [ + "k8s.io/apimachinery/pkg/util/httpstream/doc.go", + "k8s.io/apimachinery/pkg/util/httpstream/httpstream.go", + ], + tags = ["automanaged"], +) + +go_test( + name = "k8s.io/apimachinery/pkg/util/httpstream/spdy_test", + srcs = [ + "k8s.io/apimachinery/pkg/util/httpstream/spdy/connection_test.go", + "k8s.io/apimachinery/pkg/util/httpstream/spdy/roundtripper_test.go", + "k8s.io/apimachinery/pkg/util/httpstream/spdy/upgrade_test.go", + ], + library = ":k8s.io/apimachinery/pkg/util/httpstream/spdy", + tags = ["automanaged"], + deps = [ + "//vendor:github.com/elazarl/goproxy", + "//vendor:k8s.io/apimachinery/pkg/util/httpstream", + ], +) + +go_library( + name = "k8s.io/apimachinery/pkg/util/httpstream/spdy", + srcs = [ + "k8s.io/apimachinery/pkg/util/httpstream/spdy/connection.go", + "k8s.io/apimachinery/pkg/util/httpstream/spdy/roundtripper.go", + "k8s.io/apimachinery/pkg/util/httpstream/spdy/upgrade.go", + ], + tags = ["automanaged"], + deps = [ + "//pkg/api:go_default_library", + "//vendor:github.com/docker/spdystream", + "//vendor:github.com/golang/glog", + "//vendor:k8s.io/apimachinery/pkg/api/errors", + "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/util/httpstream", + "//vendor:k8s.io/apimachinery/pkg/util/runtime", + "//vendor:k8s.io/apimachinery/third_party/forked/golang/netutil", + ], +)