From dda7e2758f696877a1817879df205a93c600996a Mon Sep 17 00:00:00 2001 From: juanvallejo Date: Wed, 6 Sep 2017 18:07:24 -0400 Subject: [PATCH] acknowledge --show-all=false with --watch --- pkg/kubectl/cmd/get.go | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pkg/kubectl/cmd/get.go b/pkg/kubectl/cmd/get.go index 5ee488f3ad..3784898075 100644 --- a/pkg/kubectl/cmd/get.go +++ b/pkg/kubectl/cmd/get.go @@ -278,8 +278,12 @@ func RunGet(f cmdutil.Factory, out, errOut io.Writer, cmd *cobra.Command, args [ objsToPrint = append(objsToPrint, obj) } for _, objToPrint := range objsToPrint { - if err := printer.PrintObj(objToPrint, writer); err != nil { - return fmt.Errorf("unable to output the provided object: %v", err) + if isFiltered, err := filterFuncs.Filter(objToPrint, filterOpts); !isFiltered { + if err != nil { + glog.V(2).Infof("Unable to filter resource: %v", err) + } else if err := printer.PrintObj(objToPrint, writer); err != nil { + return fmt.Errorf("unable to output the provided object: %v", err) + } } } writer.Flush() @@ -300,7 +304,15 @@ func RunGet(f cmdutil.Factory, out, errOut io.Writer, cmd *cobra.Command, args [ first = false return false, nil } - return false, printer.PrintObj(e.Object, out) + + if isFiltered, err := filterFuncs.Filter(e.Object, filterOpts); !isFiltered { + if err != nil { + glog.V(2).Infof("Unable to filter resource: %v", err) + } else if err := printer.PrintObj(e.Object, out); err != nil { + return false, err + } + } + return false, nil }) return err })