github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #48299 from mengqiy/kubectl_term 

Automatic merge from submit-queue (batch tested with PRs 47918, 47964, 48151, 47881, 48299)

move term to kubectl/util

move term from pkg/util/term to pkg/kubectl/util/term

remove dependency of `k8s.io/kubernetes/pkg/util/term` for `pkg/kubelet/dockershim/exec.go` and `pkg/kubelet/dockershim/exec.go`

Ref: https://github.com/kubernetes/kubernetes/issues/48209

```release-note
NONE
```
/assign @apelisse @monopole 

cc: @pwittrock
pull/6/head
Kubernetes Submit Queue 2017-06-30 18:42:42 -07:00 committed by GitHub
parent c0337c92cc f0ce897277
commit 73a94eac9e
22 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/kubectl/cmd/BUILD
View File

@ -94,6 +94,7 @@ go_library(
"//pkg/kubectl/plugins:go_default_library",
"//pkg/kubectl/resource:go_default_library",
"//pkg/kubectl/util:go_default_library",
"//pkg/kubectl/util/term:go_default_library",
"//pkg/kubelet/types:go_default_library",
"//pkg/printers:go_default_library",
"//pkg/printers/internalversion:go_default_library",
@ -101,7 +102,6 @@ go_library(
"//pkg/util/i18n:go_default_library",
"//pkg/util/interrupt:go_default_library",
"//pkg/util/taints:go_default_library",
"//pkg/util/term:go_default_library",
"//pkg/version:go_default_library",
"//vendor/github.com/daviddengcn/go-colortext:go_default_library",
"//vendor/github.com/docker/distribution/reference:go_default_library",
@ -214,11 +214,11 @@ go_test(
"//pkg/kubectl/cmd/util/openapi:go_default_library",
"//pkg/kubectl/plugins:go_default_library",
"//pkg/kubectl/resource:go_default_library",
"//pkg/kubectl/util/term:go_default_library",
"//pkg/printers:go_default_library",
"//pkg/printers/internalversion:go_default_library",
"//pkg/util/i18n:go_default_library",
"//pkg/util/strings:go_default_library",
"//pkg/util/term:go_default_library",
"//vendor/github.com/go-openapi/spec:go_default_library",
"//vendor/github.com/spf13/cobra:go_default_library",
"//vendor/github.com/stretchr/testify/assert:go_default_library",

2
pkg/kubectl/cmd/exec.go
View File

@ -32,9 +32,9 @@ import (
coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/util/term"
"k8s.io/kubernetes/pkg/util/i18n"
"k8s.io/kubernetes/pkg/util/interrupt"
"k8s.io/kubernetes/pkg/util/term"
)
var (

2
pkg/kubectl/cmd/exec_test.go
View File

@ -35,7 +35,7 @@ import (
"k8s.io/client-go/tools/remotecommand"
"k8s.io/kubernetes/pkg/api"
cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing"
"k8s.io/kubernetes/pkg/util/term"
"k8s.io/kubernetes/pkg/kubectl/util/term"
)
type fakeRemoteExecutor struct {

2
pkg/kubectl/cmd/templates/BUILD
View File

@ -19,7 +19,7 @@ go_library(
"//build/visible_to:pkg_kubectl_cmd_templates_CONSUMERS",
],
deps = [
"//pkg/util/term:go_default_library",
"//pkg/kubectl/util/term:go_default_library",
"//vendor/github.com/MakeNowJust/heredoc:go_default_library",
"//vendor/github.com/russross/blackfriday:go_default_library",
"//vendor/github.com/spf13/cobra:go_default_library",

2
pkg/kubectl/cmd/templates/templater.go
View File

@ -23,7 +23,7 @@ import (
"text/template"
"unicode"
"k8s.io/kubernetes/pkg/util/term"
"k8s.io/kubernetes/pkg/kubectl/util/term"
"github.com/spf13/cobra"
flag "github.com/spf13/pflag"

2
pkg/kubectl/cmd/util/editor/BUILD
View File

@ -22,8 +22,8 @@ go_library(
"//pkg/kubectl/cmd/util:go_default_library",
"//pkg/kubectl/resource:go_default_library",
"//pkg/kubectl/util/crlf:go_default_library",
"//pkg/kubectl/util/term:go_default_library",
"//pkg/printers:go_default_library",
"//pkg/util/term:go_default_library",
"//vendor/github.com/evanphx/json-patch:go_default_library",
"//vendor/github.com/golang/glog:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",

2
pkg/kubectl/cmd/util/editor/editor.go
View File

@ -29,7 +29,7 @@ import (
"github.com/golang/glog"
"k8s.io/kubernetes/pkg/util/term"
"k8s.io/kubernetes/pkg/kubectl/util/term"
)
const (

1
pkg/kubectl/util/BUILD
View File

@ -31,6 +31,7 @@ filegroup(
srcs = [
":package-srcs",
"//pkg/kubectl/util/crlf:all-srcs",
"//pkg/kubectl/util/term:all-srcs",
],
tags = ["automanaged"],
visibility = ["//build/visible_to:pkg_kubectl_util_CONSUMERS"],

0
pkg/util/term/BUILD → pkg/kubectl/util/term/BUILD
View File

0
pkg/util/term/resize.go → pkg/kubectl/util/term/resize.go
View File

0
pkg/util/term/resizeevents.go → pkg/kubectl/util/term/resizeevents.go
View File

0
pkg/util/term/resizeevents_windows.go → pkg/kubectl/util/term/resizeevents_windows.go
View File

0
pkg/util/term/setsize.go → pkg/kubectl/util/term/setsize.go
View File

0
pkg/util/term/setsize_unsupported.go → pkg/kubectl/util/term/setsize_unsupported.go
View File

0
pkg/util/term/term.go → pkg/kubectl/util/term/term.go
View File

0
pkg/util/term/term_writer.go → pkg/kubectl/util/term/term_writer.go
View File

0
pkg/util/term/term_writer_test.go → pkg/kubectl/util/term/term_writer_test.go
View File

2
pkg/kubelet/dockershim/BUILD
View File

@ -53,9 +53,9 @@ go_library(
"//pkg/security/apparmor:go_default_library",
"//pkg/util/exec:go_default_library",
"//pkg/util/hash:go_default_library",
"//pkg/util/term:go_default_library",
"//vendor/github.com/blang/semver:go_default_library",
"//vendor/github.com/docker/docker/pkg/jsonmessage:go_default_library",
"//vendor/github.com/docker/docker/pkg/term:go_default_library",
"//vendor/github.com/docker/engine-api/types:go_default_library",
"//vendor/github.com/docker/engine-api/types/container:go_default_library",
"//vendor/github.com/docker/engine-api/types/filters:go_default_library",

4
pkg/kubelet/dockershim/exec.go
View File

@ -23,13 +23,13 @@ import (
"os/exec"
"time"
"github.com/docker/docker/pkg/term"
dockertypes "github.com/docker/engine-api/types"
"github.com/golang/glog"
"k8s.io/client-go/tools/remotecommand"
kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
utilexec "k8s.io/kubernetes/pkg/util/exec"
"k8s.io/kubernetes/pkg/util/term"
"k8s.io/kubernetes/pkg/kubelet/dockershim/libdocker"
)
@ -89,7 +89,7 @@ func (*NsenterExecHandler) ExecInContainer(client libdocker.Interface, container
defer stdout.Close()
kubecontainer.HandleResizing(resize, func(size remotecommand.TerminalSize) {
term.SetSize(p.Fd(), size)
term.SetWinsize(p.Fd(), &term.Winsize{Height: size.Height, Width: size.Width})
})
if stdin != nil {

2
pkg/kubelet/rkt/BUILD
View File

@ -39,13 +39,13 @@ go_library(
"//pkg/util/parsers:go_default_library",
"//pkg/util/selinux:go_default_library",
"//pkg/util/strings:go_default_library",
"//pkg/util/term:go_default_library",
"//pkg/util/version:go_default_library",
"//vendor/github.com/appc/spec/schema:go_default_library",
"//vendor/github.com/appc/spec/schema/types:go_default_library",
"//vendor/github.com/coreos/go-systemd/dbus:go_default_library",
"//vendor/github.com/coreos/go-systemd/unit:go_default_library",
"//vendor/github.com/coreos/rkt/api/v1alpha:go_default_library",
"//vendor/github.com/docker/docker/pkg/term:go_default_library",
"//vendor/github.com/docker/engine-api/types:go_default_library",
"//vendor/github.com/golang/glog:go_default_library",
"//vendor/golang.org/x/net/context:go_default_library",

4
pkg/kubelet/rkt/rkt.go
View File

@ -38,6 +38,7 @@ import (
appctypes "github.com/appc/spec/schema/types"
"github.com/coreos/go-systemd/unit"
rktapi "github.com/coreos/rkt/api/v1alpha"
"github.com/docker/docker/pkg/term"
"github.com/golang/glog"
"golang.org/x/net/context"
"google.golang.org/grpc"
@ -65,7 +66,6 @@ import (
utilexec "k8s.io/kubernetes/pkg/util/exec"
"k8s.io/kubernetes/pkg/util/selinux"
utilstrings "k8s.io/kubernetes/pkg/util/strings"
"k8s.io/kubernetes/pkg/util/term"
)
const (
@ -2175,7 +2175,7 @@ func (r *Runtime) ExecInContainer(containerID kubecontainer.ContainerID, cmd []s
defer stdout.Close()
kubecontainer.HandleResizing(resize, func(size remotecommand.TerminalSize) {
term.SetSize(p.Fd(), size)
term.SetWinsize(p.Fd(), &term.Winsize{Height: size.Height, Width: size.Width})
})
if stdin != nil {

1
pkg/util/BUILD
View File

@ -90,7 +90,6 @@ filegroup(
"//pkg/util/system:all-srcs",
"//pkg/util/tail:all-srcs",
"//pkg/util/taints:all-srcs",
"//pkg/util/term:all-srcs",
"//pkg/util/threading:all-srcs",
"//pkg/util/tolerations:all-srcs",
"//pkg/util/uuid:all-srcs",