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

Use natural sorting for strings in sorting_printer

Browse Source 
Import new dependency vbom.ml/util/sortorder
Run ./hack/update-bazel.sh
This commit is contained in:
Matthias Bertschy
2017-02-28 07:50:44 +01:00
parent 2681e38d3a
commit 336a78aeaf
9 changed files with 147 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/kubectl/sorting_printer.go
View File

@@ -32,6 +32,8 @@ import (
"k8s.io/client-go/util/jsonpath"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/printers"
"vbom.ml/util/sortorder"
)
// Sorting printer sorts list types before delegating to another printer.
@@ -175,7 +177,7 @@ func isLess(i, j reflect.Value) (bool, error) {
case reflect.Float32, reflect.Float64:
return i.Float() < j.Float(), nil
case reflect.String:
return i.String() < j.String(), nil
return sortorder.NaturalLess(i.String(), j.String()), nil
case reflect.Ptr:
return isLess(i.Elem(), j.Elem())
case reflect.Struct:
@@ -254,7 +256,7 @@ func isLess(i, j reflect.Value) (bool, error) {
}
case string:
if jtype, ok := j.Interface().(string); ok {
return itype < jtype, nil
return sortorder.NaturalLess(itype, jtype), nil
}
default:
return false, fmt.Errorf("unsortable type: %T", itype)