From 283e8ad3f461d03d9a7c46596ce8ec1a84138af7 Mon Sep 17 00:00:00 2001 From: Solly Ross Date: Thu, 2 Aug 2018 15:17:02 -0400 Subject: [PATCH] UPSTREAM: 66931: Use the passed-in streams in kubectl top --- vendor/k8s.io/kubernetes/pkg/kubectl/cmd/top_node.go | 5 +++++ vendor/k8s.io/kubernetes/pkg/kubectl/cmd/top_pod.go | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/top_node.go b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/top_node.go index 5922e78fa408..2e079d898a36 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/top_node.go +++ b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/top_node.go @@ -98,6 +98,11 @@ func NewCmdTopNode(f cmdutil.Factory, o *TopNodeOptions, streams genericclioptio } } + // actually make use of the passed in streams if not already set + if (o.IOStreams == genericclioptions.IOStreams{}) { + o.IOStreams = streams + } + cmd := &cobra.Command{ Use: "node [NAME | -l label]", DisableFlagsInUseLine: true, diff --git a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/top_pod.go b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/top_pod.go index b63dde44ebf4..d627827b2c80 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/top_pod.go +++ b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/top_pod.go @@ -87,6 +87,11 @@ func NewCmdTopPod(f cmdutil.Factory, o *TopPodOptions, streams genericclioptions } } + // actually make use of the passed in streams if not already set + if (o.IOStreams == genericclioptions.IOStreams{}) { + o.IOStreams = streams + } + cmd := &cobra.Command{ Use: "pod [NAME | -l label]", DisableFlagsInUseLine: true,