kubernetes
/
kubectl
mirror of https://github.com/kubernetes/kubectl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #84062 from seans3/tableprinter-move 

Removes kubectl get dependency on Kubernetes core

Kubernetes-commit: df8587f99f9b356e4c26271b9aa8ba494ae6ed7e
This commit is contained in:
Kubernetes Publisher 2019-10-24 16:55:52 -07:00
parent 7eb9b5b7db c6a8c8a72e
commit 864696d947
7 changed files with 26 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Godeps/Godeps.json generated
View File

@ -584,27 +584,27 @@
}, },
{ {
"ImportPath": "k8s.io/api", "ImportPath": "k8s.io/api",
"Rev": "842530cfd124" "Rev": "4cb0a757333c"
}, },
{ {
"ImportPath": "k8s.io/apimachinery", "ImportPath": "k8s.io/apimachinery",
"Rev": "31cb258e7ad9" "Rev": "62ce3d1e6a82"
}, },
{ {
"ImportPath": "k8s.io/cli-runtime", "ImportPath": "k8s.io/cli-runtime",
"Rev": "6ea64d505988" "Rev": "0b44683c44df"
}, },
{ {
"ImportPath": "k8s.io/client-go", "ImportPath": "k8s.io/client-go",
"Rev": "d1b30110f1ab" "Rev": "464ec5ba048d"
}, },
{ {
"ImportPath": "k8s.io/code-generator", "ImportPath": "k8s.io/code-generator",
"Rev": "0b22993d207c" "Rev": "575254a8902d"
}, },
{ {
"ImportPath": "k8s.io/component-base", "ImportPath": "k8s.io/component-base",
"Rev": "be75e4906c11" "Rev": "ea78290eb325"
}, },
{ {
"ImportPath": "k8s.io/gengo", "ImportPath": "k8s.io/gengo",

22
go.mod
View File

@ -35,11 +35,11 @@ require (
golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f
gopkg.in/yaml.v2 v2.2.4 gopkg.in/yaml.v2 v2.2.4
gotest.tools v2.2.0+incompatible // indirect gotest.tools v2.2.0+incompatible // indirect
k8s.io/api v0.0.0-20191023225726-842530cfd124 k8s.io/api v0.0.0-20191024025707-4cb0a757333c
k8s.io/apimachinery v0.0.0-20191023225540-31cb258e7ad9 k8s.io/apimachinery v0.0.0-20191024025529-62ce3d1e6a82
k8s.io/cli-runtime v0.0.0-20191023071533-6ea64d505988 k8s.io/cli-runtime v0.0.0-20191025031152-0b44683c44df
k8s.io/client-go v0.0.0-20191023065929-d1b30110f1ab k8s.io/client-go v0.0.0-20191024105928-464ec5ba048d
k8s.io/component-base v0.0.0-20191023070445-be75e4906c11 k8s.io/component-base v0.0.0-20191024230035-ea78290eb325
k8s.io/klog v1.0.0 k8s.io/klog v1.0.0
k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf
k8s.io/metrics v0.0.0-20191014074242-8b0351268f72 k8s.io/metrics v0.0.0-20191014074242-8b0351268f72
@ -56,11 +56,11 @@ replace (
golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503 golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503
golang.org/x/text => golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db golang.org/x/text => golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db
golang.org/x/time => golang.org/x/time v0.0.0-20161028155119-f51c12702a4d golang.org/x/time => golang.org/x/time v0.0.0-20161028155119-f51c12702a4d
k8s.io/api => k8s.io/api v0.0.0-20191023225726-842530cfd124 k8s.io/api => k8s.io/api v0.0.0-20191024025707-4cb0a757333c
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191023225540-31cb258e7ad9 k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191024025529-62ce3d1e6a82
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20191023071533-6ea64d505988 k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20191025031152-0b44683c44df
k8s.io/client-go => k8s.io/client-go v0.0.0-20191023065929-d1b30110f1ab k8s.io/client-go => k8s.io/client-go v0.0.0-20191024105928-464ec5ba048d
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20191017183038-0b22993d207c k8s.io/code-generator => k8s.io/code-generator v0.0.0-20191024065345-575254a8902d
k8s.io/component-base => k8s.io/component-base v0.0.0-20191023070445-be75e4906c11 k8s.io/component-base => k8s.io/component-base v0.0.0-20191024230035-ea78290eb325
k8s.io/metrics => k8s.io/metrics v0.0.0-20191014074242-8b0351268f72 k8s.io/metrics => k8s.io/metrics v0.0.0-20191014074242-8b0351268f72
) )

12
go.sum
View File

@ -290,12 +290,12 @@ gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
k8s.io/api v0.0.0-20191023225726-842530cfd124/go.mod h1:Y7d16l5t3O6+2Wcqr66Qz96Z7jIZAvtO5sjSmB6T3ck= k8s.io/api v0.0.0-20191024025707-4cb0a757333c/go.mod h1:wThzAkkfqqxz0ERi8QQEOwQfkBFM27QYtPxuvBI9p+0=
k8s.io/apimachinery v0.0.0-20191023225540-31cb258e7ad9/go.mod h1:92mWDd8Ji2sw2157KIgino5wCxffA8KSvhW2oY4ypdw= k8s.io/apimachinery v0.0.0-20191024025529-62ce3d1e6a82/go.mod h1:92mWDd8Ji2sw2157KIgino5wCxffA8KSvhW2oY4ypdw=
k8s.io/cli-runtime v0.0.0-20191023071533-6ea64d505988/go.mod h1:YsBC8tM6enB7xQtsJQyqnNSmPs59zD9eHwyYwx8d+oA= k8s.io/cli-runtime v0.0.0-20191025031152-0b44683c44df/go.mod h1:dcWX4i/Si3m7qDDh9qaaJh2JtywSDMHm1VmbGLTVPa0=
k8s.io/client-go v0.0.0-20191023065929-d1b30110f1ab/go.mod h1:y+Of49c+rlCjT6r1g6TKjR6qidLLM7A/q8tgcG5yKHA= k8s.io/client-go v0.0.0-20191024105928-464ec5ba048d/go.mod h1:+K5BjTg5qfEYkwjiIK91DS+7n0kKPCTH9MaKrifWOaE=
k8s.io/code-generator v0.0.0-20191017183038-0b22993d207c/go.mod h1:HC9p4y3SBN+txSs8x57qmNPXFZ/CxdCHiDTNnocCSEw= k8s.io/code-generator v0.0.0-20191024065345-575254a8902d/go.mod h1:HC9p4y3SBN+txSs8x57qmNPXFZ/CxdCHiDTNnocCSEw=
k8s.io/component-base v0.0.0-20191023070445-be75e4906c11/go.mod h1:0whsKRUxR9IyxdCJBCWpkSGQqIvhBbzDYvcCkk+yxa0= k8s.io/component-base v0.0.0-20191024230035-ea78290eb325/go.mod h1:Lx8wS8cw8qJB8LTiH3pHoxudYzcaCby8fLWL0n5X5ec=
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20190822140433-26a664648505/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20190822140433-26a664648505/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=

2
pkg/cmd/apiresources/apiresources.go
View File

@ -29,8 +29,8 @@ import (
"k8s.io/apimachinery/pkg/util/errors" "k8s.io/apimachinery/pkg/util/errors"
"k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/sets"
"k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/genericclioptions"
"k8s.io/cli-runtime/pkg/printers"
cmdutil "k8s.io/kubectl/pkg/cmd/util" cmdutil "k8s.io/kubectl/pkg/cmd/util"
"k8s.io/kubectl/pkg/util/printers"
"k8s.io/kubectl/pkg/util/templates" "k8s.io/kubectl/pkg/util/templates"
) )

2
pkg/cmd/config/get_contexts.go
View File

@ -28,11 +28,11 @@ import (
utilerrors "k8s.io/apimachinery/pkg/util/errors" utilerrors "k8s.io/apimachinery/pkg/util/errors"
"k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/sets"
"k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/genericclioptions"
"k8s.io/cli-runtime/pkg/printers"
"k8s.io/client-go/tools/clientcmd" "k8s.io/client-go/tools/clientcmd"
clientcmdapi "k8s.io/client-go/tools/clientcmd/api" clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
cmdutil "k8s.io/kubectl/pkg/cmd/util" cmdutil "k8s.io/kubectl/pkg/cmd/util"
"k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/i18n"
"k8s.io/kubectl/pkg/util/printers"
"k8s.io/kubectl/pkg/util/templates" "k8s.io/kubectl/pkg/util/templates"
) )

2
pkg/metricsutil/metrics_printer.go
View File

@ -23,8 +23,8 @@ import (
"k8s.io/api/core/v1" "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/api/resource"
"k8s.io/cli-runtime/pkg/printers"
"k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/kubernetes/scheme"
"k8s.io/kubectl/pkg/util/printers"
metricsapi "k8s.io/metrics/pkg/apis/metrics" metricsapi "k8s.io/metrics/pkg/apis/metrics"
) )

36
pkg/util/printers/tabwriter.go
View File

@ -1,36 +0,0 @@
/*
Copyright 2018 The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package printers
import (
"io"
"github.com/liggitt/tabwriter"
)
const (
tabwriterMinWidth = 6
tabwriterWidth = 4
tabwriterPadding = 3
tabwriterPadChar = ' '
tabwriterFlags = tabwriter.RememberWidths
)
// GetNewTabWriter returns a tabwriter that translates tabbed columns in input into properly aligned text.
func GetNewTabWriter(output io.Writer) *tabwriter.Writer {
return tabwriter.NewWriter(output, tabwriterMinWidth, tabwriterWidth, tabwriterPadding, tabwriterPadChar, tabwriterFlags)
}