github/client-go
1
0
Fork 0
mirror of https://github.com/kubernetes/client-go.git synced 2025-06-26 07:02:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #59059 from smarterclayton/move_partial_object

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 59158, 38320, 59059, 55516, 59357). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Promote v1alpha1 meta to v1beta1

No code changes, just renames. We can discuss if there are any field / naming changes here or in a follow-up

Parent #58536
Fixes #53224
Prereq to #55637

@kubernetes/sig-api-machinery-pr-reviews @deads2k

```release-note
The `meta.k8s.io/v1alpha1` objects for retrieving tabular responses from the server (`Table`) or fetching just the `ObjectMeta` for an object (as `PartialObjectMetadata`) are now beta as part of `meta.k8s.io/v1beta1`.  Clients may request alternate representations of normal Kubernetes objects by passing an `Accept` header like `application/json;as=Table;g=meta.k8s.io;v=v1beta1` or `application/json;as=PartialObjectMetadata;g=meta.k8s.io;v1=v1beta1`.  Older servers will ignore this representation or return an error if it is not available.  Clients may request fallback to the normal object by adding a non-qualified mime-type to their `Accept` header like `application/json` - the server will then respond with either the alternate representation if it is supported or the fallback mime-type which is the normal object response.
```

Kubernetes-commit: 9ee71b720ed2300d6298bb936d0a7873b5ecf2ac
This commit is contained in:
Kubernetes Publisher 2018-02-05 12:40:37 -08:00
commit 4def1285ff
3 changed files with 58 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
Godeps/Godeps.json generated
View File

@ -400,215 +400,215 @@
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/equality", "ImportPath": "k8s.io/apimachinery/pkg/api/equality",
"Rev": "b29a2d60548358f302231eeb5359d57ed9adebc2" "Rev": "33118901ad38c10b42c14ce12597aaa79f1f6912"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/errors", "ImportPath": "k8s.io/apimachinery/pkg/api/errors",
"Rev": "b29a2d60548358f302231eeb5359d57ed9adebc2" "Rev": "33118901ad38c10b42c14ce12597aaa79f1f6912"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/meta", "ImportPath": "k8s.io/apimachinery/pkg/api/meta",
"Rev": "b29a2d60548358f302231eeb5359d57ed9adebc2" "Rev": "33118901ad38c10b42c14ce12597aaa79f1f6912"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/resource", "ImportPath": "k8s.io/apimachinery/pkg/api/resource",
"Rev": "b29a2d60548358f302231eeb5359d57ed9adebc2" "Rev": "33118901ad38c10b42c14ce12597aaa79f1f6912"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/testing", "ImportPath": "k8s.io/apimachinery/pkg/api/testing",
"Rev": "b29a2d60548358f302231eeb5359d57ed9adebc2" "Rev": "33118901ad38c10b42c14ce12597aaa79f1f6912"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/testing/fuzzer", "ImportPath": "k8s.io/apimachinery/pkg/api/testing/fuzzer",
"Rev": "b29a2d60548358f302231eeb5359d57ed9adebc2" "Rev": "33118901ad38c10b42c14ce12597aaa79f1f6912"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/testing/roundtrip", "ImportPath": "k8s.io/apimachinery/pkg/api/testing/roundtrip",
"Rev": "b29a2d60548358f302231eeb5359d57ed9adebc2" "Rev": "33118901ad38c10b42c14ce12597aaa79f1f6912"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apimachinery", "ImportPath": "k8s.io/apimachinery/pkg/apimachinery",
"Rev": "b29a2d60548358f302231eeb5359d57ed9adebc2" "Rev": "33118901ad38c10b42c14ce12597aaa79f1f6912"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apimachinery/announced", "ImportPath": "k8s.io/apimachinery/pkg/apimachinery/announced",
"Rev": "b29a2d60548358f302231eeb5359d57ed9adebc2" "Rev": "33118901ad38c10b42c14ce12597aaa79f1f6912"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apimachinery/registered", "ImportPath": "k8s.io/apimachinery/pkg/apimachinery/registered",
"Rev": "b29a2d60548358f302231eeb5359d57ed9adebc2" "Rev": "33118901ad38c10b42c14ce12597aaa79f1f6912"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer", "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer",
"Rev": "b29a2d60548358f302231eeb5359d57ed9adebc2" "Rev": "33118901ad38c10b42c14ce12597aaa79f1f6912"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion", "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion",
"Rev": "b29a2d60548358f302231eeb5359d57ed9adebc2" "Rev": "33118901ad38c10b42c14ce12597aaa79f1f6912"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1", "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
"Rev": "b29a2d60548358f302231eeb5359d57ed9adebc2" "Rev": "33118901ad38c10b42c14ce12597aaa79f1f6912"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured", "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
"Rev": "b29a2d60548358f302231eeb5359d57ed9adebc2" "Rev": "33118901ad38c10b42c14ce12597aaa79f1f6912"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1alpha1", "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1",
"Rev": "b29a2d60548358f302231eeb5359d57ed9adebc2" "Rev": "33118901ad38c10b42c14ce12597aaa79f1f6912"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/conversion", "ImportPath": "k8s.io/apimachinery/pkg/conversion",
"Rev": "b29a2d60548358f302231eeb5359d57ed9adebc2" "Rev": "33118901ad38c10b42c14ce12597aaa79f1f6912"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams", "ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
"Rev": "b29a2d60548358f302231eeb5359d57ed9adebc2" "Rev": "33118901ad38c10b42c14ce12597aaa79f1f6912"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/fields", "ImportPath": "k8s.io/apimachinery/pkg/fields",
"Rev": "b29a2d60548358f302231eeb5359d57ed9adebc2" "Rev": "33118901ad38c10b42c14ce12597aaa79f1f6912"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/labels", "ImportPath": "k8s.io/apimachinery/pkg/labels",
"Rev": "b29a2d60548358f302231eeb5359d57ed9adebc2" "Rev": "33118901ad38c10b42c14ce12597aaa79f1f6912"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime", "ImportPath": "k8s.io/apimachinery/pkg/runtime",
"Rev": "b29a2d60548358f302231eeb5359d57ed9adebc2" "Rev": "33118901ad38c10b42c14ce12597aaa79f1f6912"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema", "ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
"Rev": "b29a2d60548358f302231eeb5359d57ed9adebc2" "Rev": "33118901ad38c10b42c14ce12597aaa79f1f6912"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
"Rev": "b29a2d60548358f302231eeb5359d57ed9adebc2" "Rev": "33118901ad38c10b42c14ce12597aaa79f1f6912"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
"Rev": "b29a2d60548358f302231eeb5359d57ed9adebc2" "Rev": "33118901ad38c10b42c14ce12597aaa79f1f6912"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
"Rev": "b29a2d60548358f302231eeb5359d57ed9adebc2" "Rev": "33118901ad38c10b42c14ce12597aaa79f1f6912"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
"Rev": "b29a2d60548358f302231eeb5359d57ed9adebc2" "Rev": "33118901ad38c10b42c14ce12597aaa79f1f6912"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
"Rev": "b29a2d60548358f302231eeb5359d57ed9adebc2" "Rev": "33118901ad38c10b42c14ce12597aaa79f1f6912"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
"Rev": "b29a2d60548358f302231eeb5359d57ed9adebc2" "Rev": "33118901ad38c10b42c14ce12597aaa79f1f6912"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/selection", "ImportPath": "k8s.io/apimachinery/pkg/selection",
"Rev": "b29a2d60548358f302231eeb5359d57ed9adebc2" "Rev": "33118901ad38c10b42c14ce12597aaa79f1f6912"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/types", "ImportPath": "k8s.io/apimachinery/pkg/types",
"Rev": "b29a2d60548358f302231eeb5359d57ed9adebc2" "Rev": "33118901ad38c10b42c14ce12597aaa79f1f6912"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/cache", "ImportPath": "k8s.io/apimachinery/pkg/util/cache",
"Rev": "b29a2d60548358f302231eeb5359d57ed9adebc2" "Rev": "33118901ad38c10b42c14ce12597aaa79f1f6912"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/clock", "ImportPath": "k8s.io/apimachinery/pkg/util/clock",
"Rev": "b29a2d60548358f302231eeb5359d57ed9adebc2" "Rev": "33118901ad38c10b42c14ce12597aaa79f1f6912"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/diff", "ImportPath": "k8s.io/apimachinery/pkg/util/diff",
"Rev": "b29a2d60548358f302231eeb5359d57ed9adebc2" "Rev": "33118901ad38c10b42c14ce12597aaa79f1f6912"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/errors", "ImportPath": "k8s.io/apimachinery/pkg/util/errors",
"Rev": "b29a2d60548358f302231eeb5359d57ed9adebc2" "Rev": "33118901ad38c10b42c14ce12597aaa79f1f6912"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/framer", "ImportPath": "k8s.io/apimachinery/pkg/util/framer",
"Rev": "b29a2d60548358f302231eeb5359d57ed9adebc2" "Rev": "33118901ad38c10b42c14ce12597aaa79f1f6912"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream", "ImportPath": "k8s.io/apimachinery/pkg/util/httpstream",
"Rev": "b29a2d60548358f302231eeb5359d57ed9adebc2" "Rev": "33118901ad38c10b42c14ce12597aaa79f1f6912"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy", "ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy",
"Rev": "b29a2d60548358f302231eeb5359d57ed9adebc2" "Rev": "33118901ad38c10b42c14ce12597aaa79f1f6912"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/intstr", "ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
"Rev": "b29a2d60548358f302231eeb5359d57ed9adebc2" "Rev": "33118901ad38c10b42c14ce12597aaa79f1f6912"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/json", "ImportPath": "k8s.io/apimachinery/pkg/util/json",
"Rev": "b29a2d60548358f302231eeb5359d57ed9adebc2" "Rev": "33118901ad38c10b42c14ce12597aaa79f1f6912"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch", "ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
"Rev": "b29a2d60548358f302231eeb5359d57ed9adebc2" "Rev": "33118901ad38c10b42c14ce12597aaa79f1f6912"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/net", "ImportPath": "k8s.io/apimachinery/pkg/util/net",
"Rev": "b29a2d60548358f302231eeb5359d57ed9adebc2" "Rev": "33118901ad38c10b42c14ce12597aaa79f1f6912"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand", "ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand",
"Rev": "b29a2d60548358f302231eeb5359d57ed9adebc2" "Rev": "33118901ad38c10b42c14ce12597aaa79f1f6912"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/runtime", "ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
"Rev": "b29a2d60548358f302231eeb5359d57ed9adebc2" "Rev": "33118901ad38c10b42c14ce12597aaa79f1f6912"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/sets", "ImportPath": "k8s.io/apimachinery/pkg/util/sets",
"Rev": "b29a2d60548358f302231eeb5359d57ed9adebc2" "Rev": "33118901ad38c10b42c14ce12597aaa79f1f6912"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch", "ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
"Rev": "b29a2d60548358f302231eeb5359d57ed9adebc2" "Rev": "33118901ad38c10b42c14ce12597aaa79f1f6912"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/validation", "ImportPath": "k8s.io/apimachinery/pkg/util/validation",
"Rev": "b29a2d60548358f302231eeb5359d57ed9adebc2" "Rev": "33118901ad38c10b42c14ce12597aaa79f1f6912"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field", "ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
"Rev": "b29a2d60548358f302231eeb5359d57ed9adebc2" "Rev": "33118901ad38c10b42c14ce12597aaa79f1f6912"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/wait", "ImportPath": "k8s.io/apimachinery/pkg/util/wait",
"Rev": "b29a2d60548358f302231eeb5359d57ed9adebc2" "Rev": "33118901ad38c10b42c14ce12597aaa79f1f6912"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/yaml", "ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
"Rev": "b29a2d60548358f302231eeb5359d57ed9adebc2" "Rev": "33118901ad38c10b42c14ce12597aaa79f1f6912"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/version", "ImportPath": "k8s.io/apimachinery/pkg/version",
"Rev": "b29a2d60548358f302231eeb5359d57ed9adebc2" "Rev": "33118901ad38c10b42c14ce12597aaa79f1f6912"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/watch", "ImportPath": "k8s.io/apimachinery/pkg/watch",
"Rev": "b29a2d60548358f302231eeb5359d57ed9adebc2" "Rev": "33118901ad38c10b42c14ce12597aaa79f1f6912"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json", "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
"Rev": "b29a2d60548358f302231eeb5359d57ed9adebc2" "Rev": "33118901ad38c10b42c14ce12597aaa79f1f6912"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil", "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil",
"Rev": "b29a2d60548358f302231eeb5359d57ed9adebc2" "Rev": "33118901ad38c10b42c14ce12597aaa79f1f6912"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect", "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
"Rev": "b29a2d60548358f302231eeb5359d57ed9adebc2" "Rev": "33118901ad38c10b42c14ce12597aaa79f1f6912"
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/util/proto", "ImportPath": "k8s.io/kube-openapi/pkg/util/proto",

2
tools/pager/BUILD
View File

@ -44,7 +44,7 @@ go_test(
"//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/internalversion:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/internalversion:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1alpha1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1beta1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
], ],
) )

6
tools/pager/pager_test.go
View File

@ -25,14 +25,14 @@ import (
"k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/errors"
metainternalversion "k8s.io/apimachinery/pkg/apis/meta/internalversion" metainternalversion "k8s.io/apimachinery/pkg/apis/meta/internalversion"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
metav1alpha1 "k8s.io/apimachinery/pkg/apis/meta/v1alpha1" metav1beta1 "k8s.io/apimachinery/pkg/apis/meta/v1beta1"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
) )
func list(count int, rv string) *metainternalversion.List { func list(count int, rv string) *metainternalversion.List {
var list metainternalversion.List var list metainternalversion.List
for i := 0; i < count; i++ { for i := 0; i < count; i++ {
list.Items = append(list.Items, &metav1alpha1.PartialObjectMetadata{ list.Items = append(list.Items, &metav1beta1.PartialObjectMetadata{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: fmt.Sprintf("%d", i), Name: fmt.Sprintf("%d", i),
}, },
@ -80,7 +80,7 @@ func (p *testPager) PagedList(ctx context.Context, options metav1.ListOptions) (
if p.remaining <= 0 { if p.remaining <= 0 {
break break
} }
list.Items = append(list.Items, &metav1alpha1.PartialObjectMetadata{ list.Items = append(list.Items, &metav1beta1.PartialObjectMetadata{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: fmt.Sprintf("%d", p.index), Name: fmt.Sprintf("%d", p.index),
}, },