fix manifest sorting with Namespace & Unknown

pull/3643/head
Patrick Hemmer 8 years ago
parent b372547a56
commit 6619697970

@ -120,6 +120,13 @@ func (k *kindSorter) Less(i, j int) bool {
b := k.manifests[j] b := k.manifests[j]
first, aok := k.ordering[a.Head.Kind] first, aok := k.ordering[a.Head.Kind]
second, bok := k.ordering[b.Head.Kind] second, bok := k.ordering[b.Head.Kind]
// unknown kind is last
if aok && !bok {
return true
}
if bok && !aok {
return false
}
// if same kind (including unknown) sub sort alphanumeric // if same kind (including unknown) sub sort alphanumeric
if first == second { if first == second {
// if both are unknown and of different kind sort by kind alphabetically // if both are unknown and of different kind sort by kind alphabetically
@ -128,13 +135,6 @@ func (k *kindSorter) Less(i, j int) bool {
} }
return a.Name < b.Name return a.Name < b.Name
} }
// unknown kind is last
if !aok {
return false
}
if !bok {
return true
}
// sort different kinds // sort different kinds
return first < second return first < second
} }

Loading…
Cancel
Save