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
abfc5bbb
Commit
abfc5bbb
authored
Apr 16, 2019
by
Sean Sullivan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename TablePrinter interface to TableGenerator
parent
e8fc79da
Show whitespace changes
Inline
Side-by-side
Showing
35 changed files
with
62 additions
and
62 deletions
+62
-62
humanreadable.go
pkg/printers/humanreadable.go
+6
-6
printers_test.go
pkg/printers/internalversion/printers_test.go
+22
-22
storage.go
pkg/printers/storage/storage.go
+2
-2
storage.go
pkg/registry/apps/controllerrevision/storage/storage.go
+1
-1
storage.go
pkg/registry/apps/daemonset/storage/storage.go
+1
-1
storage.go
pkg/registry/apps/deployment/storage/storage.go
+1
-1
storage.go
pkg/registry/apps/replicaset/storage/storage.go
+1
-1
storage.go
pkg/registry/apps/statefulset/storage/storage.go
+1
-1
storage.go
...ry/autoscaling/horizontalpodautoscaler/storage/storage.go
+1
-1
storage.go
pkg/registry/batch/cronjob/storage/storage.go
+1
-1
storage.go
pkg/registry/batch/job/storage/storage.go
+1
-1
storage.go
pkg/registry/certificates/certificates/storage/storage.go
+1
-1
storage.go
pkg/registry/coordination/lease/storage/storage.go
+1
-1
storage.go
pkg/registry/core/configmap/storage/storage.go
+1
-1
storage.go
pkg/registry/core/endpoint/storage/storage.go
+1
-1
storage.go
pkg/registry/core/event/storage/storage.go
+1
-1
storage.go
pkg/registry/core/namespace/storage/storage.go
+1
-1
storage.go
pkg/registry/core/node/storage/storage.go
+1
-1
storage.go
pkg/registry/core/persistentvolume/storage/storage.go
+1
-1
storage.go
pkg/registry/core/persistentvolumeclaim/storage/storage.go
+1
-1
storage.go
pkg/registry/core/pod/storage/storage.go
+1
-1
storage.go
pkg/registry/core/podtemplate/storage/storage.go
+1
-1
storage.go
pkg/registry/core/replicationcontroller/storage/storage.go
+1
-1
storage.go
pkg/registry/core/secret/storage/storage.go
+1
-1
storage.go
pkg/registry/core/service/storage/storage.go
+1
-1
storage.go
pkg/registry/core/serviceaccount/storage/storage.go
+1
-1
storage.go
pkg/registry/networking/ingress/storage/storage.go
+1
-1
storage.go
pkg/registry/networking/networkpolicy/storage/storage.go
+1
-1
storage.go
pkg/registry/policy/poddisruptionbudget/storage/storage.go
+1
-1
storage.go
pkg/registry/policy/podsecuritypolicy/storage/storage.go
+1
-1
storage.go
pkg/registry/rbac/clusterrolebinding/storage/storage.go
+1
-1
storage.go
pkg/registry/rbac/rolebinding/storage/storage.go
+1
-1
storage.go
pkg/registry/scheduling/priorityclass/storage/storage.go
+1
-1
storage.go
pkg/registry/storage/storageclass/storage/storage.go
+1
-1
storage.go
pkg/registry/storage/volumeattachment/storage/storage.go
+1
-1
No files found.
pkg/printers/humanreadable.go
View file @
abfc5bbb
...
@@ -34,8 +34,8 @@ import (
...
@@ -34,8 +34,8 @@ import (
utilruntime
"k8s.io/apimachinery/pkg/util/runtime"
utilruntime
"k8s.io/apimachinery/pkg/util/runtime"
)
)
type
Table
Printe
r
interface
{
type
Table
Generato
r
interface
{
Print
Table
(
obj
runtime
.
Object
,
options
PrintOptions
)
(
*
metav1beta1
.
Table
,
error
)
Generate
Table
(
obj
runtime
.
Object
,
options
PrintOptions
)
(
*
metav1beta1
.
Table
,
error
)
}
}
type
PrintHandler
interface
{
type
PrintHandler
interface
{
...
@@ -75,8 +75,8 @@ func NewHumanReadablePrinter(options PrintOptions) *HumanReadablePrinter {
...
@@ -75,8 +75,8 @@ func NewHumanReadablePrinter(options PrintOptions) *HumanReadablePrinter {
return
printer
return
printer
}
}
// NewTable
Printer creates a HumanReadablePrinter suitable for calling Print
Table().
// NewTable
Generator creates a HumanReadablePrinter suitable for calling Generate
Table().
func
NewTable
Printe
r
()
*
HumanReadablePrinter
{
func
NewTable
Generato
r
()
*
HumanReadablePrinter
{
return
&
HumanReadablePrinter
{
return
&
HumanReadablePrinter
{
handlerMap
:
make
(
map
[
reflect
.
Type
]
*
handlerEntry
),
handlerMap
:
make
(
map
[
reflect
.
Type
]
*
handlerEntry
),
}
}
...
@@ -445,10 +445,10 @@ func DecorateTable(table *metav1beta1.Table, options PrintOptions) error {
...
@@ -445,10 +445,10 @@ func DecorateTable(table *metav1beta1.Table, options PrintOptions) error {
return
nil
return
nil
}
}
//
Print
Table returns a table for the provided object, using the printer registered for that type. It returns
//
Generate
Table returns a table for the provided object, using the printer registered for that type. It returns
// a table that includes all of the information requested by options, but will not remove rows or columns. The
// a table that includes all of the information requested by options, but will not remove rows or columns. The
// caller is responsible for applying rules related to filtering rows or columns.
// caller is responsible for applying rules related to filtering rows or columns.
func
(
h
*
HumanReadablePrinter
)
Print
Table
(
obj
runtime
.
Object
,
options
PrintOptions
)
(
*
metav1beta1
.
Table
,
error
)
{
func
(
h
*
HumanReadablePrinter
)
Generate
Table
(
obj
runtime
.
Object
,
options
PrintOptions
)
(
*
metav1beta1
.
Table
,
error
)
{
t
:=
reflect
.
TypeOf
(
obj
)
t
:=
reflect
.
TypeOf
(
obj
)
handler
,
ok
:=
h
.
handlerMap
[
t
]
handler
,
ok
:=
h
.
handlerMap
[
t
]
if
!
ok
{
if
!
ok
{
...
...
pkg/printers/internalversion/printers_test.go
View file @
abfc5bbb
...
@@ -1094,7 +1094,7 @@ func TestPrintHunmanReadableIngressWithColumnLabels(t *testing.T) {
...
@@ -1094,7 +1094,7 @@ func TestPrintHunmanReadableIngressWithColumnLabels(t *testing.T) {
},
},
}
}
buff
:=
bytes
.
NewBuffer
([]
byte
{})
buff
:=
bytes
.
NewBuffer
([]
byte
{})
table
,
err
:=
printers
.
NewTable
Printer
()
.
With
(
AddHandlers
)
.
Print
Table
(
&
ingress
,
printers
.
PrintOptions
{
ColumnLabels
:
[]
string
{
"app_name"
}})
table
,
err
:=
printers
.
NewTable
Generator
()
.
With
(
AddHandlers
)
.
Generate
Table
(
&
ingress
,
printers
.
PrintOptions
{
ColumnLabels
:
[]
string
{
"app_name"
}})
if
err
!=
nil
{
if
err
!=
nil
{
t
.
Fatal
(
err
)
t
.
Fatal
(
err
)
}
}
...
@@ -1228,7 +1228,7 @@ func TestPrintHumanReadableService(t *testing.T) {
...
@@ -1228,7 +1228,7 @@ func TestPrintHumanReadableService(t *testing.T) {
for
_
,
svc
:=
range
tests
{
for
_
,
svc
:=
range
tests
{
for
_
,
wide
:=
range
[]
bool
{
false
,
true
}
{
for
_
,
wide
:=
range
[]
bool
{
false
,
true
}
{
buff
:=
bytes
.
NewBuffer
([]
byte
{})
buff
:=
bytes
.
NewBuffer
([]
byte
{})
table
,
err
:=
printers
.
NewTable
Printer
()
.
With
(
AddHandlers
)
.
Print
Table
(
&
svc
,
printers
.
PrintOptions
{
Wide
:
wide
})
table
,
err
:=
printers
.
NewTable
Generator
()
.
With
(
AddHandlers
)
.
Generate
Table
(
&
svc
,
printers
.
PrintOptions
{
Wide
:
wide
})
if
err
!=
nil
{
if
err
!=
nil
{
t
.
Fatal
(
err
)
t
.
Fatal
(
err
)
}
}
...
@@ -1507,7 +1507,7 @@ func TestPrintPodTable(t *testing.T) {
...
@@ -1507,7 +1507,7 @@ func TestPrintPodTable(t *testing.T) {
}
}
for
i
,
test
:=
range
tests
{
for
i
,
test
:=
range
tests
{
table
,
err
:=
printers
.
NewTable
Printer
()
.
With
(
AddHandlers
)
.
Print
Table
(
test
.
obj
,
printers
.
PrintOptions
{})
table
,
err
:=
printers
.
NewTable
Generator
()
.
With
(
AddHandlers
)
.
Generate
Table
(
test
.
obj
,
printers
.
PrintOptions
{})
if
err
!=
nil
{
if
err
!=
nil
{
t
.
Fatal
(
err
)
t
.
Fatal
(
err
)
}
}
...
@@ -1865,7 +1865,7 @@ func TestPrintNonTerminatedPod(t *testing.T) {
...
@@ -1865,7 +1865,7 @@ func TestPrintNonTerminatedPod(t *testing.T) {
}
}
for
i
,
test
:=
range
tests
{
for
i
,
test
:=
range
tests
{
table
,
err
:=
printers
.
NewTable
Printer
()
.
With
(
AddHandlers
)
.
Print
Table
(
&
test
.
pod
,
printers
.
PrintOptions
{})
table
,
err
:=
printers
.
NewTable
Generator
()
.
With
(
AddHandlers
)
.
Generate
Table
(
&
test
.
pod
,
printers
.
PrintOptions
{})
if
err
!=
nil
{
if
err
!=
nil
{
t
.
Fatal
(
err
)
t
.
Fatal
(
err
)
}
}
...
@@ -1927,7 +1927,7 @@ func TestPrintPodWithLabels(t *testing.T) {
...
@@ -1927,7 +1927,7 @@ func TestPrintPodWithLabels(t *testing.T) {
}
}
for
i
,
test
:=
range
tests
{
for
i
,
test
:=
range
tests
{
table
,
err
:=
printers
.
NewTable
Printer
()
.
With
(
AddHandlers
)
.
Print
Table
(
&
test
.
pod
,
printers
.
PrintOptions
{
ColumnLabels
:
test
.
labelColumns
})
table
,
err
:=
printers
.
NewTable
Generator
()
.
With
(
AddHandlers
)
.
Generate
Table
(
&
test
.
pod
,
printers
.
PrintOptions
{
ColumnLabels
:
test
.
labelColumns
})
if
err
!=
nil
{
if
err
!=
nil
{
t
.
Fatal
(
err
)
t
.
Fatal
(
err
)
}
}
...
@@ -2036,7 +2036,7 @@ func TestPrintDeployment(t *testing.T) {
...
@@ -2036,7 +2036,7 @@ func TestPrintDeployment(t *testing.T) {
buf
:=
bytes
.
NewBuffer
([]
byte
{})
buf
:=
bytes
.
NewBuffer
([]
byte
{})
for
_
,
test
:=
range
tests
{
for
_
,
test
:=
range
tests
{
table
,
err
:=
printers
.
NewTable
Printer
()
.
With
(
AddHandlers
)
.
Print
Table
(
&
test
.
deployment
,
printers
.
PrintOptions
{})
table
,
err
:=
printers
.
NewTable
Generator
()
.
With
(
AddHandlers
)
.
Generate
Table
(
&
test
.
deployment
,
printers
.
PrintOptions
{})
if
err
!=
nil
{
if
err
!=
nil
{
t
.
Fatal
(
err
)
t
.
Fatal
(
err
)
}
}
...
@@ -2048,7 +2048,7 @@ func TestPrintDeployment(t *testing.T) {
...
@@ -2048,7 +2048,7 @@ func TestPrintDeployment(t *testing.T) {
t
.
Fatalf
(
"Expected: %s, got: %s"
,
test
.
expect
,
buf
.
String
())
t
.
Fatalf
(
"Expected: %s, got: %s"
,
test
.
expect
,
buf
.
String
())
}
}
buf
.
Reset
()
buf
.
Reset
()
table
,
err
=
printers
.
NewTable
Printer
()
.
With
(
AddHandlers
)
.
Print
Table
(
&
test
.
deployment
,
printers
.
PrintOptions
{
Wide
:
true
})
table
,
err
=
printers
.
NewTable
Generator
()
.
With
(
AddHandlers
)
.
Generate
Table
(
&
test
.
deployment
,
printers
.
PrintOptions
{
Wide
:
true
})
verifyTable
(
t
,
table
)
verifyTable
(
t
,
table
)
// print deployment with '-o wide' option
// print deployment with '-o wide' option
if
err
:=
printers
.
PrintTable
(
table
,
buf
,
printers
.
PrintOptions
{
Wide
:
true
,
NoHeaders
:
true
});
err
!=
nil
{
if
err
:=
printers
.
PrintTable
(
table
,
buf
,
printers
.
PrintOptions
{
Wide
:
true
,
NoHeaders
:
true
});
err
!=
nil
{
...
@@ -2091,7 +2091,7 @@ func TestPrintDaemonSet(t *testing.T) {
...
@@ -2091,7 +2091,7 @@ func TestPrintDaemonSet(t *testing.T) {
buf
:=
bytes
.
NewBuffer
([]
byte
{})
buf
:=
bytes
.
NewBuffer
([]
byte
{})
for
_
,
test
:=
range
tests
{
for
_
,
test
:=
range
tests
{
table
,
err
:=
printers
.
NewTable
Printer
()
.
With
(
AddHandlers
)
.
Print
Table
(
&
test
.
ds
,
printers
.
PrintOptions
{})
table
,
err
:=
printers
.
NewTable
Generator
()
.
With
(
AddHandlers
)
.
Generate
Table
(
&
test
.
ds
,
printers
.
PrintOptions
{})
if
err
!=
nil
{
if
err
!=
nil
{
t
.
Fatal
(
err
)
t
.
Fatal
(
err
)
}
}
...
@@ -2180,7 +2180,7 @@ func TestPrintJob(t *testing.T) {
...
@@ -2180,7 +2180,7 @@ func TestPrintJob(t *testing.T) {
buf
:=
bytes
.
NewBuffer
([]
byte
{})
buf
:=
bytes
.
NewBuffer
([]
byte
{})
for
_
,
test
:=
range
tests
{
for
_
,
test
:=
range
tests
{
table
,
err
:=
printers
.
NewTable
Printer
()
.
With
(
AddHandlers
)
.
Print
Table
(
&
test
.
job
,
printers
.
PrintOptions
{})
table
,
err
:=
printers
.
NewTable
Generator
()
.
With
(
AddHandlers
)
.
Generate
Table
(
&
test
.
job
,
printers
.
PrintOptions
{})
if
err
!=
nil
{
if
err
!=
nil
{
t
.
Fatal
(
err
)
t
.
Fatal
(
err
)
}
}
...
@@ -2787,7 +2787,7 @@ func TestPrintHPA(t *testing.T) {
...
@@ -2787,7 +2787,7 @@ func TestPrintHPA(t *testing.T) {
buff
:=
bytes
.
NewBuffer
([]
byte
{})
buff
:=
bytes
.
NewBuffer
([]
byte
{})
for
_
,
test
:=
range
tests
{
for
_
,
test
:=
range
tests
{
table
,
err
:=
printers
.
NewTable
Printer
()
.
With
(
AddHandlers
)
.
Print
Table
(
&
test
.
hpa
,
printers
.
PrintOptions
{})
table
,
err
:=
printers
.
NewTable
Generator
()
.
With
(
AddHandlers
)
.
Generate
Table
(
&
test
.
hpa
,
printers
.
PrintOptions
{})
if
err
!=
nil
{
if
err
!=
nil
{
t
.
Fatal
(
err
)
t
.
Fatal
(
err
)
}
}
...
@@ -2850,7 +2850,7 @@ func TestPrintPodShowLabels(t *testing.T) {
...
@@ -2850,7 +2850,7 @@ func TestPrintPodShowLabels(t *testing.T) {
}
}
for
i
,
test
:=
range
tests
{
for
i
,
test
:=
range
tests
{
table
,
err
:=
printers
.
NewTable
Printer
()
.
With
(
AddHandlers
)
.
Print
Table
(
&
test
.
pod
,
printers
.
PrintOptions
{
ShowLabels
:
test
.
showLabels
})
table
,
err
:=
printers
.
NewTable
Generator
()
.
With
(
AddHandlers
)
.
Generate
Table
(
&
test
.
pod
,
printers
.
PrintOptions
{
ShowLabels
:
test
.
showLabels
})
if
err
!=
nil
{
if
err
!=
nil
{
t
.
Fatal
(
err
)
t
.
Fatal
(
err
)
}
}
...
@@ -3017,7 +3017,7 @@ func TestPrintService(t *testing.T) {
...
@@ -3017,7 +3017,7 @@ func TestPrintService(t *testing.T) {
buf
:=
bytes
.
NewBuffer
([]
byte
{})
buf
:=
bytes
.
NewBuffer
([]
byte
{})
for
_
,
test
:=
range
tests
{
for
_
,
test
:=
range
tests
{
table
,
err
:=
printers
.
NewTable
Printer
()
.
With
(
AddHandlers
)
.
Print
Table
(
&
test
.
service
,
printers
.
PrintOptions
{})
table
,
err
:=
printers
.
NewTable
Generator
()
.
With
(
AddHandlers
)
.
Generate
Table
(
&
test
.
service
,
printers
.
PrintOptions
{})
if
err
!=
nil
{
if
err
!=
nil
{
t
.
Fatal
(
err
)
t
.
Fatal
(
err
)
}
}
...
@@ -3075,7 +3075,7 @@ func TestPrintPodDisruptionBudget(t *testing.T) {
...
@@ -3075,7 +3075,7 @@ func TestPrintPodDisruptionBudget(t *testing.T) {
buf
:=
bytes
.
NewBuffer
([]
byte
{})
buf
:=
bytes
.
NewBuffer
([]
byte
{})
for
_
,
test
:=
range
tests
{
for
_
,
test
:=
range
tests
{
table
,
err
:=
printers
.
NewTable
Printer
()
.
With
(
AddHandlers
)
.
Print
Table
(
&
test
.
pdb
,
printers
.
PrintOptions
{})
table
,
err
:=
printers
.
NewTable
Generator
()
.
With
(
AddHandlers
)
.
Generate
Table
(
&
test
.
pdb
,
printers
.
PrintOptions
{})
if
err
!=
nil
{
if
err
!=
nil
{
t
.
Fatal
(
err
)
t
.
Fatal
(
err
)
}
}
...
@@ -3156,7 +3156,7 @@ func TestPrintControllerRevision(t *testing.T) {
...
@@ -3156,7 +3156,7 @@ func TestPrintControllerRevision(t *testing.T) {
buf
:=
bytes
.
NewBuffer
([]
byte
{})
buf
:=
bytes
.
NewBuffer
([]
byte
{})
for
_
,
test
:=
range
tests
{
for
_
,
test
:=
range
tests
{
table
,
err
:=
printers
.
NewTable
Printer
()
.
With
(
AddHandlers
)
.
Print
Table
(
&
test
.
history
,
printers
.
PrintOptions
{})
table
,
err
:=
printers
.
NewTable
Generator
()
.
With
(
AddHandlers
)
.
Generate
Table
(
&
test
.
history
,
printers
.
PrintOptions
{})
if
err
!=
nil
{
if
err
!=
nil
{
t
.
Fatal
(
err
)
t
.
Fatal
(
err
)
}
}
...
@@ -3217,7 +3217,7 @@ func TestPrintReplicaSet(t *testing.T) {
...
@@ -3217,7 +3217,7 @@ func TestPrintReplicaSet(t *testing.T) {
buf
:=
bytes
.
NewBuffer
([]
byte
{})
buf
:=
bytes
.
NewBuffer
([]
byte
{})
for
_
,
test
:=
range
tests
{
for
_
,
test
:=
range
tests
{
table
,
err
:=
printers
.
NewTable
Printer
()
.
With
(
AddHandlers
)
.
Print
Table
(
&
test
.
replicaSet
,
printers
.
PrintOptions
{})
table
,
err
:=
printers
.
NewTable
Generator
()
.
With
(
AddHandlers
)
.
Generate
Table
(
&
test
.
replicaSet
,
printers
.
PrintOptions
{})
if
err
!=
nil
{
if
err
!=
nil
{
t
.
Fatal
(
err
)
t
.
Fatal
(
err
)
}
}
...
@@ -3230,7 +3230,7 @@ func TestPrintReplicaSet(t *testing.T) {
...
@@ -3230,7 +3230,7 @@ func TestPrintReplicaSet(t *testing.T) {
}
}
buf
.
Reset
()
buf
.
Reset
()
table
,
err
=
printers
.
NewTable
Printer
()
.
With
(
AddHandlers
)
.
Print
Table
(
&
test
.
replicaSet
,
printers
.
PrintOptions
{
Wide
:
true
})
table
,
err
=
printers
.
NewTable
Generator
()
.
With
(
AddHandlers
)
.
Generate
Table
(
&
test
.
replicaSet
,
printers
.
PrintOptions
{
Wide
:
true
})
if
err
!=
nil
{
if
err
!=
nil
{
t
.
Fatal
(
err
)
t
.
Fatal
(
err
)
}
}
...
@@ -3329,7 +3329,7 @@ func TestPrintPersistentVolumeClaim(t *testing.T) {
...
@@ -3329,7 +3329,7 @@ func TestPrintPersistentVolumeClaim(t *testing.T) {
}
}
buf
:=
bytes
.
NewBuffer
([]
byte
{})
buf
:=
bytes
.
NewBuffer
([]
byte
{})
for
_
,
test
:=
range
tests
{
for
_
,
test
:=
range
tests
{
table
,
err
:=
printers
.
NewTable
Printer
()
.
With
(
AddHandlers
)
.
Print
Table
(
&
test
.
pvc
,
printers
.
PrintOptions
{})
table
,
err
:=
printers
.
NewTable
Generator
()
.
With
(
AddHandlers
)
.
Generate
Table
(
&
test
.
pvc
,
printers
.
PrintOptions
{})
if
err
!=
nil
{
if
err
!=
nil
{
t
.
Fatal
(
err
)
t
.
Fatal
(
err
)
}
}
...
@@ -3402,7 +3402,7 @@ func TestPrintCronJob(t *testing.T) {
...
@@ -3402,7 +3402,7 @@ func TestPrintCronJob(t *testing.T) {
buf
:=
bytes
.
NewBuffer
([]
byte
{})
buf
:=
bytes
.
NewBuffer
([]
byte
{})
for
_
,
test
:=
range
tests
{
for
_
,
test
:=
range
tests
{
table
,
err
:=
printers
.
NewTable
Printer
()
.
With
(
AddHandlers
)
.
Print
Table
(
&
test
.
cronjob
,
printers
.
PrintOptions
{})
table
,
err
:=
printers
.
NewTable
Generator
()
.
With
(
AddHandlers
)
.
Generate
Table
(
&
test
.
cronjob
,
printers
.
PrintOptions
{})
if
err
!=
nil
{
if
err
!=
nil
{
t
.
Fatal
(
err
)
t
.
Fatal
(
err
)
}
}
...
@@ -3446,7 +3446,7 @@ func TestPrintStorageClass(t *testing.T) {
...
@@ -3446,7 +3446,7 @@ func TestPrintStorageClass(t *testing.T) {
buf
:=
bytes
.
NewBuffer
([]
byte
{})
buf
:=
bytes
.
NewBuffer
([]
byte
{})
for
_
,
test
:=
range
tests
{
for
_
,
test
:=
range
tests
{
table
,
err
:=
printers
.
NewTable
Printer
()
.
With
(
AddHandlers
)
.
Print
Table
(
&
test
.
sc
,
printers
.
PrintOptions
{})
table
,
err
:=
printers
.
NewTable
Generator
()
.
With
(
AddHandlers
)
.
Generate
Table
(
&
test
.
sc
,
printers
.
PrintOptions
{})
if
err
!=
nil
{
if
err
!=
nil
{
t
.
Fatal
(
err
)
t
.
Fatal
(
err
)
}
}
...
@@ -3496,7 +3496,7 @@ func TestPrintLease(t *testing.T) {
...
@@ -3496,7 +3496,7 @@ func TestPrintLease(t *testing.T) {
buf
:=
bytes
.
NewBuffer
([]
byte
{})
buf
:=
bytes
.
NewBuffer
([]
byte
{})
for
_
,
test
:=
range
tests
{
for
_
,
test
:=
range
tests
{
table
,
err
:=
printers
.
NewTable
Printer
()
.
With
(
AddHandlers
)
.
Print
Table
(
&
test
.
sc
,
printers
.
PrintOptions
{})
table
,
err
:=
printers
.
NewTable
Generator
()
.
With
(
AddHandlers
)
.
Generate
Table
(
&
test
.
sc
,
printers
.
PrintOptions
{})
if
err
!=
nil
{
if
err
!=
nil
{
t
.
Fatal
(
err
)
t
.
Fatal
(
err
)
}
}
...
@@ -3540,7 +3540,7 @@ func TestPrintPriorityClass(t *testing.T) {
...
@@ -3540,7 +3540,7 @@ func TestPrintPriorityClass(t *testing.T) {
buf
:=
bytes
.
NewBuffer
([]
byte
{})
buf
:=
bytes
.
NewBuffer
([]
byte
{})
for
_
,
test
:=
range
tests
{
for
_
,
test
:=
range
tests
{
table
,
err
:=
printers
.
NewTable
Printer
()
.
With
(
AddHandlers
)
.
Print
Table
(
&
test
.
pc
,
printers
.
PrintOptions
{})
table
,
err
:=
printers
.
NewTable
Generator
()
.
With
(
AddHandlers
)
.
Generate
Table
(
&
test
.
pc
,
printers
.
PrintOptions
{})
if
err
!=
nil
{
if
err
!=
nil
{
t
.
Fatal
(
err
)
t
.
Fatal
(
err
)
}
}
...
@@ -3584,7 +3584,7 @@ func TestPrintRuntimeClass(t *testing.T) {
...
@@ -3584,7 +3584,7 @@ func TestPrintRuntimeClass(t *testing.T) {
buf
:=
bytes
.
NewBuffer
([]
byte
{})
buf
:=
bytes
.
NewBuffer
([]
byte
{})
for
_
,
test
:=
range
tests
{
for
_
,
test
:=
range
tests
{
table
,
err
:=
printers
.
NewTable
Printer
()
.
With
(
AddHandlers
)
.
Print
Table
(
&
test
.
rc
,
printers
.
PrintOptions
{})
table
,
err
:=
printers
.
NewTable
Generator
()
.
With
(
AddHandlers
)
.
Generate
Table
(
&
test
.
rc
,
printers
.
PrintOptions
{})
if
err
!=
nil
{
if
err
!=
nil
{
t
.
Fatal
(
err
)
t
.
Fatal
(
err
)
}
}
...
...
pkg/printers/storage/storage.go
View file @
abfc5bbb
...
@@ -26,7 +26,7 @@ import (
...
@@ -26,7 +26,7 @@ import (
)
)
type
TableConvertor
struct
{
type
TableConvertor
struct
{
printers
.
Table
Printe
r
printers
.
Table
Generato
r
}
}
func
(
c
TableConvertor
)
ConvertToTable
(
ctx
context
.
Context
,
obj
runtime
.
Object
,
tableOptions
runtime
.
Object
)
(
*
metav1beta1
.
Table
,
error
)
{
func
(
c
TableConvertor
)
ConvertToTable
(
ctx
context
.
Context
,
obj
runtime
.
Object
,
tableOptions
runtime
.
Object
)
(
*
metav1beta1
.
Table
,
error
)
{
...
@@ -41,5 +41,5 @@ func (c TableConvertor) ConvertToTable(ctx context.Context, obj runtime.Object,
...
@@ -41,5 +41,5 @@ func (c TableConvertor) ConvertToTable(ctx context.Context, obj runtime.Object,
return
nil
,
fmt
.
Errorf
(
"unrecognized type %T for table options, can't display tabular output"
,
tableOptions
)
return
nil
,
fmt
.
Errorf
(
"unrecognized type %T for table options, can't display tabular output"
,
tableOptions
)
}
}
}
}
return
c
.
Table
Printer
.
Print
Table
(
obj
,
printers
.
PrintOptions
{
Wide
:
true
,
NoHeaders
:
noHeaders
})
return
c
.
Table
Generator
.
Generate
Table
(
obj
,
printers
.
PrintOptions
{
Wide
:
true
,
NoHeaders
:
noHeaders
})
}
}
pkg/registry/apps/controllerrevision/storage/storage.go
View file @
abfc5bbb
...
@@ -43,7 +43,7 @@ func NewREST(optsGetter generic.RESTOptionsGetter) *REST {
...
@@ -43,7 +43,7 @@ func NewREST(optsGetter generic.RESTOptionsGetter) *REST {
UpdateStrategy
:
controllerrevision
.
Strategy
,
UpdateStrategy
:
controllerrevision
.
Strategy
,
DeleteStrategy
:
controllerrevision
.
Strategy
,
DeleteStrategy
:
controllerrevision
.
Strategy
,
TableConvertor
:
printerstorage
.
TableConvertor
{
Table
Printer
:
printers
.
NewTablePrinte
r
()
.
With
(
printersinternal
.
AddHandlers
)},
TableConvertor
:
printerstorage
.
TableConvertor
{
Table
Generator
:
printers
.
NewTableGenerato
r
()
.
With
(
printersinternal
.
AddHandlers
)},
}
}
options
:=
&
generic
.
StoreOptions
{
RESTOptions
:
optsGetter
}
options
:=
&
generic
.
StoreOptions
{
RESTOptions
:
optsGetter
}
if
err
:=
store
.
CompleteWithOptions
(
options
);
err
!=
nil
{
if
err
:=
store
.
CompleteWithOptions
(
options
);
err
!=
nil
{
...
...
pkg/registry/apps/daemonset/storage/storage.go
View file @
abfc5bbb
...
@@ -48,7 +48,7 @@ func NewREST(optsGetter generic.RESTOptionsGetter) (*REST, *StatusREST) {
...
@@ -48,7 +48,7 @@ func NewREST(optsGetter generic.RESTOptionsGetter) (*REST, *StatusREST) {
UpdateStrategy
:
daemonset
.
Strategy
,
UpdateStrategy
:
daemonset
.
Strategy
,
DeleteStrategy
:
daemonset
.
Strategy
,
DeleteStrategy
:
daemonset
.
Strategy
,
TableConvertor
:
printerstorage
.
TableConvertor
{
Table
Printer
:
printers
.
NewTablePrinte
r
()
.
With
(
printersinternal
.
AddHandlers
)},
TableConvertor
:
printerstorage
.
TableConvertor
{
Table
Generator
:
printers
.
NewTableGenerato
r
()
.
With
(
printersinternal
.
AddHandlers
)},
}
}
options
:=
&
generic
.
StoreOptions
{
RESTOptions
:
optsGetter
}
options
:=
&
generic
.
StoreOptions
{
RESTOptions
:
optsGetter
}
if
err
:=
store
.
CompleteWithOptions
(
options
);
err
!=
nil
{
if
err
:=
store
.
CompleteWithOptions
(
options
);
err
!=
nil
{
...
...
pkg/registry/apps/deployment/storage/storage.go
View file @
abfc5bbb
...
@@ -80,7 +80,7 @@ func NewREST(optsGetter generic.RESTOptionsGetter) (*REST, *StatusREST, *Rollbac
...
@@ -80,7 +80,7 @@ func NewREST(optsGetter generic.RESTOptionsGetter) (*REST, *StatusREST, *Rollbac
UpdateStrategy
:
deployment
.
Strategy
,
UpdateStrategy
:
deployment
.
Strategy
,
DeleteStrategy
:
deployment
.
Strategy
,
DeleteStrategy
:
deployment
.
Strategy
,
TableConvertor
:
printerstorage
.
TableConvertor
{
Table
Printer
:
printers
.
NewTablePrinte
r
()
.
With
(
printersinternal
.
AddHandlers
)},
TableConvertor
:
printerstorage
.
TableConvertor
{
Table
Generator
:
printers
.
NewTableGenerato
r
()
.
With
(
printersinternal
.
AddHandlers
)},
}
}
options
:=
&
generic
.
StoreOptions
{
RESTOptions
:
optsGetter
}
options
:=
&
generic
.
StoreOptions
{
RESTOptions
:
optsGetter
}
if
err
:=
store
.
CompleteWithOptions
(
options
);
err
!=
nil
{
if
err
:=
store
.
CompleteWithOptions
(
options
);
err
!=
nil
{
...
...
pkg/registry/apps/replicaset/storage/storage.go
View file @
abfc5bbb
...
@@ -76,7 +76,7 @@ func NewREST(optsGetter generic.RESTOptionsGetter) (*REST, *StatusREST) {
...
@@ -76,7 +76,7 @@ func NewREST(optsGetter generic.RESTOptionsGetter) (*REST, *StatusREST) {
UpdateStrategy
:
replicaset
.
Strategy
,
UpdateStrategy
:
replicaset
.
Strategy
,
DeleteStrategy
:
replicaset
.
Strategy
,
DeleteStrategy
:
replicaset
.
Strategy
,
TableConvertor
:
printerstorage
.
TableConvertor
{
Table
Printer
:
printers
.
NewTablePrinte
r
()
.
With
(
printersinternal
.
AddHandlers
)},
TableConvertor
:
printerstorage
.
TableConvertor
{
Table
Generator
:
printers
.
NewTableGenerato
r
()
.
With
(
printersinternal
.
AddHandlers
)},
}
}
options
:=
&
generic
.
StoreOptions
{
RESTOptions
:
optsGetter
,
AttrFunc
:
replicaset
.
GetAttrs
}
options
:=
&
generic
.
StoreOptions
{
RESTOptions
:
optsGetter
,
AttrFunc
:
replicaset
.
GetAttrs
}
if
err
:=
store
.
CompleteWithOptions
(
options
);
err
!=
nil
{
if
err
:=
store
.
CompleteWithOptions
(
options
);
err
!=
nil
{
...
...
pkg/registry/apps/statefulset/storage/storage.go
View file @
abfc5bbb
...
@@ -72,7 +72,7 @@ func NewREST(optsGetter generic.RESTOptionsGetter) (*REST, *StatusREST) {
...
@@ -72,7 +72,7 @@ func NewREST(optsGetter generic.RESTOptionsGetter) (*REST, *StatusREST) {
UpdateStrategy
:
statefulset
.
Strategy
,
UpdateStrategy
:
statefulset
.
Strategy
,
DeleteStrategy
:
statefulset
.
Strategy
,
DeleteStrategy
:
statefulset
.
Strategy
,
TableConvertor
:
printerstorage
.
TableConvertor
{
Table
Printer
:
printers
.
NewTablePrinte
r
()
.
With
(
printersinternal
.
AddHandlers
)},
TableConvertor
:
printerstorage
.
TableConvertor
{
Table
Generator
:
printers
.
NewTableGenerato
r
()
.
With
(
printersinternal
.
AddHandlers
)},
}
}
options
:=
&
generic
.
StoreOptions
{
RESTOptions
:
optsGetter
}
options
:=
&
generic
.
StoreOptions
{
RESTOptions
:
optsGetter
}
if
err
:=
store
.
CompleteWithOptions
(
options
);
err
!=
nil
{
if
err
:=
store
.
CompleteWithOptions
(
options
);
err
!=
nil
{
...
...
pkg/registry/autoscaling/horizontalpodautoscaler/storage/storage.go
View file @
abfc5bbb
...
@@ -46,7 +46,7 @@ func NewREST(optsGetter generic.RESTOptionsGetter) (*REST, *StatusREST) {
...
@@ -46,7 +46,7 @@ func NewREST(optsGetter generic.RESTOptionsGetter) (*REST, *StatusREST) {
UpdateStrategy
:
horizontalpodautoscaler
.
Strategy
,
UpdateStrategy
:
horizontalpodautoscaler
.
Strategy
,
DeleteStrategy
:
horizontalpodautoscaler
.
Strategy
,
DeleteStrategy
:
horizontalpodautoscaler
.
Strategy
,
TableConvertor
:
printerstorage
.
TableConvertor
{
Table
Printer
:
printers
.
NewTablePrinte
r
()
.
With
(
printersinternal
.
AddHandlers
)},
TableConvertor
:
printerstorage
.
TableConvertor
{
Table
Generator
:
printers
.
NewTableGenerato
r
()
.
With
(
printersinternal
.
AddHandlers
)},
}
}
options
:=
&
generic
.
StoreOptions
{
RESTOptions
:
optsGetter
}
options
:=
&
generic
.
StoreOptions
{
RESTOptions
:
optsGetter
}
if
err
:=
store
.
CompleteWithOptions
(
options
);
err
!=
nil
{
if
err
:=
store
.
CompleteWithOptions
(
options
);
err
!=
nil
{
...
...
pkg/registry/batch/cronjob/storage/storage.go
View file @
abfc5bbb
...
@@ -47,7 +47,7 @@ func NewREST(optsGetter generic.RESTOptionsGetter) (*REST, *StatusREST) {
...
@@ -47,7 +47,7 @@ func NewREST(optsGetter generic.RESTOptionsGetter) (*REST, *StatusREST) {
UpdateStrategy
:
cronjob
.
Strategy
,
UpdateStrategy
:
cronjob
.
Strategy
,
DeleteStrategy
:
cronjob
.
Strategy
,
DeleteStrategy
:
cronjob
.
Strategy
,
TableConvertor
:
printerstorage
.
TableConvertor
{
Table
Printer
:
printers
.
NewTablePrinte
r
()
.
With
(
printersinternal
.
AddHandlers
)},
TableConvertor
:
printerstorage
.
TableConvertor
{
Table
Generator
:
printers
.
NewTableGenerato
r
()
.
With
(
printersinternal
.
AddHandlers
)},
}
}
options
:=
&
generic
.
StoreOptions
{
RESTOptions
:
optsGetter
}
options
:=
&
generic
.
StoreOptions
{
RESTOptions
:
optsGetter
}
if
err
:=
store
.
CompleteWithOptions
(
options
);
err
!=
nil
{
if
err
:=
store
.
CompleteWithOptions
(
options
);
err
!=
nil
{
...
...
pkg/registry/batch/job/storage/storage.go
View file @
abfc5bbb
...
@@ -63,7 +63,7 @@ func NewREST(optsGetter generic.RESTOptionsGetter) (*REST, *StatusREST) {
...
@@ -63,7 +63,7 @@ func NewREST(optsGetter generic.RESTOptionsGetter) (*REST, *StatusREST) {
UpdateStrategy
:
job
.
Strategy
,
UpdateStrategy
:
job
.
Strategy
,
DeleteStrategy
:
job
.
Strategy
,
DeleteStrategy
:
job
.
Strategy
,
TableConvertor
:
printerstorage
.
TableConvertor
{
Table
Printer
:
printers
.
NewTablePrinte
r
()
.
With
(
printersinternal
.
AddHandlers
)},
TableConvertor
:
printerstorage
.
TableConvertor
{
Table
Generator
:
printers
.
NewTableGenerato
r
()
.
With
(
printersinternal
.
AddHandlers
)},
}
}
options
:=
&
generic
.
StoreOptions
{
RESTOptions
:
optsGetter
,
AttrFunc
:
job
.
GetAttrs
}
options
:=
&
generic
.
StoreOptions
{
RESTOptions
:
optsGetter
,
AttrFunc
:
job
.
GetAttrs
}
if
err
:=
store
.
CompleteWithOptions
(
options
);
err
!=
nil
{
if
err
:=
store
.
CompleteWithOptions
(
options
);
err
!=
nil
{
...
...
pkg/registry/certificates/certificates/storage/storage.go
View file @
abfc5bbb
...
@@ -48,7 +48,7 @@ func NewREST(optsGetter generic.RESTOptionsGetter) (*REST, *StatusREST, *Approva
...
@@ -48,7 +48,7 @@ func NewREST(optsGetter generic.RESTOptionsGetter) (*REST, *StatusREST, *Approva
DeleteStrategy
:
csrregistry
.
Strategy
,
DeleteStrategy
:
csrregistry
.
Strategy
,
ExportStrategy
:
csrregistry
.
Strategy
,
ExportStrategy
:
csrregistry
.
Strategy
,
TableConvertor
:
printerstorage
.
TableConvertor
{
Table
Printer
:
printers
.
NewTablePrinte
r
()
.
With
(
printersinternal
.
AddHandlers
)},
TableConvertor
:
printerstorage
.
TableConvertor
{
Table
Generator
:
printers
.
NewTableGenerato
r
()
.
With
(
printersinternal
.
AddHandlers
)},
}
}
options
:=
&
generic
.
StoreOptions
{
RESTOptions
:
optsGetter
}
options
:=
&
generic
.
StoreOptions
{
RESTOptions
:
optsGetter
}
if
err
:=
store
.
CompleteWithOptions
(
options
);
err
!=
nil
{
if
err
:=
store
.
CompleteWithOptions
(
options
);
err
!=
nil
{
...
...
pkg/registry/coordination/lease/storage/storage.go
View file @
abfc5bbb
...
@@ -43,7 +43,7 @@ func NewREST(optsGetter generic.RESTOptionsGetter) *REST {
...
@@ -43,7 +43,7 @@ func NewREST(optsGetter generic.RESTOptionsGetter) *REST {
UpdateStrategy
:
lease
.
Strategy
,
UpdateStrategy
:
lease
.
Strategy
,
DeleteStrategy
:
lease
.
Strategy
,
DeleteStrategy
:
lease
.
Strategy
,
TableConvertor
:
printerstorage
.
TableConvertor
{
Table
Printer
:
printers
.
NewTablePrinte
r
()
.
With
(
printersinternal
.
AddHandlers
)},
TableConvertor
:
printerstorage
.
TableConvertor
{
Table
Generator
:
printers
.
NewTableGenerato
r
()
.
With
(
printersinternal
.
AddHandlers
)},
}
}
options
:=
&
generic
.
StoreOptions
{
RESTOptions
:
optsGetter
}
options
:=
&
generic
.
StoreOptions
{
RESTOptions
:
optsGetter
}
if
err
:=
store
.
CompleteWithOptions
(
options
);
err
!=
nil
{
if
err
:=
store
.
CompleteWithOptions
(
options
);
err
!=
nil
{
...
...
pkg/registry/core/configmap/storage/storage.go
View file @
abfc5bbb
...
@@ -44,7 +44,7 @@ func NewREST(optsGetter generic.RESTOptionsGetter) *REST {
...
@@ -44,7 +44,7 @@ func NewREST(optsGetter generic.RESTOptionsGetter) *REST {
UpdateStrategy
:
configmap
.
Strategy
,
UpdateStrategy
:
configmap
.
Strategy
,
DeleteStrategy
:
configmap
.
Strategy
,
DeleteStrategy
:
configmap
.
Strategy
,
TableConvertor
:
printerstorage
.
TableConvertor
{
Table
Printer
:
printers
.
NewTablePrinte
r
()
.
With
(
printersinternal
.
AddHandlers
)},
TableConvertor
:
printerstorage
.
TableConvertor
{
Table
Generator
:
printers
.
NewTableGenerato
r
()
.
With
(
printersinternal
.
AddHandlers
)},
}
}
options
:=
&
generic
.
StoreOptions
{
RESTOptions
:
optsGetter
}
options
:=
&
generic
.
StoreOptions
{
RESTOptions
:
optsGetter
}
if
err
:=
store
.
CompleteWithOptions
(
options
);
err
!=
nil
{
if
err
:=
store
.
CompleteWithOptions
(
options
);
err
!=
nil
{
...
...
pkg/registry/core/endpoint/storage/storage.go
View file @
abfc5bbb
...
@@ -43,7 +43,7 @@ func NewREST(optsGetter generic.RESTOptionsGetter) *REST {
...
@@ -43,7 +43,7 @@ func NewREST(optsGetter generic.RESTOptionsGetter) *REST {
UpdateStrategy
:
endpoint
.
Strategy
,
UpdateStrategy
:
endpoint
.
Strategy
,
DeleteStrategy
:
endpoint
.
Strategy
,
DeleteStrategy
:
endpoint
.
Strategy
,
TableConvertor
:
printerstorage
.
TableConvertor
{
Table
Printer
:
printers
.
NewTablePrinte
r
()
.
With
(
printersinternal
.
AddHandlers
)},
TableConvertor
:
printerstorage
.
TableConvertor
{
Table
Generator
:
printers
.
NewTableGenerato
r
()
.
With
(
printersinternal
.
AddHandlers
)},
}
}
options
:=
&
generic
.
StoreOptions
{
RESTOptions
:
optsGetter
}
options
:=
&
generic
.
StoreOptions
{
RESTOptions
:
optsGetter
}
if
err
:=
store
.
CompleteWithOptions
(
options
);
err
!=
nil
{
if
err
:=
store
.
CompleteWithOptions
(
options
);
err
!=
nil
{
...
...
pkg/registry/core/event/storage/storage.go
View file @
abfc5bbb
...
@@ -53,7 +53,7 @@ func NewREST(optsGetter generic.RESTOptionsGetter, ttl uint64) *REST {
...
@@ -53,7 +53,7 @@ func NewREST(optsGetter generic.RESTOptionsGetter, ttl uint64) *REST {
UpdateStrategy
:
event
.
Strategy
,
UpdateStrategy
:
event
.
Strategy
,
DeleteStrategy
:
event
.
Strategy
,
DeleteStrategy
:
event
.
Strategy
,
TableConvertor
:
printerstorage
.
TableConvertor
{
Table
Printer
:
printers
.
NewTablePrinte
r
()
.
With
(
printersinternal
.
AddHandlers
)},
TableConvertor
:
printerstorage
.
TableConvertor
{
Table
Generator
:
printers
.
NewTableGenerato
r
()
.
With
(
printersinternal
.
AddHandlers
)},
}
}
options
:=
&
generic
.
StoreOptions
{
RESTOptions
:
opts
,
AttrFunc
:
event
.
GetAttrs
}
// Pass in opts to use UndecoratedStorage
options
:=
&
generic
.
StoreOptions
{
RESTOptions
:
opts
,
AttrFunc
:
event
.
GetAttrs
}
// Pass in opts to use UndecoratedStorage
if
err
:=
store
.
CompleteWithOptions
(
options
);
err
!=
nil
{
if
err
:=
store
.
CompleteWithOptions
(
options
);
err
!=
nil
{
...
...
pkg/registry/core/namespace/storage/storage.go
View file @
abfc5bbb
...
@@ -69,7 +69,7 @@ func NewREST(optsGetter generic.RESTOptionsGetter) (*REST, *StatusREST, *Finaliz
...
@@ -69,7 +69,7 @@ func NewREST(optsGetter generic.RESTOptionsGetter) (*REST, *StatusREST, *Finaliz
DeleteStrategy
:
namespace
.
Strategy
,
DeleteStrategy
:
namespace
.
Strategy
,
ReturnDeletedObject
:
true
,
ReturnDeletedObject
:
true
,
TableConvertor
:
printerstorage
.
TableConvertor
{
Table
Printer
:
printers
.
NewTablePrinte
r
()
.
With
(
printersinternal
.
AddHandlers
)},
TableConvertor
:
printerstorage
.
TableConvertor
{
Table
Generator
:
printers
.
NewTableGenerato
r
()
.
With
(
printersinternal
.
AddHandlers
)},
}
}
options
:=
&
generic
.
StoreOptions
{
RESTOptions
:
optsGetter
,
AttrFunc
:
namespace
.
GetAttrs
}
options
:=
&
generic
.
StoreOptions
{
RESTOptions
:
optsGetter
,
AttrFunc
:
namespace
.
GetAttrs
}
if
err
:=
store
.
CompleteWithOptions
(
options
);
err
!=
nil
{
if
err
:=
store
.
CompleteWithOptions
(
options
);
err
!=
nil
{
...
...
pkg/registry/core/node/storage/storage.go
View file @
abfc5bbb
...
@@ -87,7 +87,7 @@ func NewStorage(optsGetter generic.RESTOptionsGetter, kubeletClientConfig client
...
@@ -87,7 +87,7 @@ func NewStorage(optsGetter generic.RESTOptionsGetter, kubeletClientConfig client
DeleteStrategy
:
node
.
Strategy
,
DeleteStrategy
:
node
.
Strategy
,
ExportStrategy
:
node
.
Strategy
,
ExportStrategy
:
node
.
Strategy
,
TableConvertor
:
printerstorage
.
TableConvertor
{
Table
Printer
:
printers
.
NewTablePrinte
r
()
.
With
(
printersinternal
.
AddHandlers
)},
TableConvertor
:
printerstorage
.
TableConvertor
{
Table
Generator
:
printers
.
NewTableGenerato
r
()
.
With
(
printersinternal
.
AddHandlers
)},
}
}
options
:=
&
generic
.
StoreOptions
{
RESTOptions
:
optsGetter
,
AttrFunc
:
node
.
GetAttrs
,
TriggerFunc
:
node
.
NodeNameTriggerFunc
}
options
:=
&
generic
.
StoreOptions
{
RESTOptions
:
optsGetter
,
AttrFunc
:
node
.
GetAttrs
,
TriggerFunc
:
node
.
NodeNameTriggerFunc
}
if
err
:=
store
.
CompleteWithOptions
(
options
);
err
!=
nil
{
if
err
:=
store
.
CompleteWithOptions
(
options
);
err
!=
nil
{
...
...
pkg/registry/core/persistentvolume/storage/storage.go
View file @
abfc5bbb
...
@@ -48,7 +48,7 @@ func NewREST(optsGetter generic.RESTOptionsGetter) (*REST, *StatusREST) {
...
@@ -48,7 +48,7 @@ func NewREST(optsGetter generic.RESTOptionsGetter) (*REST, *StatusREST) {
DeleteStrategy
:
persistentvolume
.
Strategy
,
DeleteStrategy
:
persistentvolume
.
Strategy
,
ReturnDeletedObject
:
true
,
ReturnDeletedObject
:
true
,
TableConvertor
:
printerstorage
.
TableConvertor
{
Table
Printer
:
printers
.
NewTablePrinte
r
()
.
With
(
printersinternal
.
AddHandlers
)},
TableConvertor
:
printerstorage
.
TableConvertor
{
Table
Generator
:
printers
.
NewTableGenerato
r
()
.
With
(
printersinternal
.
AddHandlers
)},
}
}
options
:=
&
generic
.
StoreOptions
{
RESTOptions
:
optsGetter
,
AttrFunc
:
persistentvolume
.
GetAttrs
}
options
:=
&
generic
.
StoreOptions
{
RESTOptions
:
optsGetter
,
AttrFunc
:
persistentvolume
.
GetAttrs
}
if
err
:=
store
.
CompleteWithOptions
(
options
);
err
!=
nil
{
if
err
:=
store
.
CompleteWithOptions
(
options
);
err
!=
nil
{
...
...
pkg/registry/core/persistentvolumeclaim/storage/storage.go
View file @
abfc5bbb
...
@@ -48,7 +48,7 @@ func NewREST(optsGetter generic.RESTOptionsGetter) (*REST, *StatusREST) {
...
@@ -48,7 +48,7 @@ func NewREST(optsGetter generic.RESTOptionsGetter) (*REST, *StatusREST) {
DeleteStrategy
:
persistentvolumeclaim
.
Strategy
,
DeleteStrategy
:
persistentvolumeclaim
.
Strategy
,
ReturnDeletedObject
:
true
,
ReturnDeletedObject
:
true
,
TableConvertor
:
printerstorage
.
TableConvertor
{
Table
Printer
:
printers
.
NewTablePrinte
r
()
.
With
(
printersinternal
.
AddHandlers
)},
TableConvertor
:
printerstorage
.
TableConvertor
{
Table
Generator
:
printers
.
NewTableGenerato
r
()
.
With
(
printersinternal
.
AddHandlers
)},
}
}
options
:=
&
generic
.
StoreOptions
{
RESTOptions
:
optsGetter
,
AttrFunc
:
persistentvolumeclaim
.
GetAttrs
}
options
:=
&
generic
.
StoreOptions
{
RESTOptions
:
optsGetter
,
AttrFunc
:
persistentvolumeclaim
.
GetAttrs
}
if
err
:=
store
.
CompleteWithOptions
(
options
);
err
!=
nil
{
if
err
:=
store
.
CompleteWithOptions
(
options
);
err
!=
nil
{
...
...
pkg/registry/core/pod/storage/storage.go
View file @
abfc5bbb
...
@@ -76,7 +76,7 @@ func NewStorage(optsGetter generic.RESTOptionsGetter, k client.ConnectionInfoGet
...
@@ -76,7 +76,7 @@ func NewStorage(optsGetter generic.RESTOptionsGetter, k client.ConnectionInfoGet
DeleteStrategy
:
pod
.
Strategy
,
DeleteStrategy
:
pod
.
Strategy
,
ReturnDeletedObject
:
true
,
ReturnDeletedObject
:
true
,
TableConvertor
:
printerstorage
.
TableConvertor
{
Table
Printer
:
printers
.
NewTablePrinte
r
()
.
With
(
printersinternal
.
AddHandlers
)},
TableConvertor
:
printerstorage
.
TableConvertor
{
Table
Generator
:
printers
.
NewTableGenerato
r
()
.
With
(
printersinternal
.
AddHandlers
)},
}
}
options
:=
&
generic
.
StoreOptions
{
RESTOptions
:
optsGetter
,
AttrFunc
:
pod
.
GetAttrs
,
TriggerFunc
:
pod
.
NodeNameTriggerFunc
}
options
:=
&
generic
.
StoreOptions
{
RESTOptions
:
optsGetter
,
AttrFunc
:
pod
.
GetAttrs
,
TriggerFunc
:
pod
.
NodeNameTriggerFunc
}
if
err
:=
store
.
CompleteWithOptions
(
options
);
err
!=
nil
{
if
err
:=
store
.
CompleteWithOptions
(
options
);
err
!=
nil
{
...
...
pkg/registry/core/podtemplate/storage/storage.go
View file @
abfc5bbb
...
@@ -45,7 +45,7 @@ func NewREST(optsGetter generic.RESTOptionsGetter) *REST {
...
@@ -45,7 +45,7 @@ func NewREST(optsGetter generic.RESTOptionsGetter) *REST {
ReturnDeletedObject
:
true
,
ReturnDeletedObject
:
true
,
TableConvertor
:
printerstorage
.
TableConvertor
{
Table
Printer
:
printers
.
NewTablePrinte
r
()
.
With
(
printersinternal
.
AddHandlers
)},
TableConvertor
:
printerstorage
.
TableConvertor
{
Table
Generator
:
printers
.
NewTableGenerato
r
()
.
With
(
printersinternal
.
AddHandlers
)},
}
}
options
:=
&
generic
.
StoreOptions
{
RESTOptions
:
optsGetter
}
options
:=
&
generic
.
StoreOptions
{
RESTOptions
:
optsGetter
}
if
err
:=
store
.
CompleteWithOptions
(
options
);
err
!=
nil
{
if
err
:=
store
.
CompleteWithOptions
(
options
);
err
!=
nil
{
...
...
pkg/registry/core/replicationcontroller/storage/storage.go
View file @
abfc5bbb
...
@@ -74,7 +74,7 @@ func NewREST(optsGetter generic.RESTOptionsGetter) (*REST, *StatusREST) {
...
@@ -74,7 +74,7 @@ func NewREST(optsGetter generic.RESTOptionsGetter) (*REST, *StatusREST) {
UpdateStrategy
:
replicationcontroller
.
Strategy
,
UpdateStrategy
:
replicationcontroller
.
Strategy
,
DeleteStrategy
:
replicationcontroller
.
Strategy
,
DeleteStrategy
:
replicationcontroller
.
Strategy
,
TableConvertor
:
printerstorage
.
TableConvertor
{
Table
Printer
:
printers
.
NewTablePrinte
r
()
.
With
(
printersinternal
.
AddHandlers
)},
TableConvertor
:
printerstorage
.
TableConvertor
{
Table
Generator
:
printers
.
NewTableGenerato
r
()
.
With
(
printersinternal
.
AddHandlers
)},
}
}
options
:=
&
generic
.
StoreOptions
{
RESTOptions
:
optsGetter
,
AttrFunc
:
replicationcontroller
.
GetAttrs
}
options
:=
&
generic
.
StoreOptions
{
RESTOptions
:
optsGetter
,
AttrFunc
:
replicationcontroller
.
GetAttrs
}
if
err
:=
store
.
CompleteWithOptions
(
options
);
err
!=
nil
{
if
err
:=
store
.
CompleteWithOptions
(
options
);
err
!=
nil
{
...
...
pkg/registry/core/secret/storage/storage.go
View file @
abfc5bbb
...
@@ -44,7 +44,7 @@ func NewREST(optsGetter generic.RESTOptionsGetter) *REST {
...
@@ -44,7 +44,7 @@ func NewREST(optsGetter generic.RESTOptionsGetter) *REST {
DeleteStrategy
:
secret
.
Strategy
,
DeleteStrategy
:
secret
.
Strategy
,
ExportStrategy
:
secret
.
Strategy
,
ExportStrategy
:
secret
.
Strategy
,
TableConvertor
:
printerstorage
.
TableConvertor
{
Table
Printer
:
printers
.
NewTablePrinte
r
()
.
With
(
printersinternal
.
AddHandlers
)},
TableConvertor
:
printerstorage
.
TableConvertor
{
Table
Generator
:
printers
.
NewTableGenerato
r
()
.
With
(
printersinternal
.
AddHandlers
)},
}
}
options
:=
&
generic
.
StoreOptions
{
RESTOptions
:
optsGetter
,
AttrFunc
:
secret
.
GetAttrs
,
TriggerFunc
:
secret
.
SecretNameTriggerFunc
}
options
:=
&
generic
.
StoreOptions
{
RESTOptions
:
optsGetter
,
AttrFunc
:
secret
.
GetAttrs
,
TriggerFunc
:
secret
.
SecretNameTriggerFunc
}
if
err
:=
store
.
CompleteWithOptions
(
options
);
err
!=
nil
{
if
err
:=
store
.
CompleteWithOptions
(
options
);
err
!=
nil
{
...
...
pkg/registry/core/service/storage/storage.go
View file @
abfc5bbb
...
@@ -48,7 +48,7 @@ func NewGenericREST(optsGetter generic.RESTOptionsGetter) (*GenericREST, *Status
...
@@ -48,7 +48,7 @@ func NewGenericREST(optsGetter generic.RESTOptionsGetter) (*GenericREST, *Status
DeleteStrategy
:
service
.
Strategy
,
DeleteStrategy
:
service
.
Strategy
,
ExportStrategy
:
service
.
Strategy
,
ExportStrategy
:
service
.
Strategy
,
TableConvertor
:
printerstorage
.
TableConvertor
{
Table
Printer
:
printers
.
NewTablePrinte
r
()
.
With
(
printersinternal
.
AddHandlers
)},
TableConvertor
:
printerstorage
.
TableConvertor
{
Table
Generator
:
printers
.
NewTableGenerato
r
()
.
With
(
printersinternal
.
AddHandlers
)},
}
}
options
:=
&
generic
.
StoreOptions
{
RESTOptions
:
optsGetter
}
options
:=
&
generic
.
StoreOptions
{
RESTOptions
:
optsGetter
}
if
err
:=
store
.
CompleteWithOptions
(
options
);
err
!=
nil
{
if
err
:=
store
.
CompleteWithOptions
(
options
);
err
!=
nil
{
...
...
pkg/registry/core/serviceaccount/storage/storage.go
View file @
abfc5bbb
...
@@ -49,7 +49,7 @@ func NewREST(optsGetter generic.RESTOptionsGetter, issuer token.TokenGenerator,
...
@@ -49,7 +49,7 @@ func NewREST(optsGetter generic.RESTOptionsGetter, issuer token.TokenGenerator,
DeleteStrategy
:
serviceaccount
.
Strategy
,
DeleteStrategy
:
serviceaccount
.
Strategy
,
ReturnDeletedObject
:
true
,
ReturnDeletedObject
:
true
,
TableConvertor
:
printerstorage
.
TableConvertor
{
Table
Printer
:
printers
.
NewTablePrinte
r
()
.
With
(
printersinternal
.
AddHandlers
)},
TableConvertor
:
printerstorage
.
TableConvertor
{
Table
Generator
:
printers
.
NewTableGenerato
r
()
.
With
(
printersinternal
.
AddHandlers
)},
}
}
options
:=
&
generic
.
StoreOptions
{
RESTOptions
:
optsGetter
}
options
:=
&
generic
.
StoreOptions
{
RESTOptions
:
optsGetter
}
if
err
:=
store
.
CompleteWithOptions
(
options
);
err
!=
nil
{
if
err
:=
store
.
CompleteWithOptions
(
options
);
err
!=
nil
{
...
...
pkg/registry/networking/ingress/storage/storage.go
View file @
abfc5bbb
...
@@ -48,7 +48,7 @@ func NewREST(optsGetter generic.RESTOptionsGetter) (*REST, *StatusREST) {
...
@@ -48,7 +48,7 @@ func NewREST(optsGetter generic.RESTOptionsGetter) (*REST, *StatusREST) {
UpdateStrategy
:
ingress
.
Strategy
,
UpdateStrategy
:
ingress
.
Strategy
,
DeleteStrategy
:
ingress
.
Strategy
,
DeleteStrategy
:
ingress
.
Strategy
,
TableConvertor
:
printerstorage
.
TableConvertor
{
Table
Printer
:
printers
.
NewTablePrinte
r
()
.
With
(
printersinternal
.
AddHandlers
)},
TableConvertor
:
printerstorage
.
TableConvertor
{
Table
Generator
:
printers
.
NewTableGenerato
r
()
.
With
(
printersinternal
.
AddHandlers
)},
}
}
options
:=
&
generic
.
StoreOptions
{
RESTOptions
:
optsGetter
}
options
:=
&
generic
.
StoreOptions
{
RESTOptions
:
optsGetter
}
if
err
:=
store
.
CompleteWithOptions
(
options
);
err
!=
nil
{
if
err
:=
store
.
CompleteWithOptions
(
options
);
err
!=
nil
{
...
...
pkg/registry/networking/networkpolicy/storage/storage.go
View file @
abfc5bbb
...
@@ -44,7 +44,7 @@ func NewREST(optsGetter generic.RESTOptionsGetter) *REST {
...
@@ -44,7 +44,7 @@ func NewREST(optsGetter generic.RESTOptionsGetter) *REST {
UpdateStrategy
:
networkpolicy
.
Strategy
,
UpdateStrategy
:
networkpolicy
.
Strategy
,
DeleteStrategy
:
networkpolicy
.
Strategy
,
DeleteStrategy
:
networkpolicy
.
Strategy
,
TableConvertor
:
printerstorage
.
TableConvertor
{
Table
Printer
:
printers
.
NewTablePrinte
r
()
.
With
(
printersinternal
.
AddHandlers
)},
TableConvertor
:
printerstorage
.
TableConvertor
{
Table
Generator
:
printers
.
NewTableGenerato
r
()
.
With
(
printersinternal
.
AddHandlers
)},
}
}
options
:=
&
generic
.
StoreOptions
{
RESTOptions
:
optsGetter
}
options
:=
&
generic
.
StoreOptions
{
RESTOptions
:
optsGetter
}
if
err
:=
store
.
CompleteWithOptions
(
options
);
err
!=
nil
{
if
err
:=
store
.
CompleteWithOptions
(
options
);
err
!=
nil
{
...
...
pkg/registry/policy/poddisruptionbudget/storage/storage.go
View file @
abfc5bbb
...
@@ -47,7 +47,7 @@ func NewREST(optsGetter generic.RESTOptionsGetter) (*REST, *StatusREST) {
...
@@ -47,7 +47,7 @@ func NewREST(optsGetter generic.RESTOptionsGetter) (*REST, *StatusREST) {
UpdateStrategy
:
poddisruptionbudget
.
Strategy
,
UpdateStrategy
:
poddisruptionbudget
.
Strategy
,
DeleteStrategy
:
poddisruptionbudget
.
Strategy
,
DeleteStrategy
:
poddisruptionbudget
.
Strategy
,
TableConvertor
:
printerstorage
.
TableConvertor
{
Table
Printer
:
printers
.
NewTablePrinte
r
()
.
With
(
printersinternal
.
AddHandlers
)},
TableConvertor
:
printerstorage
.
TableConvertor
{
Table
Generator
:
printers
.
NewTableGenerato
r
()
.
With
(
printersinternal
.
AddHandlers
)},
}
}
options
:=
&
generic
.
StoreOptions
{
RESTOptions
:
optsGetter
}
options
:=
&
generic
.
StoreOptions
{
RESTOptions
:
optsGetter
}
if
err
:=
store
.
CompleteWithOptions
(
options
);
err
!=
nil
{
if
err
:=
store
.
CompleteWithOptions
(
options
);
err
!=
nil
{
...
...
pkg/registry/policy/podsecuritypolicy/storage/storage.go
View file @
abfc5bbb
...
@@ -44,7 +44,7 @@ func NewREST(optsGetter generic.RESTOptionsGetter) *REST {
...
@@ -44,7 +44,7 @@ func NewREST(optsGetter generic.RESTOptionsGetter) *REST {
DeleteStrategy
:
podsecuritypolicy
.
Strategy
,
DeleteStrategy
:
podsecuritypolicy
.
Strategy
,
ReturnDeletedObject
:
true
,
ReturnDeletedObject
:
true
,
TableConvertor
:
printerstorage
.
TableConvertor
{
Table
Printer
:
printers
.
NewTablePrinte
r
()
.
With
(
printersinternal
.
AddHandlers
)},
TableConvertor
:
printerstorage
.
TableConvertor
{
Table
Generator
:
printers
.
NewTableGenerato
r
()
.
With
(
printersinternal
.
AddHandlers
)},
}
}
options
:=
&
generic
.
StoreOptions
{
RESTOptions
:
optsGetter
}
options
:=
&
generic
.
StoreOptions
{
RESTOptions
:
optsGetter
}
if
err
:=
store
.
CompleteWithOptions
(
options
);
err
!=
nil
{
if
err
:=
store
.
CompleteWithOptions
(
options
);
err
!=
nil
{
...
...
pkg/registry/rbac/clusterrolebinding/storage/storage.go
View file @
abfc5bbb
...
@@ -43,7 +43,7 @@ func NewREST(optsGetter generic.RESTOptionsGetter) *REST {
...
@@ -43,7 +43,7 @@ func NewREST(optsGetter generic.RESTOptionsGetter) *REST {
UpdateStrategy
:
clusterrolebinding
.
Strategy
,
UpdateStrategy
:
clusterrolebinding
.
Strategy
,
DeleteStrategy
:
clusterrolebinding
.
Strategy
,
DeleteStrategy
:
clusterrolebinding
.
Strategy
,
TableConvertor
:
printerstorage
.
TableConvertor
{
Table
Printer
:
printers
.
NewTablePrinte
r
()
.
With
(
printersinternal
.
AddHandlers
)},
TableConvertor
:
printerstorage
.
TableConvertor
{
Table
Generator
:
printers
.
NewTableGenerato
r
()
.
With
(
printersinternal
.
AddHandlers
)},
}
}
options
:=
&
generic
.
StoreOptions
{
RESTOptions
:
optsGetter
}
options
:=
&
generic
.
StoreOptions
{
RESTOptions
:
optsGetter
}
if
err
:=
store
.
CompleteWithOptions
(
options
);
err
!=
nil
{
if
err
:=
store
.
CompleteWithOptions
(
options
);
err
!=
nil
{
...
...
pkg/registry/rbac/rolebinding/storage/storage.go
View file @
abfc5bbb
...
@@ -43,7 +43,7 @@ func NewREST(optsGetter generic.RESTOptionsGetter) *REST {
...
@@ -43,7 +43,7 @@ func NewREST(optsGetter generic.RESTOptionsGetter) *REST {
UpdateStrategy
:
rolebinding
.
Strategy
,
UpdateStrategy
:
rolebinding
.
Strategy
,
DeleteStrategy
:
rolebinding
.
Strategy
,
DeleteStrategy
:
rolebinding
.
Strategy
,
TableConvertor
:
printerstorage
.
TableConvertor
{
Table
Printer
:
printers
.
NewTablePrinte
r
()
.
With
(
printersinternal
.
AddHandlers
)},
TableConvertor
:
printerstorage
.
TableConvertor
{
Table
Generator
:
printers
.
NewTableGenerato
r
()
.
With
(
printersinternal
.
AddHandlers
)},
}
}
options
:=
&
generic
.
StoreOptions
{
RESTOptions
:
optsGetter
}
options
:=
&
generic
.
StoreOptions
{
RESTOptions
:
optsGetter
}
if
err
:=
store
.
CompleteWithOptions
(
options
);
err
!=
nil
{
if
err
:=
store
.
CompleteWithOptions
(
options
);
err
!=
nil
{
...
...
pkg/registry/scheduling/priorityclass/storage/storage.go
View file @
abfc5bbb
...
@@ -49,7 +49,7 @@ func NewREST(optsGetter generic.RESTOptionsGetter) *REST {
...
@@ -49,7 +49,7 @@ func NewREST(optsGetter generic.RESTOptionsGetter) *REST {
UpdateStrategy
:
priorityclass
.
Strategy
,
UpdateStrategy
:
priorityclass
.
Strategy
,
DeleteStrategy
:
priorityclass
.
Strategy
,
DeleteStrategy
:
priorityclass
.
Strategy
,
TableConvertor
:
printerstorage
.
TableConvertor
{
Table
Printer
:
printers
.
NewTablePrinte
r
()
.
With
(
printersinternal
.
AddHandlers
)},
TableConvertor
:
printerstorage
.
TableConvertor
{
Table
Generator
:
printers
.
NewTableGenerato
r
()
.
With
(
printersinternal
.
AddHandlers
)},
}
}
options
:=
&
generic
.
StoreOptions
{
RESTOptions
:
optsGetter
}
options
:=
&
generic
.
StoreOptions
{
RESTOptions
:
optsGetter
}
if
err
:=
store
.
CompleteWithOptions
(
options
);
err
!=
nil
{
if
err
:=
store
.
CompleteWithOptions
(
options
);
err
!=
nil
{
...
...
pkg/registry/storage/storageclass/storage/storage.go
View file @
abfc5bbb
...
@@ -44,7 +44,7 @@ func NewREST(optsGetter generic.RESTOptionsGetter) *REST {
...
@@ -44,7 +44,7 @@ func NewREST(optsGetter generic.RESTOptionsGetter) *REST {
DeleteStrategy
:
storageclass
.
Strategy
,
DeleteStrategy
:
storageclass
.
Strategy
,
ReturnDeletedObject
:
true
,
ReturnDeletedObject
:
true
,
TableConvertor
:
printerstorage
.
TableConvertor
{
Table
Printer
:
printers
.
NewTablePrinte
r
()
.
With
(
printersinternal
.
AddHandlers
)},
TableConvertor
:
printerstorage
.
TableConvertor
{
Table
Generator
:
printers
.
NewTableGenerato
r
()
.
With
(
printersinternal
.
AddHandlers
)},
}
}
options
:=
&
generic
.
StoreOptions
{
RESTOptions
:
optsGetter
}
options
:=
&
generic
.
StoreOptions
{
RESTOptions
:
optsGetter
}
if
err
:=
store
.
CompleteWithOptions
(
options
);
err
!=
nil
{
if
err
:=
store
.
CompleteWithOptions
(
options
);
err
!=
nil
{
...
...
pkg/registry/storage/volumeattachment/storage/storage.go
View file @
abfc5bbb
...
@@ -54,7 +54,7 @@ func NewStorage(optsGetter generic.RESTOptionsGetter) *VolumeAttachmentStorage {
...
@@ -54,7 +54,7 @@ func NewStorage(optsGetter generic.RESTOptionsGetter) *VolumeAttachmentStorage {
DeleteStrategy
:
volumeattachment
.
Strategy
,
DeleteStrategy
:
volumeattachment
.
Strategy
,
ReturnDeletedObject
:
true
,
ReturnDeletedObject
:
true
,
TableConvertor
:
printerstorage
.
TableConvertor
{
Table
Printer
:
printers
.
NewTablePrinte
r
()
.
With
(
printersinternal
.
AddHandlers
)},
TableConvertor
:
printerstorage
.
TableConvertor
{
Table
Generator
:
printers
.
NewTableGenerato
r
()
.
With
(
printersinternal
.
AddHandlers
)},
}
}
options
:=
&
generic
.
StoreOptions
{
RESTOptions
:
optsGetter
}
options
:=
&
generic
.
StoreOptions
{
RESTOptions
:
optsGetter
}
if
err
:=
store
.
CompleteWithOptions
(
options
);
err
!=
nil
{
if
err
:=
store
.
CompleteWithOptions
(
options
);
err
!=
nil
{
...
...
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