Skip to content

Commit 53e55d3

Browse files
committed
Make sorting printer sort tables in place
1 parent 7013827 commit 53e55d3

File tree

1 file changed

+18
-4
lines changed

1 file changed

+18
-4
lines changed

pkg/kubectl/cmd/get/sorter.go

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,27 @@ type SortingPrinter struct {
4646
}
4747

4848
func (s *SortingPrinter) PrintObj(obj runtime.Object, out io.Writer) error {
49-
if !meta.IsListType(obj) {
50-
return s.Delegate.PrintObj(obj, out)
49+
if table, isTable := obj.(*metav1beta1.Table); isTable && len(table.Rows) > 1 {
50+
parsedField, err := RelaxedJSONPathExpression(s.SortField)
51+
if err != nil {
52+
parsedField = s.SortField
53+
}
54+
55+
if sorter, err := NewTableSorter(table, parsedField); err != nil {
56+
return err
57+
} else if err := sorter.Sort(); err != nil {
58+
return err
59+
}
60+
return s.Delegate.PrintObj(table, out)
5161
}
5262

53-
if err := s.sortObj(obj); err != nil {
54-
return err
63+
if meta.IsListType(obj) {
64+
if err := s.sortObj(obj); err != nil {
65+
return err
66+
}
67+
return s.Delegate.PrintObj(obj, out)
5568
}
69+
5670
return s.Delegate.PrintObj(obj, out)
5771
}
5872

0 commit comments

Comments
 (0)