github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 03:41:45 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #32504 from kargakis/top-pod-fixes

Browse Source 
Automatic merge from submit-queue

kubectl: run validation for 'top pod'

@mksalawa @kubernetes/kubectl
This commit is contained in:
Kubernetes Submit Queue 2016-09-14 05:35:42 -07:00 committed by GitHub
commit 33e5b0e0db
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/kubectl/cmd/top_node.go
View File

@ -122,6 +122,9 @@ func (o TopNodeOptions) RunTopNode() error {
if err != nil {
return err
}
if len(metrics) == 0 {
return errors.New("metrics not available yet")
}
var nodes []api.Node
if len(o.ResourceName) > 0 {

3
pkg/kubectl/cmd/top_pod.go
View File

@ -81,6 +81,9 @@ func NewCmdTopPod(f *cmdutil.Factory, out io.Writer) *cobra.Command {
if err := options.Complete(f, cmd, args, out); err != nil {
cmdutil.CheckErr(err)
}
if err := options.Validate(); err != nil {
cmdutil.CheckErr(cmdutil.UsageError(cmd, err.Error()))
}
if err := options.RunTopPod(); err != nil {
cmdutil.CheckErr(err)
}