Fix the custom column and sorting printers for v1.List

This commit is contained in:
Brendan Burns
2015-10-07 16:00:00 -07:00
parent deb3514c02
commit 51b0def44f
2 changed files with 22 additions and 1 deletions

View File

@@ -22,9 +22,11 @@ import (
"reflect"
"sort"
"github.com/golang/glog"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/util/jsonpath"
"github.com/golang/glog"
)
// Sorting printer sorts list types before delegating to another printer.
@@ -61,6 +63,17 @@ func (s *SortingPrinter) sortObj(obj runtime.Object) error {
}
parser := jsonpath.New("sorting")
parser.Parse(s.SortField)
for ix := range objs {
item := objs[ix]
switch u := item.(type) {
case *runtime.Unknown:
var err error
if objs[ix], err = api.Codec.Decode(u.RawJSON); err != nil {
return err
}
}
}
values, err := parser.FindResults(reflect.ValueOf(objs[0]).Elem().Interface())
if err != nil {
return err