kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #77580 from liggitt/fix-list-interface 

Fix unstructured list interface compatibility, fix kubectl paging

Kubernetes-commit: 548bf0afe524155c5e1f27b9476032eed905d6b7
This commit is contained in:
Kubernetes Publisher 2019-05-08 20:13:26 -07:00
parent 4756b09d7a 949522070d
commit 3b29680983
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Godeps/Godeps.json generated
View File

@ -400,7 +400,7 @@
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "a3da69d3723c"
"Rev": "7d8f8feb49c5"
},
{
"ImportPath": "k8s.io/client-go",
@ -408,7 +408,7 @@
},
{
"ImportPath": "k8s.io/component-base",
"Rev": "40efa6d42997"
"Rev": "8de8845fb642"
},
{
"ImportPath": "k8s.io/klog",

8
go.mod
View File

@ -59,9 +59,9 @@ require (
gopkg.in/yaml.v2 v2.2.1
gotest.tools v2.2.0+incompatible // indirect
k8s.io/api v0.0.0-20190503110853-61630f889b3c
k8s.io/apimachinery v0.0.0-20190508063446-a3da69d3723c
k8s.io/apimachinery v0.0.0-20190509063443-7d8f8feb49c5
k8s.io/client-go v0.0.0-20190508063711-1babf78c8b32
k8s.io/component-base v0.0.0-20190508223741-40efa6d42997
k8s.io/component-base v0.0.0-20190509023737-8de8845fb642
k8s.io/klog v0.3.0
k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30
k8s.io/utils v0.0.0-20190221042446-c2654d5206da
@ -75,7 +75,7 @@ replace (
golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503
golang.org/x/tools => golang.org/x/tools v0.0.0-20190313210603-aa82965741a9
k8s.io/api => k8s.io/api v0.0.0-20190503110853-61630f889b3c
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190508063446-a3da69d3723c
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190509063443-7d8f8feb49c5
k8s.io/client-go => k8s.io/client-go v0.0.0-20190508063711-1babf78c8b32
k8s.io/component-base => k8s.io/component-base v0.0.0-20190508223741-40efa6d42997
k8s.io/component-base => k8s.io/component-base v0.0.0-20190509023737-8de8845fb642
)

4
go.sum
View File

@ -193,9 +193,9 @@ gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
k8s.io/api v0.0.0-20190503110853-61630f889b3c/go.mod h1:42M1T54fVvXj2R/yqB+v9ksH4xI41q6XU/NUlo3hyjk=
k8s.io/apimachinery v0.0.0-20190508063446-a3da69d3723c/go.mod h1:5CBnzrKYGHzv9ZsSKmQ8wHt4XI4/TUBPDwYM9FlZMyw=
k8s.io/apimachinery v0.0.0-20190509063443-7d8f8feb49c5/go.mod h1:5CBnzrKYGHzv9ZsSKmQ8wHt4XI4/TUBPDwYM9FlZMyw=
k8s.io/client-go v0.0.0-20190508063711-1babf78c8b32/go.mod h1:xF+vJeNvjoNfv1P1p3aElmg8C1YDMDUsrCtcMbYbzn0=
k8s.io/component-base v0.0.0-20190508223741-40efa6d42997/go.mod h1:1OvmLN55oW7tYZ/2zSCSxOfOICjo9Tm2eyiKy+Fk7hw=
k8s.io/component-base v0.0.0-20190509023737-8de8845fb642/go.mod h1:1OvmLN55oW7tYZ/2zSCSxOfOICjo9Tm2eyiKy+Fk7hw=
k8s.io/klog v0.3.0 h1:0VPpR+sizsiivjIfIAQH/rl8tan6jvWkS7lU+0di3lE=
k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30 h1:TRb4wNWoBVrH9plmkp2q86FIDppkbrEXdXlxU3a3BMI=

1
pkg/registry/rest/table.go
View File

@ -67,6 +67,7 @@ func (c defaultTableConvertor) ConvertToTable(ctx context.Context, object runtim
table.ResourceVersion = m.GetResourceVersion()
table.SelfLink = m.GetSelfLink()
table.Continue = m.GetContinue()
table.RemainingItemCount = m.GetRemainingItemCount()
} else {
if m, err := meta.CommonAccessor(object); err == nil {
table.ResourceVersion = m.GetResourceVersion()