From 4787dca073b6cfdba658d7e51dd01ac6444371e3 Mon Sep 17 00:00:00 2001 From: Michail Kargakis Date: Mon, 12 Sep 2016 17:59:31 +0200 Subject: [PATCH] kubectl: run validation for 'top pod' --- pkg/kubectl/cmd/top_node.go | 3 +++ pkg/kubectl/cmd/top_pod.go | 3 +++ 2 files changed, 6 insertions(+) diff --git a/pkg/kubectl/cmd/top_node.go b/pkg/kubectl/cmd/top_node.go index b685b5649e..b0b676669c 100644 --- a/pkg/kubectl/cmd/top_node.go +++ b/pkg/kubectl/cmd/top_node.go @@ -119,6 +119,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 { diff --git a/pkg/kubectl/cmd/top_pod.go b/pkg/kubectl/cmd/top_pod.go index c254979158..973abd7185 100644 --- a/pkg/kubectl/cmd/top_pod.go +++ b/pkg/kubectl/cmd/top_pod.go @@ -79,6 +79,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) }