From 56929269141ee131c44a6cf820d25afd07b9ceb1 Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Tue, 28 Apr 2020 06:42:54 -0400 Subject: [PATCH] Move packages for slightly better UX for consumers Signed-off-by: Davanum Srinivas --- cmd/kubemark/hollow-node.go | 4 ++-- pkg/client/tests/portfoward_test.go | 2 +- pkg/client/tests/remotecommand_test.go | 2 +- pkg/kubelet/{ => cri}/remote/BUILD | 0 pkg/kubelet/{ => cri}/remote/OWNERS | 0 pkg/kubelet/{ => cri}/remote/doc.go | 0 pkg/kubelet/{ => cri}/remote/fake/BUILD | 0 pkg/kubelet/{ => cri}/remote/fake/doc.go | 0 pkg/kubelet/{ => cri}/remote/fake/endpoint.go | 0 pkg/kubelet/{ => cri}/remote/fake/endpoint_windows.go | 0 pkg/kubelet/{ => cri}/remote/fake/fake_image_service.go | 0 pkg/kubelet/{ => cri}/remote/fake/fake_runtime.go | 0 pkg/kubelet/{ => cri}/remote/remote_image.go | 0 pkg/kubelet/{ => cri}/remote/remote_runtime.go | 2 +- pkg/kubelet/{ => cri}/remote/remote_runtime_test.go | 2 +- pkg/kubelet/{ => cri}/remote/utils.go | 0 pkg/kubelet/{server => cri}/streaming/.import-restrictions | 0 pkg/kubelet/{server => cri}/streaming/BUILD | 0 pkg/kubelet/{server => cri}/streaming/errors.go | 0 .../streaming}/portforward/.import-restrictions | 0 pkg/kubelet/{server => cri/streaming}/portforward/BUILD | 0 .../{server => cri/streaming}/portforward/constants.go | 0 .../{server => cri/streaming}/portforward/httpstream.go | 0 .../streaming}/portforward/httpstream_test.go | 0 .../{server => cri/streaming}/portforward/portforward.go | 0 .../{server => cri/streaming}/portforward/websocket.go | 0 .../{server => cri/streaming}/portforward/websocket_test.go | 0 .../streaming}/remotecommand/.import-restrictions | 0 pkg/kubelet/{server => cri/streaming}/remotecommand/BUILD | 0 .../{server => cri/streaming}/remotecommand/attach.go | 0 pkg/kubelet/{server => cri/streaming}/remotecommand/doc.go | 2 +- pkg/kubelet/{server => cri/streaming}/remotecommand/exec.go | 0 .../{server => cri/streaming}/remotecommand/httpstream.go | 0 .../{server => cri/streaming}/remotecommand/websocket.go | 0 pkg/kubelet/{server => cri}/streaming/request_cache.go | 0 pkg/kubelet/{server => cri}/streaming/request_cache_test.go | 0 pkg/kubelet/{server => cri}/streaming/server.go | 4 ++-- pkg/kubelet/{server => cri}/streaming/server_test.go | 2 +- pkg/kubelet/dockershim/docker_service.go | 2 +- pkg/kubelet/dockershim/docker_streaming.go | 2 +- pkg/kubelet/kubelet.go | 4 ++-- pkg/kubelet/kubelet_pods.go | 4 ++-- pkg/kubelet/kubelet_pods_test.go | 4 ++-- pkg/kubelet/kuberuntime/fake_kuberuntime_manager.go | 2 +- pkg/kubelet/kuberuntime/kuberuntime_manager.go | 2 +- pkg/kubelet/server/server.go | 6 +++--- pkg/kubelet/server/server_test.go | 6 +++--- pkg/kubelet/server/server_websocket_test.go | 2 +- .../src/k8s.io/component-base/logs}/logreduction/BUILD | 0 .../component-base/logs}/logreduction/logreduction.go | 0 .../component-base/logs}/logreduction/logreduction_test.go | 0 test/e2e_node/util.go | 2 +- 52 files changed, 28 insertions(+), 28 deletions(-) rename pkg/kubelet/{ => cri}/remote/BUILD (100%) rename pkg/kubelet/{ => cri}/remote/OWNERS (100%) rename pkg/kubelet/{ => cri}/remote/doc.go (100%) rename pkg/kubelet/{ => cri}/remote/fake/BUILD (100%) rename pkg/kubelet/{ => cri}/remote/fake/doc.go (100%) rename pkg/kubelet/{ => cri}/remote/fake/endpoint.go (100%) rename pkg/kubelet/{ => cri}/remote/fake/endpoint_windows.go (100%) rename pkg/kubelet/{ => cri}/remote/fake/fake_image_service.go (100%) rename pkg/kubelet/{ => cri}/remote/fake/fake_runtime.go (100%) rename pkg/kubelet/{ => cri}/remote/remote_image.go (100%) rename pkg/kubelet/{ => cri}/remote/remote_runtime.go (99%) rename pkg/kubelet/{ => cri}/remote/remote_runtime_test.go (96%) rename pkg/kubelet/{ => cri}/remote/utils.go (100%) rename pkg/kubelet/{server => cri}/streaming/.import-restrictions (100%) rename pkg/kubelet/{server => cri}/streaming/BUILD (100%) rename pkg/kubelet/{server => cri}/streaming/errors.go (100%) rename pkg/kubelet/{server => cri/streaming}/portforward/.import-restrictions (100%) rename pkg/kubelet/{server => cri/streaming}/portforward/BUILD (100%) rename pkg/kubelet/{server => cri/streaming}/portforward/constants.go (100%) rename pkg/kubelet/{server => cri/streaming}/portforward/httpstream.go (100%) rename pkg/kubelet/{server => cri/streaming}/portforward/httpstream_test.go (100%) rename pkg/kubelet/{server => cri/streaming}/portforward/portforward.go (100%) rename pkg/kubelet/{server => cri/streaming}/portforward/websocket.go (100%) rename pkg/kubelet/{server => cri/streaming}/portforward/websocket_test.go (100%) rename pkg/kubelet/{server => cri/streaming}/remotecommand/.import-restrictions (100%) rename pkg/kubelet/{server => cri/streaming}/remotecommand/BUILD (100%) rename pkg/kubelet/{server => cri/streaming}/remotecommand/attach.go (100%) rename pkg/kubelet/{server => cri/streaming}/remotecommand/doc.go (88%) rename pkg/kubelet/{server => cri/streaming}/remotecommand/exec.go (100%) rename pkg/kubelet/{server => cri/streaming}/remotecommand/httpstream.go (100%) rename pkg/kubelet/{server => cri/streaming}/remotecommand/websocket.go (100%) rename pkg/kubelet/{server => cri}/streaming/request_cache.go (100%) rename pkg/kubelet/{server => cri}/streaming/request_cache_test.go (100%) rename pkg/kubelet/{server => cri}/streaming/server.go (98%) rename pkg/kubelet/{server => cri}/streaming/server_test.go (99%) rename {pkg/kubelet/util => staging/src/k8s.io/component-base/logs}/logreduction/BUILD (100%) rename {pkg/kubelet/util => staging/src/k8s.io/component-base/logs}/logreduction/logreduction.go (100%) rename {pkg/kubelet/util => staging/src/k8s.io/component-base/logs}/logreduction/logreduction_test.go (100%) diff --git a/cmd/kubemark/hollow-node.go b/cmd/kubemark/hollow-node.go index b2e4bf60b4a..d5a240a7f9f 100644 --- a/cmd/kubemark/hollow-node.go +++ b/cmd/kubemark/hollow-node.go @@ -43,8 +43,8 @@ import ( "k8s.io/kubernetes/pkg/api/legacyscheme" cadvisortest "k8s.io/kubernetes/pkg/kubelet/cadvisor/testing" "k8s.io/kubernetes/pkg/kubelet/cm" - "k8s.io/kubernetes/pkg/kubelet/remote" - fakeremote "k8s.io/kubernetes/pkg/kubelet/remote/fake" + "k8s.io/kubernetes/pkg/kubelet/cri/remote" + fakeremote "k8s.io/kubernetes/pkg/kubelet/cri/remote/fake" "k8s.io/kubernetes/pkg/kubemark" "k8s.io/kubernetes/pkg/master/ports" fakeiptables "k8s.io/kubernetes/pkg/util/iptables/testing" diff --git a/pkg/client/tests/portfoward_test.go b/pkg/client/tests/portfoward_test.go index b77cea11a0d..adcbc400785 100644 --- a/pkg/client/tests/portfoward_test.go +++ b/pkg/client/tests/portfoward_test.go @@ -34,7 +34,7 @@ import ( restclient "k8s.io/client-go/rest" . "k8s.io/client-go/tools/portforward" "k8s.io/client-go/transport/spdy" - "k8s.io/kubernetes/pkg/kubelet/server/portforward" + "k8s.io/kubernetes/pkg/kubelet/cri/streaming/portforward" ) // fakePortForwarder simulates port forwarding for testing. It implements diff --git a/pkg/client/tests/remotecommand_test.go b/pkg/client/tests/remotecommand_test.go index f5b29153483..7c6a1124029 100644 --- a/pkg/client/tests/remotecommand_test.go +++ b/pkg/client/tests/remotecommand_test.go @@ -41,7 +41,7 @@ import ( "k8s.io/client-go/transport/spdy" "k8s.io/kubernetes/pkg/api/legacyscheme" api "k8s.io/kubernetes/pkg/apis/core" - "k8s.io/kubernetes/pkg/kubelet/server/remotecommand" + "k8s.io/kubernetes/pkg/kubelet/cri/streaming/remotecommand" ) type fakeExecutor struct { diff --git a/pkg/kubelet/remote/BUILD b/pkg/kubelet/cri/remote/BUILD similarity index 100% rename from pkg/kubelet/remote/BUILD rename to pkg/kubelet/cri/remote/BUILD diff --git a/pkg/kubelet/remote/OWNERS b/pkg/kubelet/cri/remote/OWNERS similarity index 100% rename from pkg/kubelet/remote/OWNERS rename to pkg/kubelet/cri/remote/OWNERS diff --git a/pkg/kubelet/remote/doc.go b/pkg/kubelet/cri/remote/doc.go similarity index 100% rename from pkg/kubelet/remote/doc.go rename to pkg/kubelet/cri/remote/doc.go diff --git a/pkg/kubelet/remote/fake/BUILD b/pkg/kubelet/cri/remote/fake/BUILD similarity index 100% rename from pkg/kubelet/remote/fake/BUILD rename to pkg/kubelet/cri/remote/fake/BUILD diff --git a/pkg/kubelet/remote/fake/doc.go b/pkg/kubelet/cri/remote/fake/doc.go similarity index 100% rename from pkg/kubelet/remote/fake/doc.go rename to pkg/kubelet/cri/remote/fake/doc.go diff --git a/pkg/kubelet/remote/fake/endpoint.go b/pkg/kubelet/cri/remote/fake/endpoint.go similarity index 100% rename from pkg/kubelet/remote/fake/endpoint.go rename to pkg/kubelet/cri/remote/fake/endpoint.go diff --git a/pkg/kubelet/remote/fake/endpoint_windows.go b/pkg/kubelet/cri/remote/fake/endpoint_windows.go similarity index 100% rename from pkg/kubelet/remote/fake/endpoint_windows.go rename to pkg/kubelet/cri/remote/fake/endpoint_windows.go diff --git a/pkg/kubelet/remote/fake/fake_image_service.go b/pkg/kubelet/cri/remote/fake/fake_image_service.go similarity index 100% rename from pkg/kubelet/remote/fake/fake_image_service.go rename to pkg/kubelet/cri/remote/fake/fake_image_service.go diff --git a/pkg/kubelet/remote/fake/fake_runtime.go b/pkg/kubelet/cri/remote/fake/fake_runtime.go similarity index 100% rename from pkg/kubelet/remote/fake/fake_runtime.go rename to pkg/kubelet/cri/remote/fake/fake_runtime.go diff --git a/pkg/kubelet/remote/remote_image.go b/pkg/kubelet/cri/remote/remote_image.go similarity index 100% rename from pkg/kubelet/remote/remote_image.go rename to pkg/kubelet/cri/remote/remote_image.go diff --git a/pkg/kubelet/remote/remote_runtime.go b/pkg/kubelet/cri/remote/remote_runtime.go similarity index 99% rename from pkg/kubelet/remote/remote_runtime.go rename to pkg/kubelet/cri/remote/remote_runtime.go index d10f7270a03..a6596b0f719 100644 --- a/pkg/kubelet/remote/remote_runtime.go +++ b/pkg/kubelet/cri/remote/remote_runtime.go @@ -26,10 +26,10 @@ import ( "google.golang.org/grpc" "k8s.io/klog/v2" + "k8s.io/component-base/logs/logreduction" internalapi "k8s.io/cri-api/pkg/apis" runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1alpha2" "k8s.io/kubernetes/pkg/kubelet/util" - "k8s.io/kubernetes/pkg/kubelet/util/logreduction" utilexec "k8s.io/utils/exec" ) diff --git a/pkg/kubelet/remote/remote_runtime_test.go b/pkg/kubelet/cri/remote/remote_runtime_test.go similarity index 96% rename from pkg/kubelet/remote/remote_runtime_test.go rename to pkg/kubelet/cri/remote/remote_runtime_test.go index 134833b14c0..8bf8e6f4847 100644 --- a/pkg/kubelet/remote/remote_runtime_test.go +++ b/pkg/kubelet/cri/remote/remote_runtime_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/require" internalapi "k8s.io/cri-api/pkg/apis" apitest "k8s.io/cri-api/pkg/apis/testing" - fakeremote "k8s.io/kubernetes/pkg/kubelet/remote/fake" + fakeremote "k8s.io/kubernetes/pkg/kubelet/cri/remote/fake" ) const ( diff --git a/pkg/kubelet/remote/utils.go b/pkg/kubelet/cri/remote/utils.go similarity index 100% rename from pkg/kubelet/remote/utils.go rename to pkg/kubelet/cri/remote/utils.go diff --git a/pkg/kubelet/server/streaming/.import-restrictions b/pkg/kubelet/cri/streaming/.import-restrictions similarity index 100% rename from pkg/kubelet/server/streaming/.import-restrictions rename to pkg/kubelet/cri/streaming/.import-restrictions diff --git a/pkg/kubelet/server/streaming/BUILD b/pkg/kubelet/cri/streaming/BUILD similarity index 100% rename from pkg/kubelet/server/streaming/BUILD rename to pkg/kubelet/cri/streaming/BUILD diff --git a/pkg/kubelet/server/streaming/errors.go b/pkg/kubelet/cri/streaming/errors.go similarity index 100% rename from pkg/kubelet/server/streaming/errors.go rename to pkg/kubelet/cri/streaming/errors.go diff --git a/pkg/kubelet/server/portforward/.import-restrictions b/pkg/kubelet/cri/streaming/portforward/.import-restrictions similarity index 100% rename from pkg/kubelet/server/portforward/.import-restrictions rename to pkg/kubelet/cri/streaming/portforward/.import-restrictions diff --git a/pkg/kubelet/server/portforward/BUILD b/pkg/kubelet/cri/streaming/portforward/BUILD similarity index 100% rename from pkg/kubelet/server/portforward/BUILD rename to pkg/kubelet/cri/streaming/portforward/BUILD diff --git a/pkg/kubelet/server/portforward/constants.go b/pkg/kubelet/cri/streaming/portforward/constants.go similarity index 100% rename from pkg/kubelet/server/portforward/constants.go rename to pkg/kubelet/cri/streaming/portforward/constants.go diff --git a/pkg/kubelet/server/portforward/httpstream.go b/pkg/kubelet/cri/streaming/portforward/httpstream.go similarity index 100% rename from pkg/kubelet/server/portforward/httpstream.go rename to pkg/kubelet/cri/streaming/portforward/httpstream.go diff --git a/pkg/kubelet/server/portforward/httpstream_test.go b/pkg/kubelet/cri/streaming/portforward/httpstream_test.go similarity index 100% rename from pkg/kubelet/server/portforward/httpstream_test.go rename to pkg/kubelet/cri/streaming/portforward/httpstream_test.go diff --git a/pkg/kubelet/server/portforward/portforward.go b/pkg/kubelet/cri/streaming/portforward/portforward.go similarity index 100% rename from pkg/kubelet/server/portforward/portforward.go rename to pkg/kubelet/cri/streaming/portforward/portforward.go diff --git a/pkg/kubelet/server/portforward/websocket.go b/pkg/kubelet/cri/streaming/portforward/websocket.go similarity index 100% rename from pkg/kubelet/server/portforward/websocket.go rename to pkg/kubelet/cri/streaming/portforward/websocket.go diff --git a/pkg/kubelet/server/portforward/websocket_test.go b/pkg/kubelet/cri/streaming/portforward/websocket_test.go similarity index 100% rename from pkg/kubelet/server/portforward/websocket_test.go rename to pkg/kubelet/cri/streaming/portforward/websocket_test.go diff --git a/pkg/kubelet/server/remotecommand/.import-restrictions b/pkg/kubelet/cri/streaming/remotecommand/.import-restrictions similarity index 100% rename from pkg/kubelet/server/remotecommand/.import-restrictions rename to pkg/kubelet/cri/streaming/remotecommand/.import-restrictions diff --git a/pkg/kubelet/server/remotecommand/BUILD b/pkg/kubelet/cri/streaming/remotecommand/BUILD similarity index 100% rename from pkg/kubelet/server/remotecommand/BUILD rename to pkg/kubelet/cri/streaming/remotecommand/BUILD diff --git a/pkg/kubelet/server/remotecommand/attach.go b/pkg/kubelet/cri/streaming/remotecommand/attach.go similarity index 100% rename from pkg/kubelet/server/remotecommand/attach.go rename to pkg/kubelet/cri/streaming/remotecommand/attach.go diff --git a/pkg/kubelet/server/remotecommand/doc.go b/pkg/kubelet/cri/streaming/remotecommand/doc.go similarity index 88% rename from pkg/kubelet/server/remotecommand/doc.go rename to pkg/kubelet/cri/streaming/remotecommand/doc.go index a78404cb8bb..bf0d010b91e 100644 --- a/pkg/kubelet/server/remotecommand/doc.go +++ b/pkg/kubelet/cri/streaming/remotecommand/doc.go @@ -15,4 +15,4 @@ limitations under the License. */ // Package remotecommand contains functions related to executing commands in and attaching to pods. -package remotecommand // import "k8s.io/kubernetes/pkg/kubelet/server/remotecommand" +package remotecommand diff --git a/pkg/kubelet/server/remotecommand/exec.go b/pkg/kubelet/cri/streaming/remotecommand/exec.go similarity index 100% rename from pkg/kubelet/server/remotecommand/exec.go rename to pkg/kubelet/cri/streaming/remotecommand/exec.go diff --git a/pkg/kubelet/server/remotecommand/httpstream.go b/pkg/kubelet/cri/streaming/remotecommand/httpstream.go similarity index 100% rename from pkg/kubelet/server/remotecommand/httpstream.go rename to pkg/kubelet/cri/streaming/remotecommand/httpstream.go diff --git a/pkg/kubelet/server/remotecommand/websocket.go b/pkg/kubelet/cri/streaming/remotecommand/websocket.go similarity index 100% rename from pkg/kubelet/server/remotecommand/websocket.go rename to pkg/kubelet/cri/streaming/remotecommand/websocket.go diff --git a/pkg/kubelet/server/streaming/request_cache.go b/pkg/kubelet/cri/streaming/request_cache.go similarity index 100% rename from pkg/kubelet/server/streaming/request_cache.go rename to pkg/kubelet/cri/streaming/request_cache.go diff --git a/pkg/kubelet/server/streaming/request_cache_test.go b/pkg/kubelet/cri/streaming/request_cache_test.go similarity index 100% rename from pkg/kubelet/server/streaming/request_cache_test.go rename to pkg/kubelet/cri/streaming/request_cache_test.go diff --git a/pkg/kubelet/server/streaming/server.go b/pkg/kubelet/cri/streaming/server.go similarity index 98% rename from pkg/kubelet/server/streaming/server.go rename to pkg/kubelet/cri/streaming/server.go index 8551f7ee9a1..d5cacbbf7ee 100644 --- a/pkg/kubelet/server/streaming/server.go +++ b/pkg/kubelet/cri/streaming/server.go @@ -35,8 +35,8 @@ import ( remotecommandconsts "k8s.io/apimachinery/pkg/util/remotecommand" "k8s.io/client-go/tools/remotecommand" runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1alpha2" - "k8s.io/kubernetes/pkg/kubelet/server/portforward" - remotecommandserver "k8s.io/kubernetes/pkg/kubelet/server/remotecommand" + "k8s.io/kubernetes/pkg/kubelet/cri/streaming/portforward" + remotecommandserver "k8s.io/kubernetes/pkg/kubelet/cri/streaming/remotecommand" ) // Server is the library interface to serve the stream requests. diff --git a/pkg/kubelet/server/streaming/server_test.go b/pkg/kubelet/cri/streaming/server_test.go similarity index 99% rename from pkg/kubelet/server/streaming/server_test.go rename to pkg/kubelet/cri/streaming/server_test.go index 80b3f2a90fe..0ce3f50feb5 100644 --- a/pkg/kubelet/server/streaming/server_test.go +++ b/pkg/kubelet/cri/streaming/server_test.go @@ -35,7 +35,7 @@ import ( "k8s.io/client-go/tools/remotecommand" "k8s.io/client-go/transport/spdy" runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1alpha2" - kubeletportforward "k8s.io/kubernetes/pkg/kubelet/server/portforward" + kubeletportforward "k8s.io/kubernetes/pkg/kubelet/cri/streaming/portforward" ) const ( diff --git a/pkg/kubelet/dockershim/docker_service.go b/pkg/kubelet/dockershim/docker_service.go index 0dd969c5594..d9665698cc3 100644 --- a/pkg/kubelet/dockershim/docker_service.go +++ b/pkg/kubelet/dockershim/docker_service.go @@ -37,13 +37,13 @@ import ( "k8s.io/kubernetes/pkg/kubelet/checkpointmanager" "k8s.io/kubernetes/pkg/kubelet/checkpointmanager/errors" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" + "k8s.io/kubernetes/pkg/kubelet/cri/streaming" "k8s.io/kubernetes/pkg/kubelet/dockershim/cm" "k8s.io/kubernetes/pkg/kubelet/dockershim/network" "k8s.io/kubernetes/pkg/kubelet/dockershim/network/cni" "k8s.io/kubernetes/pkg/kubelet/dockershim/network/hostport" "k8s.io/kubernetes/pkg/kubelet/dockershim/network/kubenet" "k8s.io/kubernetes/pkg/kubelet/legacy" - "k8s.io/kubernetes/pkg/kubelet/server/streaming" "k8s.io/kubernetes/pkg/kubelet/util/cache" "k8s.io/kubernetes/pkg/kubelet/dockershim/libdocker" diff --git a/pkg/kubelet/dockershim/docker_streaming.go b/pkg/kubelet/dockershim/docker_streaming.go index f1394ba5c27..91e194570eb 100644 --- a/pkg/kubelet/dockershim/docker_streaming.go +++ b/pkg/kubelet/dockershim/docker_streaming.go @@ -30,7 +30,7 @@ import ( "k8s.io/client-go/tools/remotecommand" runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1alpha2" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" - "k8s.io/kubernetes/pkg/kubelet/server/streaming" + "k8s.io/kubernetes/pkg/kubelet/cri/streaming" "k8s.io/kubernetes/pkg/kubelet/util/ioutils" utilexec "k8s.io/utils/exec" diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go index 9cda9bb397a..9315f4915fb 100644 --- a/pkg/kubelet/kubelet.go +++ b/pkg/kubelet/kubelet.go @@ -70,6 +70,8 @@ import ( "k8s.io/kubernetes/pkg/kubelet/config" "k8s.io/kubernetes/pkg/kubelet/configmap" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" + "k8s.io/kubernetes/pkg/kubelet/cri/remote" + "k8s.io/kubernetes/pkg/kubelet/cri/streaming" "k8s.io/kubernetes/pkg/kubelet/events" "k8s.io/kubernetes/pkg/kubelet/eviction" "k8s.io/kubernetes/pkg/kubelet/images" @@ -90,13 +92,11 @@ import ( "k8s.io/kubernetes/pkg/kubelet/preemption" "k8s.io/kubernetes/pkg/kubelet/prober" proberesults "k8s.io/kubernetes/pkg/kubelet/prober/results" - "k8s.io/kubernetes/pkg/kubelet/remote" "k8s.io/kubernetes/pkg/kubelet/runtimeclass" "k8s.io/kubernetes/pkg/kubelet/secret" "k8s.io/kubernetes/pkg/kubelet/server" servermetrics "k8s.io/kubernetes/pkg/kubelet/server/metrics" serverstats "k8s.io/kubernetes/pkg/kubelet/server/stats" - "k8s.io/kubernetes/pkg/kubelet/server/streaming" "k8s.io/kubernetes/pkg/kubelet/stats" "k8s.io/kubernetes/pkg/kubelet/status" "k8s.io/kubernetes/pkg/kubelet/sysctl" diff --git a/pkg/kubelet/kubelet_pods.go b/pkg/kubelet/kubelet_pods.go index 9ed91a68db9..d6f8442cd4f 100644 --- a/pkg/kubelet/kubelet_pods.go +++ b/pkg/kubelet/kubelet_pods.go @@ -51,11 +51,11 @@ import ( "k8s.io/kubernetes/pkg/fieldpath" "k8s.io/kubernetes/pkg/kubelet/cm" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" + "k8s.io/kubernetes/pkg/kubelet/cri/streaming/portforward" + remotecommandserver "k8s.io/kubernetes/pkg/kubelet/cri/streaming/remotecommand" "k8s.io/kubernetes/pkg/kubelet/envvars" "k8s.io/kubernetes/pkg/kubelet/eviction" "k8s.io/kubernetes/pkg/kubelet/images" - "k8s.io/kubernetes/pkg/kubelet/server/portforward" - remotecommandserver "k8s.io/kubernetes/pkg/kubelet/server/remotecommand" "k8s.io/kubernetes/pkg/kubelet/status" kubetypes "k8s.io/kubernetes/pkg/kubelet/types" "k8s.io/kubernetes/pkg/kubelet/util/format" diff --git a/pkg/kubelet/kubelet_pods_test.go b/pkg/kubelet/kubelet_pods_test.go index 18135f8db1e..e475a186be0 100644 --- a/pkg/kubelet/kubelet_pods_test.go +++ b/pkg/kubelet/kubelet_pods_test.go @@ -47,8 +47,8 @@ import ( "k8s.io/kubernetes/pkg/features" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" containertest "k8s.io/kubernetes/pkg/kubelet/container/testing" - "k8s.io/kubernetes/pkg/kubelet/server/portforward" - "k8s.io/kubernetes/pkg/kubelet/server/remotecommand" + "k8s.io/kubernetes/pkg/kubelet/cri/streaming/portforward" + "k8s.io/kubernetes/pkg/kubelet/cri/streaming/remotecommand" "k8s.io/kubernetes/pkg/volume/util/hostutil" "k8s.io/kubernetes/pkg/volume/util/subpath" ) diff --git a/pkg/kubelet/kuberuntime/fake_kuberuntime_manager.go b/pkg/kubelet/kuberuntime/fake_kuberuntime_manager.go index 2552ebe8d3c..30ca163b1dc 100644 --- a/pkg/kubelet/kuberuntime/fake_kuberuntime_manager.go +++ b/pkg/kubelet/kuberuntime/fake_kuberuntime_manager.go @@ -25,6 +25,7 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/tools/record" "k8s.io/client-go/util/flowcontrol" + "k8s.io/component-base/logs/logreduction" internalapi "k8s.io/cri-api/pkg/apis" "k8s.io/kubernetes/pkg/credentialprovider" "k8s.io/kubernetes/pkg/kubelet/cm" @@ -32,7 +33,6 @@ import ( "k8s.io/kubernetes/pkg/kubelet/images" "k8s.io/kubernetes/pkg/kubelet/lifecycle" proberesults "k8s.io/kubernetes/pkg/kubelet/prober/results" - "k8s.io/kubernetes/pkg/kubelet/util/logreduction" ) const ( diff --git a/pkg/kubelet/kuberuntime/kuberuntime_manager.go b/pkg/kubelet/kuberuntime/kuberuntime_manager.go index 20e48b7e1b8..a5228f4ab75 100644 --- a/pkg/kubelet/kuberuntime/kuberuntime_manager.go +++ b/pkg/kubelet/kuberuntime/kuberuntime_manager.go @@ -35,6 +35,7 @@ import ( "k8s.io/client-go/tools/record" ref "k8s.io/client-go/tools/reference" "k8s.io/client-go/util/flowcontrol" + "k8s.io/component-base/logs/logreduction" internalapi "k8s.io/cri-api/pkg/apis" runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1alpha2" "k8s.io/kubernetes/pkg/api/legacyscheme" @@ -50,7 +51,6 @@ import ( "k8s.io/kubernetes/pkg/kubelet/types" "k8s.io/kubernetes/pkg/kubelet/util/cache" "k8s.io/kubernetes/pkg/kubelet/util/format" - "k8s.io/kubernetes/pkg/kubelet/util/logreduction" ) const ( diff --git a/pkg/kubelet/server/server.go b/pkg/kubelet/server/server.go index 7cb3cd364fd..ed86b630cac 100644 --- a/pkg/kubelet/server/server.go +++ b/pkg/kubelet/server/server.go @@ -66,12 +66,12 @@ import ( podresourcesapi "k8s.io/kubernetes/pkg/kubelet/apis/podresources/v1alpha1" "k8s.io/kubernetes/pkg/kubelet/apis/resourcemetrics/v1alpha1" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" + "k8s.io/kubernetes/pkg/kubelet/cri/streaming" + "k8s.io/kubernetes/pkg/kubelet/cri/streaming/portforward" + remotecommandserver "k8s.io/kubernetes/pkg/kubelet/cri/streaming/remotecommand" "k8s.io/kubernetes/pkg/kubelet/prober" servermetrics "k8s.io/kubernetes/pkg/kubelet/server/metrics" - "k8s.io/kubernetes/pkg/kubelet/server/portforward" - remotecommandserver "k8s.io/kubernetes/pkg/kubelet/server/remotecommand" "k8s.io/kubernetes/pkg/kubelet/server/stats" - "k8s.io/kubernetes/pkg/kubelet/server/streaming" kubelettypes "k8s.io/kubernetes/pkg/kubelet/types" "k8s.io/kubernetes/pkg/kubelet/util" ) diff --git a/pkg/kubelet/server/server_test.go b/pkg/kubelet/server/server_test.go index 804aa556ae4..4e63df323d7 100644 --- a/pkg/kubelet/server/server_test.go +++ b/pkg/kubelet/server/server_test.go @@ -57,10 +57,10 @@ import ( _ "k8s.io/kubernetes/pkg/apis/core/install" "k8s.io/kubernetes/pkg/kubelet/cm" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" - "k8s.io/kubernetes/pkg/kubelet/server/portforward" - remotecommandserver "k8s.io/kubernetes/pkg/kubelet/server/remotecommand" + "k8s.io/kubernetes/pkg/kubelet/cri/streaming" + "k8s.io/kubernetes/pkg/kubelet/cri/streaming/portforward" + remotecommandserver "k8s.io/kubernetes/pkg/kubelet/cri/streaming/remotecommand" "k8s.io/kubernetes/pkg/kubelet/server/stats" - "k8s.io/kubernetes/pkg/kubelet/server/streaming" "k8s.io/kubernetes/pkg/volume" ) diff --git a/pkg/kubelet/server/server_websocket_test.go b/pkg/kubelet/server/server_websocket_test.go index 4e1ed064b35..92a876423d4 100644 --- a/pkg/kubelet/server/server_websocket_test.go +++ b/pkg/kubelet/server/server_websocket_test.go @@ -29,7 +29,7 @@ import ( "golang.org/x/net/websocket" "k8s.io/apimachinery/pkg/types" - "k8s.io/kubernetes/pkg/kubelet/server/portforward" + "k8s.io/kubernetes/pkg/kubelet/cri/streaming/portforward" ) const ( diff --git a/pkg/kubelet/util/logreduction/BUILD b/staging/src/k8s.io/component-base/logs/logreduction/BUILD similarity index 100% rename from pkg/kubelet/util/logreduction/BUILD rename to staging/src/k8s.io/component-base/logs/logreduction/BUILD diff --git a/pkg/kubelet/util/logreduction/logreduction.go b/staging/src/k8s.io/component-base/logs/logreduction/logreduction.go similarity index 100% rename from pkg/kubelet/util/logreduction/logreduction.go rename to staging/src/k8s.io/component-base/logs/logreduction/logreduction.go diff --git a/pkg/kubelet/util/logreduction/logreduction_test.go b/staging/src/k8s.io/component-base/logs/logreduction/logreduction_test.go similarity index 100% rename from pkg/kubelet/util/logreduction/logreduction_test.go rename to staging/src/k8s.io/component-base/logs/logreduction/logreduction_test.go diff --git a/test/e2e_node/util.go b/test/e2e_node/util.go index da490fcd675..fb9233d61fb 100644 --- a/test/e2e_node/util.go +++ b/test/e2e_node/util.go @@ -44,9 +44,9 @@ import ( kubeletpodresourcesv1alpha1 "k8s.io/kubernetes/pkg/kubelet/apis/podresources/v1alpha1" kubeletstatsv1alpha1 "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1" "k8s.io/kubernetes/pkg/kubelet/cm" + "k8s.io/kubernetes/pkg/kubelet/cri/remote" kubeletconfigcodec "k8s.io/kubernetes/pkg/kubelet/kubeletconfig/util/codec" kubeletmetrics "k8s.io/kubernetes/pkg/kubelet/metrics" - "k8s.io/kubernetes/pkg/kubelet/remote" "k8s.io/kubernetes/pkg/kubelet/util" "k8s.io/kubernetes/test/e2e/framework" e2ekubelet "k8s.io/kubernetes/test/e2e/framework/kubelet"