github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 07:27:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #42285 from liggitt/get-watch

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 41919, 41149, 42350, 42351, 42285)

Fix error printing objects from kubectl get -w

Fixes #42276
This commit is contained in:
Kubernetes Submit Queue
2017-03-03 16:44:45 -08:00
committed by GitHub
parent 346c0ba993 31b3e01f1e
commit f7c07a121d
7 changed files with 70 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/kubectl/cmd/get.go
View File

@@ -251,8 +251,16 @@ func RunGet(f cmdutil.Factory, out, errOut io.Writer, cmd *cobra.Command, args [
// print the current object
filteredResourceCount := 0
if !isWatchOnly {
if err := printer.PrintObj(obj, out); err != nil {
return fmt.Errorf("unable to output the provided object: %v", err)
var objsToPrint []runtime.Object
if isList {
objsToPrint, _ = meta.ExtractList(obj)
} else {
objsToPrint = append(objsToPrint, obj)
}
for _, objToPrint := range objsToPrint {
if err := printer.PrintObj(objToPrint, out); err != nil {
return fmt.Errorf("unable to output the provided object: %v", err)
}
}
filteredResourceCount++
cmdutil.PrintFilterCount(filteredResourceCount, mapping.Resource, filterOpts)