From 1d057da2f73118893b5cc27c15d59ff03beb271e Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Mon, 16 Mar 2020 16:27:44 -0400 Subject: [PATCH] Move k8s.io/apiserver/pkg/util/term to k8s.io/component-base/term Signed-off-by: Davanum Srinivas --- cmd/cloud-controller-manager/app/BUILD | 2 +- cmd/cloud-controller-manager/app/controllermanager.go | 2 +- cmd/kube-apiserver/app/BUILD | 2 +- cmd/kube-apiserver/app/server.go | 2 +- cmd/kube-controller-manager/app/BUILD | 2 +- cmd/kube-controller-manager/app/controllermanager.go | 2 +- cmd/kube-scheduler/app/BUILD | 2 +- cmd/kube-scheduler/app/server.go | 2 +- staging/src/k8s.io/apiserver/BUILD | 1 - staging/src/k8s.io/component-base/BUILD | 1 + .../{apiserver/pkg/util => component-base}/term/BUILD | 6 +++--- .../{apiserver/pkg/util => component-base}/term/term.go | 2 +- staging/src/k8s.io/kubectl/pkg/cmd/exec/BUILD | 2 +- staging/src/k8s.io/kubectl/pkg/cmd/exec/exec.go | 2 +- staging/src/k8s.io/kubectl/pkg/util/term/BUILD | 2 +- staging/src/k8s.io/kubectl/pkg/util/term/resize.go | 2 +- staging/src/k8s.io/kubectl/pkg/util/term/term.go | 2 +- staging/src/k8s.io/kubectl/pkg/util/term/term_writer.go | 2 +- 18 files changed, 19 insertions(+), 19 deletions(-) rename staging/src/k8s.io/{apiserver/pkg/util => component-base}/term/BUILD (68%) rename staging/src/k8s.io/{apiserver/pkg/util => component-base}/term/term.go (96%) diff --git a/cmd/cloud-controller-manager/app/BUILD b/cmd/cloud-controller-manager/app/BUILD index 37550a9f744..abb9260239d 100644 --- a/cmd/cloud-controller-manager/app/BUILD +++ b/cmd/cloud-controller-manager/app/BUILD @@ -24,12 +24,12 @@ go_library( "//staging/src/k8s.io/apiserver/pkg/server:go_default_library", "//staging/src/k8s.io/apiserver/pkg/server/healthz:go_default_library", "//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library", - "//staging/src/k8s.io/apiserver/pkg/util/term:go_default_library", "//staging/src/k8s.io/client-go/tools/leaderelection:go_default_library", "//staging/src/k8s.io/client-go/tools/leaderelection/resourcelock:go_default_library", "//staging/src/k8s.io/cloud-provider:go_default_library", "//staging/src/k8s.io/component-base/cli/flag:go_default_library", "//staging/src/k8s.io/component-base/cli/globalflag:go_default_library", + "//staging/src/k8s.io/component-base/term:go_default_library", "//staging/src/k8s.io/component-base/version:go_default_library", "//staging/src/k8s.io/component-base/version/verflag:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", diff --git a/cmd/cloud-controller-manager/app/controllermanager.go b/cmd/cloud-controller-manager/app/controllermanager.go index d2ddb5319fe..b4b7b8d2d25 100644 --- a/cmd/cloud-controller-manager/app/controllermanager.go +++ b/cmd/cloud-controller-manager/app/controllermanager.go @@ -31,12 +31,12 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apiserver/pkg/server" "k8s.io/apiserver/pkg/server/healthz" - "k8s.io/apiserver/pkg/util/term" "k8s.io/client-go/tools/leaderelection" "k8s.io/client-go/tools/leaderelection/resourcelock" cloudprovider "k8s.io/cloud-provider" cliflag "k8s.io/component-base/cli/flag" "k8s.io/component-base/cli/globalflag" + "k8s.io/component-base/term" "k8s.io/component-base/version" "k8s.io/component-base/version/verflag" "k8s.io/klog" diff --git a/cmd/kube-apiserver/app/BUILD b/cmd/kube-apiserver/app/BUILD index f29356fc12c..f7b7d4fdea1 100644 --- a/cmd/kube-apiserver/app/BUILD +++ b/cmd/kube-apiserver/app/BUILD @@ -57,7 +57,6 @@ go_library( "//staging/src/k8s.io/apiserver/pkg/storage/etcd3/preflight:go_default_library", "//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library", "//staging/src/k8s.io/apiserver/pkg/util/flowcontrol:go_default_library", - "//staging/src/k8s.io/apiserver/pkg/util/term:go_default_library", "//staging/src/k8s.io/apiserver/pkg/util/webhook:go_default_library", "//staging/src/k8s.io/client-go/informers:go_default_library", "//staging/src/k8s.io/client-go/kubernetes:go_default_library", @@ -68,6 +67,7 @@ go_library( "//staging/src/k8s.io/component-base/cli/globalflag:go_default_library", "//staging/src/k8s.io/component-base/metrics:go_default_library", "//staging/src/k8s.io/component-base/metrics/prometheus/workqueue:go_default_library", + "//staging/src/k8s.io/component-base/term:go_default_library", "//staging/src/k8s.io/component-base/version:go_default_library", "//staging/src/k8s.io/component-base/version/verflag:go_default_library", "//staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1:go_default_library", diff --git a/cmd/kube-apiserver/app/server.go b/cmd/kube-apiserver/app/server.go index f0660050f5f..2ad5309f22d 100644 --- a/cmd/kube-apiserver/app/server.go +++ b/cmd/kube-apiserver/app/server.go @@ -53,7 +53,6 @@ import ( "k8s.io/apiserver/pkg/util/feature" utilfeature "k8s.io/apiserver/pkg/util/feature" utilflowcontrol "k8s.io/apiserver/pkg/util/flowcontrol" - "k8s.io/apiserver/pkg/util/term" "k8s.io/apiserver/pkg/util/webhook" clientgoinformers "k8s.io/client-go/informers" clientgoclientset "k8s.io/client-go/kubernetes" @@ -63,6 +62,7 @@ import ( "k8s.io/component-base/cli/globalflag" "k8s.io/component-base/metrics" _ "k8s.io/component-base/metrics/prometheus/workqueue" // for workqueue metric registration + "k8s.io/component-base/term" "k8s.io/component-base/version" "k8s.io/component-base/version/verflag" "k8s.io/klog" diff --git a/cmd/kube-controller-manager/app/BUILD b/cmd/kube-controller-manager/app/BUILD index fe3b63c7b0b..d2955f8f698 100644 --- a/cmd/kube-controller-manager/app/BUILD +++ b/cmd/kube-controller-manager/app/BUILD @@ -121,7 +121,6 @@ go_library( "//staging/src/k8s.io/apiserver/pkg/server/healthz:go_default_library", "//staging/src/k8s.io/apiserver/pkg/server/mux:go_default_library", "//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library", - "//staging/src/k8s.io/apiserver/pkg/util/term:go_default_library", "//staging/src/k8s.io/client-go/discovery/cached:go_default_library", "//staging/src/k8s.io/client-go/discovery/cached/memory:go_default_library", "//staging/src/k8s.io/client-go/dynamic:go_default_library", @@ -143,6 +142,7 @@ go_library( "//staging/src/k8s.io/component-base/cli/globalflag:go_default_library", "//staging/src/k8s.io/component-base/featuregate:go_default_library", "//staging/src/k8s.io/component-base/metrics/prometheus/ratelimiter:go_default_library", + "//staging/src/k8s.io/component-base/term:go_default_library", "//staging/src/k8s.io/component-base/version:go_default_library", "//staging/src/k8s.io/component-base/version/verflag:go_default_library", "//staging/src/k8s.io/csi-translation-lib:go_default_library", diff --git a/cmd/kube-controller-manager/app/controllermanager.go b/cmd/kube-controller-manager/app/controllermanager.go index fa6df853c4e..bd74763459d 100644 --- a/cmd/kube-controller-manager/app/controllermanager.go +++ b/cmd/kube-controller-manager/app/controllermanager.go @@ -41,7 +41,6 @@ import ( "k8s.io/apiserver/pkg/server/healthz" "k8s.io/apiserver/pkg/server/mux" utilfeature "k8s.io/apiserver/pkg/util/feature" - "k8s.io/apiserver/pkg/util/term" cacheddiscovery "k8s.io/client-go/discovery/cached" "k8s.io/client-go/informers" clientset "k8s.io/client-go/kubernetes" @@ -56,6 +55,7 @@ import ( cloudprovider "k8s.io/cloud-provider" cliflag "k8s.io/component-base/cli/flag" "k8s.io/component-base/cli/globalflag" + "k8s.io/component-base/term" "k8s.io/component-base/version" "k8s.io/component-base/version/verflag" "k8s.io/klog" diff --git a/cmd/kube-scheduler/app/BUILD b/cmd/kube-scheduler/app/BUILD index eb071684b88..5cf985163c1 100644 --- a/cmd/kube-scheduler/app/BUILD +++ b/cmd/kube-scheduler/app/BUILD @@ -31,7 +31,6 @@ go_library( "//staging/src/k8s.io/apiserver/pkg/server/healthz:go_default_library", "//staging/src/k8s.io/apiserver/pkg/server/mux:go_default_library", "//staging/src/k8s.io/apiserver/pkg/server/routes:go_default_library", - "//staging/src/k8s.io/apiserver/pkg/util/term:go_default_library", "//staging/src/k8s.io/client-go/kubernetes/scheme:go_default_library", "//staging/src/k8s.io/client-go/kubernetes/typed/core/v1:go_default_library", "//staging/src/k8s.io/client-go/tools/events:go_default_library", @@ -41,6 +40,7 @@ go_library( "//staging/src/k8s.io/component-base/cli/globalflag:go_default_library", "//staging/src/k8s.io/component-base/logs:go_default_library", "//staging/src/k8s.io/component-base/metrics/legacyregistry:go_default_library", + "//staging/src/k8s.io/component-base/term:go_default_library", "//staging/src/k8s.io/component-base/version:go_default_library", "//staging/src/k8s.io/component-base/version/verflag:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", diff --git a/cmd/kube-scheduler/app/server.go b/cmd/kube-scheduler/app/server.go index 430bf642062..644e31b9057 100644 --- a/cmd/kube-scheduler/app/server.go +++ b/cmd/kube-scheduler/app/server.go @@ -38,7 +38,6 @@ import ( "k8s.io/apiserver/pkg/server/healthz" "k8s.io/apiserver/pkg/server/mux" "k8s.io/apiserver/pkg/server/routes" - "k8s.io/apiserver/pkg/util/term" "k8s.io/client-go/kubernetes/scheme" corev1 "k8s.io/client-go/kubernetes/typed/core/v1" "k8s.io/client-go/tools/events" @@ -48,6 +47,7 @@ import ( "k8s.io/component-base/cli/globalflag" "k8s.io/component-base/logs" "k8s.io/component-base/metrics/legacyregistry" + "k8s.io/component-base/term" "k8s.io/component-base/version" "k8s.io/component-base/version/verflag" "k8s.io/klog" diff --git a/staging/src/k8s.io/apiserver/BUILD b/staging/src/k8s.io/apiserver/BUILD index f3fb0903f6a..70935be995f 100644 --- a/staging/src/k8s.io/apiserver/BUILD +++ b/staging/src/k8s.io/apiserver/BUILD @@ -49,7 +49,6 @@ filegroup( "//staging/src/k8s.io/apiserver/pkg/util/openapi:all-srcs", "//staging/src/k8s.io/apiserver/pkg/util/proxy:all-srcs", "//staging/src/k8s.io/apiserver/pkg/util/shufflesharding:all-srcs", - "//staging/src/k8s.io/apiserver/pkg/util/term:all-srcs", "//staging/src/k8s.io/apiserver/pkg/util/webhook:all-srcs", "//staging/src/k8s.io/apiserver/pkg/util/wsstream:all-srcs", "//staging/src/k8s.io/apiserver/plugin/pkg/audit:all-srcs", diff --git a/staging/src/k8s.io/component-base/BUILD b/staging/src/k8s.io/component-base/BUILD index c8a16fdf511..700539e060b 100644 --- a/staging/src/k8s.io/component-base/BUILD +++ b/staging/src/k8s.io/component-base/BUILD @@ -16,6 +16,7 @@ filegroup( "//staging/src/k8s.io/component-base/featuregate:all-srcs", "//staging/src/k8s.io/component-base/logs:all-srcs", "//staging/src/k8s.io/component-base/metrics:all-srcs", + "//staging/src/k8s.io/component-base/term:all-srcs", "//staging/src/k8s.io/component-base/version:all-srcs", ], tags = ["automanaged"], diff --git a/staging/src/k8s.io/apiserver/pkg/util/term/BUILD b/staging/src/k8s.io/component-base/term/BUILD similarity index 68% rename from staging/src/k8s.io/apiserver/pkg/util/term/BUILD rename to staging/src/k8s.io/component-base/term/BUILD index 346cff3e31b..f282ec81176 100644 --- a/staging/src/k8s.io/apiserver/pkg/util/term/BUILD +++ b/staging/src/k8s.io/component-base/term/BUILD @@ -3,10 +3,10 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["term.go"], - importmap = "k8s.io/kubernetes/vendor/k8s.io/apiserver/pkg/util/term", - importpath = "k8s.io/apiserver/pkg/util/term", + importmap = "k8s.io/kubernetes/vendor/k8s.io/component-base/term", + importpath = "k8s.io/component-base/term", visibility = ["//visibility:public"], - deps = ["//vendor/github.com/docker/docker/pkg/term:go_default_library"], + deps = ["//vendor/github.com/moby/term:go_default_library"], ) filegroup( diff --git a/staging/src/k8s.io/apiserver/pkg/util/term/term.go b/staging/src/k8s.io/component-base/term/term.go similarity index 96% rename from staging/src/k8s.io/apiserver/pkg/util/term/term.go rename to staging/src/k8s.io/component-base/term/term.go index 123985bbf63..7fee58fe1bc 100644 --- a/staging/src/k8s.io/apiserver/pkg/util/term/term.go +++ b/staging/src/k8s.io/component-base/term/term.go @@ -20,7 +20,7 @@ import ( "fmt" "io" - "github.com/docker/docker/pkg/term" + "github.com/moby/term" ) // TerminalSize returns the current width and height of the user's terminal. If it isn't a terminal, diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/exec/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/exec/BUILD index d30e3efeaf7..64b1447a211 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/exec/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/exec/BUILD @@ -21,7 +21,7 @@ go_library( "//staging/src/k8s.io/kubectl/pkg/util/interrupt:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/templates:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/term:go_default_library", - "//vendor/github.com/docker/docker/pkg/term:go_default_library", + "//vendor/github.com/moby/term:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", ], ) diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/exec/exec.go b/staging/src/k8s.io/kubectl/pkg/cmd/exec/exec.go index 0dc3b2908e2..05435e497de 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/exec/exec.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/exec/exec.go @@ -23,7 +23,7 @@ import ( "net/url" "time" - dockerterm "github.com/docker/docker/pkg/term" + dockerterm "github.com/moby/term" "github.com/spf13/cobra" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/staging/src/k8s.io/kubectl/pkg/util/term/BUILD b/staging/src/k8s.io/kubectl/pkg/util/term/BUILD index de7909b4900..0d040b62d12 100644 --- a/staging/src/k8s.io/kubectl/pkg/util/term/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/util/term/BUILD @@ -16,8 +16,8 @@ go_library( "//staging/src/k8s.io/apimachinery/pkg/util/runtime:go_default_library", "//staging/src/k8s.io/client-go/tools/remotecommand:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/interrupt:go_default_library", - "//vendor/github.com/docker/docker/pkg/term:go_default_library", "//vendor/github.com/mitchellh/go-wordwrap:go_default_library", + "//vendor/github.com/moby/term:go_default_library", ] + select({ "@io_bazel_rules_go//go/platform:android": [ "//vendor/golang.org/x/sys/unix:go_default_library", diff --git a/staging/src/k8s.io/kubectl/pkg/util/term/resize.go b/staging/src/k8s.io/kubectl/pkg/util/term/resize.go index 7ca09a8586b..636b8bef452 100644 --- a/staging/src/k8s.io/kubectl/pkg/util/term/resize.go +++ b/staging/src/k8s.io/kubectl/pkg/util/term/resize.go @@ -19,7 +19,7 @@ package term import ( "fmt" - "github.com/docker/docker/pkg/term" + "github.com/moby/term" "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/client-go/tools/remotecommand" ) diff --git a/staging/src/k8s.io/kubectl/pkg/util/term/term.go b/staging/src/k8s.io/kubectl/pkg/util/term/term.go index 18183c0c967..465b771e341 100644 --- a/staging/src/k8s.io/kubectl/pkg/util/term/term.go +++ b/staging/src/k8s.io/kubectl/pkg/util/term/term.go @@ -20,7 +20,7 @@ import ( "io" "os" - "github.com/docker/docker/pkg/term" + "github.com/moby/term" "k8s.io/kubectl/pkg/util/interrupt" ) diff --git a/staging/src/k8s.io/kubectl/pkg/util/term/term_writer.go b/staging/src/k8s.io/kubectl/pkg/util/term/term_writer.go index 2d72d1e4525..1733764fce0 100644 --- a/staging/src/k8s.io/kubectl/pkg/util/term/term_writer.go +++ b/staging/src/k8s.io/kubectl/pkg/util/term/term_writer.go @@ -20,8 +20,8 @@ import ( "io" "os" - "github.com/docker/docker/pkg/term" wordwrap "github.com/mitchellh/go-wordwrap" + "github.com/moby/term" ) type wordWrapWriter struct {