Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
09d4d5ed
Commit
09d4d5ed
authored
May 01, 2016
by
zhouhaibing089
Committed by
haibzhou
May 02, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
let type struct,array,slice also being considerred when sorting kubectl output
parent
b930d58f
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
91 additions
and
0 deletions
+91
-0
test-cmd.sh
hack/test-cmd.sh
+1
-0
sorting_printer.go
pkg/kubectl/sorting_printer.go
+47
-0
sorting_printer_test.go
pkg/kubectl/sorting_printer_test.go
+43
-0
No files found.
hack/test-cmd.sh
View file @
09d4d5ed
...
@@ -1781,6 +1781,7 @@ __EOF__
...
@@ -1781,6 +1781,7 @@ __EOF__
kube::test::get_object_assert pods
"{{range.items}}{{
$id_field
}}:{{end}}"
''
kube::test::get_object_assert pods
"{{range.items}}{{
$id_field
}}:{{end}}"
''
# Command
# Command
kubectl get pods
--sort-by
=
"{metadata.name}"
kubectl get pods
--sort-by
=
"{metadata.name}"
kubectl get pods
--sort-by
=
"{metadata.creationTimestamp}"
############################
############################
# Kubectl --all-namespaces #
# Kubectl --all-namespaces #
...
...
pkg/kubectl/sorting_printer.go
View file @
09d4d5ed
...
@@ -23,8 +23,10 @@ import (
...
@@ -23,8 +23,10 @@ import (
"sort"
"sort"
"k8s.io/kubernetes/pkg/api/meta"
"k8s.io/kubernetes/pkg/api/meta"
"k8s.io/kubernetes/pkg/api/unversioned"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/util/integer"
"k8s.io/kubernetes/pkg/util/jsonpath"
"k8s.io/kubernetes/pkg/util/jsonpath"
"github.com/golang/glog"
"github.com/golang/glog"
...
@@ -153,11 +155,56 @@ func isLess(i, j reflect.Value) (bool, error) {
...
@@ -153,11 +155,56 @@ func isLess(i, j reflect.Value) (bool, error) {
return
i
.
String
()
<
j
.
String
(),
nil
return
i
.
String
()
<
j
.
String
(),
nil
case
reflect
.
Ptr
:
case
reflect
.
Ptr
:
return
isLess
(
i
.
Elem
(),
j
.
Elem
())
return
isLess
(
i
.
Elem
(),
j
.
Elem
())
case
reflect
.
Struct
:
// special case handling
lessFuncList
:=
[]
structLessFunc
{
timeLess
}
if
ok
,
less
:=
structLess
(
i
,
j
,
lessFuncList
);
ok
{
return
less
,
nil
}
// fallback to the fields comparision
for
idx
:=
0
;
idx
<
i
.
NumField
();
idx
++
{
less
,
err
:=
isLess
(
i
.
Field
(
idx
),
j
.
Field
(
idx
))
if
err
!=
nil
||
!
less
{
return
less
,
err
}
}
return
true
,
nil
case
reflect
.
Array
,
reflect
.
Slice
:
// note: the length of i and j may be different
for
idx
:=
0
;
idx
<
integer
.
IntMin
(
i
.
Len
(),
j
.
Len
());
idx
++
{
less
,
err
:=
isLess
(
i
.
Index
(
idx
),
j
.
Index
(
idx
))
if
err
!=
nil
||
!
less
{
return
less
,
err
}
}
return
true
,
nil
default
:
default
:
return
false
,
fmt
.
Errorf
(
"unsortable type: %v"
,
i
.
Kind
())
return
false
,
fmt
.
Errorf
(
"unsortable type: %v"
,
i
.
Kind
())
}
}
}
}
// structLessFunc checks whether i and j could be compared(the first return value),
// and if it could, return whether i is less than j(the second return value)
type
structLessFunc
func
(
i
,
j
reflect
.
Value
)
(
bool
,
bool
)
// structLess returns whether i and j could be compared with the given function list
func
structLess
(
i
,
j
reflect
.
Value
,
lessFuncList
[]
structLessFunc
)
(
bool
,
bool
)
{
for
_
,
lessFunc
:=
range
lessFuncList
{
if
ok
,
less
:=
lessFunc
(
i
,
j
);
ok
{
return
ok
,
less
}
}
return
false
,
false
}
// compare two unversioned.Time values.
func
timeLess
(
i
,
j
reflect
.
Value
)
(
bool
,
bool
)
{
if
i
.
Type
()
!=
reflect
.
TypeOf
(
unversioned
.
Unix
(
0
,
0
))
{
return
false
,
false
}
return
true
,
i
.
MethodByName
(
"Before"
)
.
Call
([]
reflect
.
Value
{
j
})[
0
]
.
Bool
()
}
func
(
r
*
RuntimeSort
)
Less
(
i
,
j
int
)
bool
{
func
(
r
*
RuntimeSort
)
Less
(
i
,
j
int
)
bool
{
iObj
:=
r
.
objs
[
i
]
iObj
:=
r
.
objs
[
i
]
jObj
:=
r
.
objs
[
j
]
jObj
:=
r
.
objs
[
j
]
...
...
pkg/kubectl/sorting_printer_test.go
View file @
09d4d5ed
...
@@ -21,6 +21,7 @@ import (
...
@@ -21,6 +21,7 @@ import (
"testing"
"testing"
internal
"k8s.io/kubernetes/pkg/api"
internal
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/unversioned"
api
"k8s.io/kubernetes/pkg/api/v1"
api
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/runtime"
)
)
...
@@ -145,6 +146,48 @@ func TestSortingPrinter(t *testing.T) {
...
@@ -145,6 +146,48 @@ func TestSortingPrinter(t *testing.T) {
field
:
"{.metadata.name}"
,
field
:
"{.metadata.name}"
,
},
},
{
{
name
:
"random-order-timestamp"
,
obj
:
&
api
.
PodList
{
Items
:
[]
api
.
Pod
{
{
ObjectMeta
:
api
.
ObjectMeta
{
CreationTimestamp
:
unversioned
.
Unix
(
300
,
0
),
},
},
{
ObjectMeta
:
api
.
ObjectMeta
{
CreationTimestamp
:
unversioned
.
Unix
(
100
,
0
),
},
},
{
ObjectMeta
:
api
.
ObjectMeta
{
CreationTimestamp
:
unversioned
.
Unix
(
200
,
0
),
},
},
},
},
sort
:
&
api
.
PodList
{
Items
:
[]
api
.
Pod
{
{
ObjectMeta
:
api
.
ObjectMeta
{
CreationTimestamp
:
unversioned
.
Unix
(
100
,
0
),
},
},
{
ObjectMeta
:
api
.
ObjectMeta
{
CreationTimestamp
:
unversioned
.
Unix
(
200
,
0
),
},
},
{
ObjectMeta
:
api
.
ObjectMeta
{
CreationTimestamp
:
unversioned
.
Unix
(
300
,
0
),
},
},
},
},
field
:
"{.metadata.creationTimestamp}"
,
},
{
name
:
"random-order-numbers"
,
name
:
"random-order-numbers"
,
obj
:
&
api
.
ReplicationControllerList
{
obj
:
&
api
.
ReplicationControllerList
{
Items
:
[]
api
.
ReplicationController
{
Items
:
[]
api
.
ReplicationController
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment