Skip to content

Commit

Permalink
Move packages for slightly better UX for consumers
Browse files Browse the repository at this point in the history 
Signed-off-by: Davanum Srinivas <[email protected]>
  • Loading branch information
@dims
dims committed May 20, 2020
1 parent b339ed0 commit 5692926
Show file tree
Hide file tree
Showing 52 changed files with 28 additions and 28 deletions.
4 changes: 2 additions & 2 deletions cmd/kubemark/hollow-node.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/client/tests/portfoward_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkg/client/tests/remotecommand_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
0 pkg/kubelet/remote/BUILD → pkg/kubelet/cri/remote/BUILD
View file
File renamed without changes.
0 pkg/kubelet/remote/OWNERS → pkg/kubelet/cri/remote/OWNERS
View file
File renamed without changes.
0 pkg/kubelet/remote/doc.go → pkg/kubelet/cri/remote/doc.go
View file
File renamed without changes.
0 pkg/kubelet/remote/fake/BUILD → pkg/kubelet/cri/remote/fake/BUILD
View file
File renamed without changes.
0 pkg/kubelet/remote/fake/doc.go → pkg/kubelet/cri/remote/fake/doc.go
View file
File renamed without changes.
0 pkg/kubelet/remote/fake/endpoint.go → pkg/kubelet/cri/remote/fake/endpoint.go
View file
File renamed without changes.
0 pkg/kubelet/remote/fake/endpoint_windows.go → ...belet/cri/remote/fake/endpoint_windows.go
View file
File renamed without changes.
0 ...kubelet/remote/fake/fake_image_service.go → ...let/cri/remote/fake/fake_image_service.go
View file
File renamed without changes.
0 pkg/kubelet/remote/fake/fake_runtime.go → pkg/kubelet/cri/remote/fake/fake_runtime.go
View file
File renamed without changes.
0 pkg/kubelet/remote/remote_image.go → pkg/kubelet/cri/remote/remote_image.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/kubelet/remote/remote_runtime.go → pkg/kubelet/cri/remote/remote_runtime.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/kubelet/remote/remote_runtime_test.go → ...kubelet/cri/remote/remote_runtime_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
0 pkg/kubelet/remote/utils.go → pkg/kubelet/cri/remote/utils.go
View file
File renamed without changes.
0 ...let/server/streaming/.import-restrictions → ...ubelet/cri/streaming/.import-restrictions
View file
File renamed without changes.
0 pkg/kubelet/server/streaming/BUILD → pkg/kubelet/cri/streaming/BUILD
View file
File renamed without changes.
0 pkg/kubelet/server/streaming/errors.go → pkg/kubelet/cri/streaming/errors.go
View file
File renamed without changes.
0 ...t/server/portforward/.import-restrictions → ...treaming/portforward/.import-restrictions
View file
File renamed without changes.
0 pkg/kubelet/server/portforward/BUILD → pkg/kubelet/cri/streaming/portforward/BUILD
View file
File renamed without changes.
0 pkg/kubelet/server/portforward/constants.go → ...et/cri/streaming/portforward/constants.go
View file
File renamed without changes.
0 pkg/kubelet/server/portforward/httpstream.go → ...t/cri/streaming/portforward/httpstream.go
View file
File renamed without changes.
0 ...let/server/portforward/httpstream_test.go → .../streaming/portforward/httpstream_test.go
View file
File renamed without changes.
0 ...kubelet/server/portforward/portforward.go → .../cri/streaming/portforward/portforward.go
View file
File renamed without changes.
0 pkg/kubelet/server/portforward/websocket.go → ...et/cri/streaming/portforward/websocket.go
View file
File renamed without changes.
0 ...elet/server/portforward/websocket_test.go → ...i/streaming/portforward/websocket_test.go
View file
File renamed without changes.
0 ...server/remotecommand/.import-restrictions → ...eaming/remotecommand/.import-restrictions
View file
File renamed without changes.
0 pkg/kubelet/server/remotecommand/BUILD → ...kubelet/cri/streaming/remotecommand/BUILD
View file
File renamed without changes.
0 pkg/kubelet/server/remotecommand/attach.go → ...let/cri/streaming/remotecommand/attach.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/kubelet/server/remotecommand/doc.go → ...ubelet/cri/streaming/remotecommand/doc.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
0 pkg/kubelet/server/remotecommand/exec.go → ...belet/cri/streaming/remotecommand/exec.go
View file
File renamed without changes.
0 ...ubelet/server/remotecommand/httpstream.go → ...cri/streaming/remotecommand/httpstream.go
View file
File renamed without changes.
0 ...kubelet/server/remotecommand/websocket.go → .../cri/streaming/remotecommand/websocket.go
View file
File renamed without changes.
0 ...kubelet/server/streaming/request_cache.go → pkg/kubelet/cri/streaming/request_cache.go
View file
File renamed without changes.
0 ...et/server/streaming/request_cache_test.go → ...belet/cri/streaming/request_cache_test.go
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions pkg/kubelet/server/streaming/server.go → pkg/kubelet/cri/streaming/server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion pkg/kubelet/server/streaming/server_test.go → pkg/kubelet/cri/streaming/server_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion pkg/kubelet/dockershim/docker_service.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/kubelet/dockershim/docker_streaming.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
4 changes: 2 additions & 2 deletions pkg/kubelet/kubelet.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions pkg/kubelet/kubelet_pods.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions pkg/kubelet/kubelet_pods_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/kubelet/kuberuntime/fake_kuberuntime_manager.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@ 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"
kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
"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 (
Expand Down
2 changes: 1 addition & 1 deletion pkg/kubelet/kuberuntime/kuberuntime_manager.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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 (
Expand Down
6 changes: 3 additions & 3 deletions pkg/kubelet/server/server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
6 changes: 3 additions & 3 deletions pkg/kubelet/server/server_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/kubelet/server/server_websocket_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
0 pkg/kubelet/util/logreduction/BUILD → ...io/component-base/logs/logreduction/BUILD
View file
File renamed without changes.
0 ...kubelet/util/logreduction/logreduction.go → ...nt-base/logs/logreduction/logreduction.go
View file
File renamed without changes.
0 ...et/util/logreduction/logreduction_test.go → ...se/logs/logreduction/logreduction_test.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion test/e2e_node/util.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 5692926

Please sign in to comment.