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

Merge pull request #83247 from dfang/master 

Fix help text in kubectl top -h

Kubernetes-commit: 82875580722ddc67db19cb1f5a364fc698eabc2b
This commit is contained in:
Kubernetes Publisher 2019-10-04 21:51:11 -07:00
parent b7334fe99b 28ba3d4e95
commit ff3023b90a
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Godeps/Godeps.json generated
View File

@ -588,7 +588,7 @@
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "c31ffd88d5d2"
"Rev": "ddf2ae2c32b1"
},
{
"ImportPath": "k8s.io/cli-runtime",
@ -596,7 +596,7 @@
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "a746c2f219b7"
"Rev": "ec28f1ce4612"
},
{
"ImportPath": "k8s.io/code-generator",

8
go.mod
View File

@ -36,9 +36,9 @@ require (
gopkg.in/yaml.v2 v2.2.4
gotest.tools v2.2.0+incompatible // indirect
k8s.io/api v0.0.0-20191003035645-10e821c09743
k8s.io/apimachinery v0.0.0-20191003115452-c31ffd88d5d2
k8s.io/apimachinery v0.0.0-20191004235459-ddf2ae2c32b1
k8s.io/cli-runtime v0.0.0-20191003041604-10fd5aad9108
k8s.io/client-go v0.0.0-20191003035859-a746c2f219b7
k8s.io/client-go v0.0.0-20191004155830-ec28f1ce4612
k8s.io/component-base v0.0.0-20191003040350-be468d5d6790
k8s.io/klog v1.0.0
k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf
@ -57,9 +57,9 @@ replace (
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
k8s.io/api => k8s.io/api v0.0.0-20191003035645-10e821c09743
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191003115452-c31ffd88d5d2
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191004235459-ddf2ae2c32b1
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20191003041604-10fd5aad9108
k8s.io/client-go => k8s.io/client-go v0.0.0-20191003035859-a746c2f219b7
k8s.io/client-go => k8s.io/client-go v0.0.0-20191004155830-ec28f1ce4612
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20191003035328-700b1226c0bd
k8s.io/component-base => k8s.io/component-base v0.0.0-20191003040350-be468d5d6790
k8s.io/metrics => k8s.io/metrics v0.0.0-20191003041506-c6bb51c85f6a

4
go.sum
View File

@ -291,9 +291,9 @@ gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81
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=
k8s.io/api v0.0.0-20191003035645-10e821c09743/go.mod h1:uO3sqSrudYAYLDvkW5ph6lZtwlcN7mUlfE80fNPY8EE=
k8s.io/apimachinery v0.0.0-20191003115452-c31ffd88d5d2/go.mod h1:3rOMKKJmoWw7dJkRxGjW26hYSWvYV5nrieoTsmWq1jw=
k8s.io/apimachinery v0.0.0-20191004235459-ddf2ae2c32b1/go.mod h1:3rOMKKJmoWw7dJkRxGjW26hYSWvYV5nrieoTsmWq1jw=
k8s.io/cli-runtime v0.0.0-20191003041604-10fd5aad9108/go.mod h1:OSUtt+ONh4/GRMqj5NIVS5pF+NB9M493k8d1qjcllK8=
k8s.io/client-go v0.0.0-20191003035859-a746c2f219b7/go.mod h1:6LOleLJHIuJ9sIFNLPjRLTsWNYHk6MyS9VawVsBRe4g=
k8s.io/client-go v0.0.0-20191004155830-ec28f1ce4612/go.mod h1:nwj3l1FQWg7Ycypr0waiwyM2RZZJhgPQDgzhD0/oypE=
k8s.io/code-generator v0.0.0-20191003035328-700b1226c0bd/go.mod h1:HC9p4y3SBN+txSs8x57qmNPXFZ/CxdCHiDTNnocCSEw=
k8s.io/component-base v0.0.0-20191003040350-be468d5d6790/go.mod h1:9mA4uQCNQ0qIetCGWbprquCMokZ5N5FDKDtftfE8bXU=
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=

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

@ -41,7 +41,7 @@ var (
The top command allows you to see the resource consumption for nodes or pods.
This command requires Heapster to be correctly configured and working on the server. `))
This command requires Metrics Server to be correctly configured and working on the server. `))
)
func NewCmdTop(f cmdutil.Factory, streams genericclioptions.IOStreams) *cobra.Command {