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
51b0def4
Commit
51b0def4
authored
Oct 07, 2015
by
Brendan Burns
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix the custom column and sorting printers for v1.List
parent
deb3514c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
1 deletion
+22
-1
custom_column_printer.go
pkg/kubectl/custom_column_printer.go
+8
-0
sorting_printer.go
pkg/kubectl/sorting_printer.go
+14
-1
No files found.
pkg/kubectl/custom_column_printer.go
View file @
51b0def4
...
@@ -26,6 +26,7 @@ import (
...
@@ -26,6 +26,7 @@ import (
"strings"
"strings"
"text/tabwriter"
"text/tabwriter"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/util/jsonpath"
"k8s.io/kubernetes/pkg/util/jsonpath"
)
)
...
@@ -187,6 +188,13 @@ func (s *CustomColumnsPrinter) PrintObj(obj runtime.Object, out io.Writer) error
...
@@ -187,6 +188,13 @@ func (s *CustomColumnsPrinter) PrintObj(obj runtime.Object, out io.Writer) error
func
(
s
*
CustomColumnsPrinter
)
printOneObject
(
obj
runtime
.
Object
,
parsers
[]
*
jsonpath
.
JSONPath
,
out
io
.
Writer
)
error
{
func
(
s
*
CustomColumnsPrinter
)
printOneObject
(
obj
runtime
.
Object
,
parsers
[]
*
jsonpath
.
JSONPath
,
out
io
.
Writer
)
error
{
columns
:=
make
([]
string
,
len
(
parsers
))
columns
:=
make
([]
string
,
len
(
parsers
))
switch
u
:=
obj
.
(
type
)
{
case
*
runtime
.
Unknown
:
var
err
error
if
obj
,
err
=
api
.
Codec
.
Decode
(
u
.
RawJSON
);
err
!=
nil
{
return
err
}
}
for
ix
:=
range
parsers
{
for
ix
:=
range
parsers
{
parser
:=
parsers
[
ix
]
parser
:=
parsers
[
ix
]
values
,
err
:=
parser
.
FindResults
(
reflect
.
ValueOf
(
obj
)
.
Elem
()
.
Interface
())
values
,
err
:=
parser
.
FindResults
(
reflect
.
ValueOf
(
obj
)
.
Elem
()
.
Interface
())
...
...
pkg/kubectl/sorting_printer.go
View file @
51b0def4
...
@@ -22,9 +22,11 @@ import (
...
@@ -22,9 +22,11 @@ import (
"reflect"
"reflect"
"sort"
"sort"
"
github.com/golang/glog
"
"
k8s.io/kubernetes/pkg/api
"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/util/jsonpath"
"k8s.io/kubernetes/pkg/util/jsonpath"
"github.com/golang/glog"
)
)
// Sorting printer sorts list types before delegating to another printer.
// Sorting printer sorts list types before delegating to another printer.
...
@@ -61,6 +63,17 @@ func (s *SortingPrinter) sortObj(obj runtime.Object) error {
...
@@ -61,6 +63,17 @@ func (s *SortingPrinter) sortObj(obj runtime.Object) error {
}
}
parser
:=
jsonpath
.
New
(
"sorting"
)
parser
:=
jsonpath
.
New
(
"sorting"
)
parser
.
Parse
(
s
.
SortField
)
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
())
values
,
err
:=
parser
.
FindResults
(
reflect
.
ValueOf
(
objs
[
0
])
.
Elem
()
.
Interface
())
if
err
!=
nil
{
if
err
!=
nil
{
return
err
return
err
...
...
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