diff --git a/cmd/kubelet/app/server_bootstrap_test.go b/cmd/kubelet/app/server_bootstrap_test.go index 42c4b090bd1..95c7475e528 100644 --- a/cmd/kubelet/app/server_bootstrap_test.go +++ b/cmd/kubelet/app/server_bootstrap_test.go @@ -73,12 +73,14 @@ func Test_buildClientCertificateManager(t *testing.T) { defer s.Close() config1 := &restclient.Config{ - UserAgent: "FirstClient", - Host: s.URL, + UserAgent: "FirstClient", + Host: s.URL, + ContentConfig: restclient.ContentConfig{ContentType: runtime.ContentTypeJSON}, } config2 := &restclient.Config{ - UserAgent: "SecondClient", - Host: s.URL, + UserAgent: "SecondClient", + Host: s.URL, + ContentConfig: restclient.ContentConfig{ContentType: runtime.ContentTypeJSON}, } nodeName := types.NodeName("test") diff --git a/hack/update-codegen.sh b/hack/update-codegen.sh index 7b65a50807e..3f146f18f22 100755 --- a/hack/update-codegen.sh +++ b/hack/update-codegen.sh @@ -645,6 +645,7 @@ function codegen::clients() { --input-base="k8s.io/api" \ --plural-exceptions "${PLURAL_EXCEPTIONS}" \ --apply-configuration-package "${APPLYCONFIG_PKG}" \ + --prefers-protobuf \ $(printf -- " --input %s" "${gv_dirs[@]}") \ "$@" diff --git a/pkg/client/tests/clientset_test.go b/pkg/client/tests/clientset_test.go new file mode 100644 index 00000000000..b7ffc63b813 --- /dev/null +++ b/pkg/client/tests/clientset_test.go @@ -0,0 +1,186 @@ +/* +Copyright 2024 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package tests + +import ( + "context" + "io" + "net/http" + "net/http/httptest" + "sync/atomic" + "testing" + + "github.com/google/go-cmp/cmp" + + autoscalingv1 "k8s.io/api/autoscaling/v1" + corev1 "k8s.io/api/core/v1" + crv1 "k8s.io/apiextensions-apiserver/examples/client-go/pkg/apis/cr/v1" + crv1client "k8s.io/apiextensions-apiserver/examples/client-go/pkg/client/clientset/versioned" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/client-go/kubernetes" + "k8s.io/client-go/rest" +) + +func TestClientContentType(t *testing.T) { + createPodFunc := func(t *testing.T, config *rest.Config) { + client, err := kubernetes.NewForConfig(config) + if err != nil { + t.Fatalf("failed to create REST client: %v", err) + } + + _, err = client.CoreV1().Pods("panda"). + Create(context.TODO(), &corev1.Pod{ObjectMeta: metav1.ObjectMeta{Name: "snorlax"}}, metav1.CreateOptions{}) + if err != nil { + t.Fatal(err) + } + } + + updateScaleFunc := func(t *testing.T, config *rest.Config) { + client, err := kubernetes.NewForConfig(config) + if err != nil { + t.Fatalf("failed to create REST client: %v", err) + } + + _, err = client.AppsV1().Deployments("panda"). + UpdateScale(context.TODO(), "snorlax", &autoscalingv1.Scale{ObjectMeta: metav1.ObjectMeta{Name: "snorlax"}}, metav1.UpdateOptions{}) + if err != nil { + t.Fatal(err) + } + } + + createExampleViaRESTClientFunc := func(t *testing.T, config *rest.Config) { + kubeClient, err := kubernetes.NewForConfig(config) + if err != nil { + t.Fatalf("failed to create REST client: %v", err) + } + + client := crv1client.New(kubeClient.CoreV1().RESTClient()) + + _, err = client.CrV1().Examples("panda"). + Create(context.TODO(), &crv1.Example{ObjectMeta: metav1.ObjectMeta{Name: "snorlax"}}, metav1.CreateOptions{}) + if err != nil { + t.Fatal(err) + } + } + + tests := []struct { + name string + createFunc func(*testing.T, *rest.Config) + contentType string + expectedPath string + expectContentType string + expectBody string + }{ + { + name: "default", + createFunc: createPodFunc, + contentType: "", + expectedPath: "/api/v1/namespaces/panda/pods", + expectContentType: "application/vnd.kubernetes.protobuf", + expectBody: "k8s\x00\n\t\n\x02v1\x12\x03Pod\x12I\n\x17\n\asnorlax\x12\x00\x1a\x00\"\x00*\x002\x008\x00B\x00\x12\x1c\x1a\x002\x00B\x00J\x00R\x00X\x00`\x00h\x00\x82\x01\x00\x8a\x01\x00\x9a\x01\x00\xc2\x01\x00\x1a\x10\n\x00\x1a\x00\"\x00*\x002\x00J\x00Z\x00r\x00\x1a\x00\"\x00", + }, + { + name: "json", + createFunc: createPodFunc, + contentType: "application/json", + expectedPath: "/api/v1/namespaces/panda/pods", + expectContentType: "application/json", + expectBody: `{"kind":"Pod","apiVersion":"v1","metadata":{"name":"snorlax","creationTimestamp":null},"spec":{"containers":null},"status":{}} +`, + }, + { + name: "default update scale", + createFunc: updateScaleFunc, + contentType: "", + expectedPath: "/apis/apps/v1/namespaces/panda/deployments/snorlax/scale", + expectContentType: "application/vnd.kubernetes.protobuf", + expectBody: "k8s\u0000\n\u0017\n\u000Eautoscaling/v1\u0012\u0005Scale\u0012#\n\u0017\n\asnorlax\u0012\u0000\u001A\u0000\"\u0000*\u00002\u00008\u0000B\u0000\u0012\u0002\b\u0000\u001A\u0004\b\u0000\u0012\u0000\u001A\u0000\"\u0000", + }, + { + name: "json update scale", + createFunc: updateScaleFunc, + contentType: "application/json", + expectedPath: "/apis/apps/v1/namespaces/panda/deployments/snorlax/scale", + expectContentType: "application/json", + expectBody: `{"kind":"Scale","apiVersion":"autoscaling/v1","metadata":{"name":"snorlax","creationTimestamp":null},"spec":{},"status":{"replicas":0}} +`, + }, + { + name: "default via RESTClient", + createFunc: createExampleViaRESTClientFunc, + contentType: "", + expectedPath: "/api/v1/namespaces/panda/examples", + expectContentType: "application/json", + expectBody: `{"metadata":{"name":"snorlax","creationTimestamp":null},"spec":{"foo":"","bar":false},"status":{}} +`, + }, + { + name: "json via RESTClient", + createFunc: createExampleViaRESTClientFunc, + contentType: "application/json", + expectedPath: "/api/v1/namespaces/panda/examples", + expectContentType: "application/json", + expectBody: `{"metadata":{"name":"snorlax","creationTimestamp":null},"spec":{"foo":"","bar":false},"status":{}} +`, + }, + } + + for _, tc := range tests { + t.Run(tc.name, func(t *testing.T) { + var calls atomic.Uint64 + ts := httptest.NewUnstartedServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + calls.Add(1) + + if got, want := r.URL.Path, tc.expectedPath; got != want { + t.Errorf("unexpected path, got=%q, want=%q", got, want) + } + + if got, want := r.Header.Get("content-type"), tc.expectContentType; got != want { + t.Errorf("unexpected content-type, got=%q, want=%q", got, want) + } + + if r.Body == nil { + t.Fatal("request body is nil") + } + body, err := io.ReadAll(r.Body) + if err != nil { + t.Fatal(err) + } + _ = r.Body.Close() + if diff := cmp.Diff(tc.expectBody, string(body)); len(diff) > 0 { + t.Errorf("body diff (-want, +got):\n%s", diff) + } + + w.Header().Set("Content-Type", "application/json") + _, _ = w.Write([]byte("{}")) + })) + ts.Start() + defer ts.Close() + + config := &rest.Config{ + Host: ts.URL, + ContentConfig: rest.ContentConfig{ContentType: tc.contentType}, + } + + tc.createFunc(t, config) + + if calls.Load() != 1 { + t.Errorf("unexpected handler call count: %d", calls.Load()) + } + }) + } +} diff --git a/pkg/controller/controller_utils_test.go b/pkg/controller/controller_utils_test.go index cbda5d26cfa..ef6f74127af 100644 --- a/pkg/controller/controller_utils_test.go +++ b/pkg/controller/controller_utils_test.go @@ -375,7 +375,7 @@ func TestCreatePodsWithGenerateName(t *testing.T) { } testServer := httptest.NewServer(&fakeHandler) defer testServer.Close() - clientset := clientset.NewForConfigOrDie(&restclient.Config{Host: testServer.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &schema.GroupVersion{Group: "", Version: "v1"}}}) + clientset := clientset.NewForConfigOrDie(&restclient.Config{Host: testServer.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &schema.GroupVersion{Group: "", Version: "v1"}, ContentType: runtime.ContentTypeJSON}}) podControl := RealPodControl{ KubeClient: clientset, diff --git a/pkg/controller/endpoint/endpoints_controller_test.go b/pkg/controller/endpoint/endpoints_controller_test.go index 4147d74b2e4..d1c71321e69 100644 --- a/pkg/controller/endpoint/endpoints_controller_test.go +++ b/pkg/controller/endpoint/endpoints_controller_test.go @@ -27,6 +27,7 @@ import ( "time" "github.com/google/go-cmp/cmp" + v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" @@ -225,7 +226,7 @@ type endpointController struct { } func newController(ctx context.Context, url string, batchPeriod time.Duration) *endpointController { - client := clientset.NewForConfigOrDie(&restclient.Config{Host: url, ContentConfig: restclient.ContentConfig{GroupVersion: &schema.GroupVersion{Group: "", Version: "v1"}}}) + client := clientset.NewForConfigOrDie(&restclient.Config{Host: url, ContentConfig: restclient.ContentConfig{GroupVersion: &schema.GroupVersion{Group: "", Version: "v1"}, ContentType: runtime.ContentTypeJSON}}) informerFactory := informers.NewSharedInformerFactory(client, controllerpkg.NoResyncPeriodFunc()) endpoints := NewEndpointController(ctx, informerFactory.Core().V1().Pods(), informerFactory.Core().V1().Services(), informerFactory.Core().V1().Endpoints(), client, batchPeriod) diff --git a/staging/src/k8s.io/apiextensions-apiserver/examples/client-go/pkg/client/clientset/versioned/typed/cr/v1/example.go b/staging/src/k8s.io/apiextensions-apiserver/examples/client-go/pkg/client/clientset/versioned/typed/cr/v1/example.go index 04ac16e9480..ad4e26292c0 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/examples/client-go/pkg/client/clientset/versioned/typed/cr/v1/example.go +++ b/staging/src/k8s.io/apiextensions-apiserver/examples/client-go/pkg/client/clientset/versioned/typed/cr/v1/example.go @@ -64,6 +64,7 @@ func newExamples(c *CrV1Client, namespace string) *examples { scheme.ParameterCodec, namespace, func() *crv1.Example { return &crv1.Example{} }, - func() *crv1.ExampleList { return &crv1.ExampleList{} }), + func() *crv1.ExampleList { return &crv1.ExampleList{} }, + ), } } diff --git a/staging/src/k8s.io/apiextensions-apiserver/hack/update-codegen.sh b/staging/src/k8s.io/apiextensions-apiserver/hack/update-codegen.sh index 7d5770f59cc..93a25e2dc72 100755 --- a/staging/src/k8s.io/apiextensions-apiserver/hack/update-codegen.sh +++ b/staging/src/k8s.io/apiextensions-apiserver/hack/update-codegen.sh @@ -52,4 +52,5 @@ kube::codegen::gen_client \ --output-pkg "${THIS_PKG}/pkg/client" \ --versioned-name "clientset" \ --boilerplate "${SCRIPT_ROOT}/hack/boilerplate.go.txt" \ + --prefers-protobuf \ "${SCRIPT_ROOT}/pkg/apis" diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1/customresourcedefinition.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1/customresourcedefinition.go index d3418c2dc01..1197071d020 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1/customresourcedefinition.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1/customresourcedefinition.go @@ -70,6 +70,8 @@ func newCustomResourceDefinitions(c *ApiextensionsV1Client) *customResourceDefin func() *apiextensionsv1.CustomResourceDefinition { return &apiextensionsv1.CustomResourceDefinition{} }, func() *apiextensionsv1.CustomResourceDefinitionList { return &apiextensionsv1.CustomResourceDefinitionList{} - }), + }, + gentype.PrefersProtobuf[*apiextensionsv1.CustomResourceDefinition](), + ), } } diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/customresourcedefinition.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/customresourcedefinition.go index 8a26ab7b40a..e7ea4e971f2 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/customresourcedefinition.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/customresourcedefinition.go @@ -72,6 +72,8 @@ func newCustomResourceDefinitions(c *ApiextensionsV1beta1Client) *customResource }, func() *apiextensionsv1beta1.CustomResourceDefinitionList { return &apiextensionsv1beta1.CustomResourceDefinitionList{} - }), + }, + gentype.PrefersProtobuf[*apiextensionsv1beta1.CustomResourceDefinition](), + ), } } diff --git a/staging/src/k8s.io/client-go/gentype/type.go b/staging/src/k8s.io/client-go/gentype/type.go index b5be84318da..267f911188f 100644 --- a/staging/src/k8s.io/client-go/gentype/type.go +++ b/staging/src/k8s.io/client-go/gentype/type.go @@ -51,6 +51,8 @@ type Client[T objectWithMeta] struct { namespace string // "" for non-namespaced clients newObject func() T parameterCodec runtime.ParameterCodec + + prefersProtobuf bool } // ClientWithList represents a client with support for lists. @@ -82,26 +84,37 @@ type alsoApplier[T objectWithMeta, C namedObject] struct { client *Client[T] } +type Option[T objectWithMeta] func(*Client[T]) + +func PrefersProtobuf[T objectWithMeta]() Option[T] { + return func(c *Client[T]) { c.prefersProtobuf = true } +} + // NewClient constructs a client, namespaced or not, with no support for lists or apply. // Non-namespaced clients are constructed by passing an empty namespace (""). func NewClient[T objectWithMeta]( resource string, client rest.Interface, parameterCodec runtime.ParameterCodec, namespace string, emptyObjectCreator func() T, + options ...Option[T], ) *Client[T] { - return &Client[T]{ + c := &Client[T]{ resource: resource, client: client, parameterCodec: parameterCodec, namespace: namespace, newObject: emptyObjectCreator, } + for _, option := range options { + option(c) + } + return c } // NewClientWithList constructs a namespaced client with support for lists. func NewClientWithList[T objectWithMeta, L runtime.Object]( resource string, client rest.Interface, parameterCodec runtime.ParameterCodec, namespace string, emptyObjectCreator func() T, - emptyListCreator func() L, + emptyListCreator func() L, options ...Option[T], ) *ClientWithList[T, L] { - typeClient := NewClient[T](resource, client, parameterCodec, namespace, emptyObjectCreator) + typeClient := NewClient[T](resource, client, parameterCodec, namespace, emptyObjectCreator, options...) return &ClientWithList[T, L]{ typeClient, alsoLister[T, L]{typeClient, emptyListCreator}, @@ -111,8 +124,9 @@ func NewClientWithList[T objectWithMeta, L runtime.Object]( // NewClientWithApply constructs a namespaced client with support for apply declarative configurations. func NewClientWithApply[T objectWithMeta, C namedObject]( resource string, client rest.Interface, parameterCodec runtime.ParameterCodec, namespace string, emptyObjectCreator func() T, + options ...Option[T], ) *ClientWithApply[T, C] { - typeClient := NewClient[T](resource, client, parameterCodec, namespace, emptyObjectCreator) + typeClient := NewClient[T](resource, client, parameterCodec, namespace, emptyObjectCreator, options...) return &ClientWithApply[T, C]{ typeClient, alsoApplier[T, C]{typeClient}, @@ -122,9 +136,9 @@ func NewClientWithApply[T objectWithMeta, C namedObject]( // NewClientWithListAndApply constructs a client with support for lists and applying declarative configurations. func NewClientWithListAndApply[T objectWithMeta, L runtime.Object, C namedObject]( resource string, client rest.Interface, parameterCodec runtime.ParameterCodec, namespace string, emptyObjectCreator func() T, - emptyListCreator func() L, + emptyListCreator func() L, options ...Option[T], ) *ClientWithListAndApply[T, L, C] { - typeClient := NewClient[T](resource, client, parameterCodec, namespace, emptyObjectCreator) + typeClient := NewClient[T](resource, client, parameterCodec, namespace, emptyObjectCreator, options...) return &ClientWithListAndApply[T, L, C]{ typeClient, alsoLister[T, L]{typeClient, emptyListCreator}, @@ -146,6 +160,7 @@ func (c *Client[T]) GetNamespace() string { func (c *Client[T]) Get(ctx context.Context, name string, options metav1.GetOptions) (T, error) { result := c.newObject() err := c.client.Get(). + UseProtobufAsDefaultIfPreferred(c.prefersProtobuf). NamespaceIfScoped(c.namespace, c.namespace != ""). Resource(c.resource). Name(name). @@ -181,6 +196,7 @@ func (l *alsoLister[T, L]) list(ctx context.Context, opts metav1.ListOptions) (L timeout = time.Duration(*opts.TimeoutSeconds) * time.Second } err := l.client.client.Get(). + UseProtobufAsDefaultIfPreferred(l.client.prefersProtobuf). NamespaceIfScoped(l.client.namespace, l.client.namespace != ""). Resource(l.client.resource). VersionedParams(&opts, l.client.parameterCodec). @@ -198,6 +214,7 @@ func (l *alsoLister[T, L]) watchList(ctx context.Context, opts metav1.ListOption } result = l.newList() err = l.client.client.Get(). + UseProtobufAsDefaultIfPreferred(l.client.prefersProtobuf). NamespaceIfScoped(l.client.namespace, l.client.namespace != ""). Resource(l.client.resource). VersionedParams(&opts, l.client.parameterCodec). @@ -215,6 +232,7 @@ func (c *Client[T]) Watch(ctx context.Context, opts metav1.ListOptions) (watch.I } opts.Watch = true return c.client.Get(). + UseProtobufAsDefaultIfPreferred(c.prefersProtobuf). NamespaceIfScoped(c.namespace, c.namespace != ""). Resource(c.resource). VersionedParams(&opts, c.parameterCodec). @@ -226,6 +244,7 @@ func (c *Client[T]) Watch(ctx context.Context, opts metav1.ListOptions) (watch.I func (c *Client[T]) Create(ctx context.Context, obj T, opts metav1.CreateOptions) (T, error) { result := c.newObject() err := c.client.Post(). + UseProtobufAsDefaultIfPreferred(c.prefersProtobuf). NamespaceIfScoped(c.namespace, c.namespace != ""). Resource(c.resource). VersionedParams(&opts, c.parameterCodec). @@ -239,6 +258,7 @@ func (c *Client[T]) Create(ctx context.Context, obj T, opts metav1.CreateOptions func (c *Client[T]) Update(ctx context.Context, obj T, opts metav1.UpdateOptions) (T, error) { result := c.newObject() err := c.client.Put(). + UseProtobufAsDefaultIfPreferred(c.prefersProtobuf). NamespaceIfScoped(c.namespace, c.namespace != ""). Resource(c.resource). Name(obj.GetName()). @@ -253,6 +273,7 @@ func (c *Client[T]) Update(ctx context.Context, obj T, opts metav1.UpdateOptions func (c *Client[T]) UpdateStatus(ctx context.Context, obj T, opts metav1.UpdateOptions) (T, error) { result := c.newObject() err := c.client.Put(). + UseProtobufAsDefaultIfPreferred(c.prefersProtobuf). NamespaceIfScoped(c.namespace, c.namespace != ""). Resource(c.resource). Name(obj.GetName()). @@ -267,6 +288,7 @@ func (c *Client[T]) UpdateStatus(ctx context.Context, obj T, opts metav1.UpdateO // Delete takes name of the resource and deletes it. Returns an error if one occurs. func (c *Client[T]) Delete(ctx context.Context, name string, opts metav1.DeleteOptions) error { return c.client.Delete(). + UseProtobufAsDefaultIfPreferred(c.prefersProtobuf). NamespaceIfScoped(c.namespace, c.namespace != ""). Resource(c.resource). Name(name). @@ -282,6 +304,7 @@ func (l *alsoLister[T, L]) DeleteCollection(ctx context.Context, opts metav1.Del timeout = time.Duration(*listOpts.TimeoutSeconds) * time.Second } return l.client.client.Delete(). + UseProtobufAsDefaultIfPreferred(l.client.prefersProtobuf). NamespaceIfScoped(l.client.namespace, l.client.namespace != ""). Resource(l.client.resource). VersionedParams(&listOpts, l.client.parameterCodec). @@ -295,6 +318,7 @@ func (l *alsoLister[T, L]) DeleteCollection(ctx context.Context, opts metav1.Del func (c *Client[T]) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts metav1.PatchOptions, subresources ...string) (T, error) { result := c.newObject() err := c.client.Patch(pt). + UseProtobufAsDefaultIfPreferred(c.prefersProtobuf). NamespaceIfScoped(c.namespace, c.namespace != ""). Resource(c.resource). Name(name). @@ -321,6 +345,7 @@ func (a *alsoApplier[T, C]) Apply(ctx context.Context, obj C, opts metav1.ApplyO return *new(T), fmt.Errorf("obj.Name must be provided to Apply") } err = a.client.client.Patch(types.ApplyPatchType). + UseProtobufAsDefaultIfPreferred(a.client.prefersProtobuf). NamespaceIfScoped(a.client.namespace, a.client.namespace != ""). Resource(a.client.resource). Name(*obj.GetName()). @@ -348,6 +373,7 @@ func (a *alsoApplier[T, C]) ApplyStatus(ctx context.Context, obj C, opts metav1. result := a.client.newObject() err = a.client.client.Patch(types.ApplyPatchType). + UseProtobufAsDefaultIfPreferred(a.client.prefersProtobuf). NamespaceIfScoped(a.client.namespace, a.client.namespace != ""). Resource(a.client.resource). Name(*obj.GetName()). diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/admissionregistration/v1/mutatingwebhookconfiguration.go b/staging/src/k8s.io/client-go/kubernetes/typed/admissionregistration/v1/mutatingwebhookconfiguration.go index 4a5bf01fcf5..d46a3c987e7 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/admissionregistration/v1/mutatingwebhookconfiguration.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/admissionregistration/v1/mutatingwebhookconfiguration.go @@ -68,6 +68,8 @@ func newMutatingWebhookConfigurations(c *AdmissionregistrationV1Client) *mutatin }, func() *admissionregistrationv1.MutatingWebhookConfigurationList { return &admissionregistrationv1.MutatingWebhookConfigurationList{} - }), + }, + gentype.PrefersProtobuf[*admissionregistrationv1.MutatingWebhookConfiguration](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/admissionregistration/v1/validatingadmissionpolicy.go b/staging/src/k8s.io/client-go/kubernetes/typed/admissionregistration/v1/validatingadmissionpolicy.go index f8853e84555..2d56ab168e5 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/admissionregistration/v1/validatingadmissionpolicy.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/admissionregistration/v1/validatingadmissionpolicy.go @@ -72,6 +72,8 @@ func newValidatingAdmissionPolicies(c *AdmissionregistrationV1Client) *validatin }, func() *admissionregistrationv1.ValidatingAdmissionPolicyList { return &admissionregistrationv1.ValidatingAdmissionPolicyList{} - }), + }, + gentype.PrefersProtobuf[*admissionregistrationv1.ValidatingAdmissionPolicy](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/admissionregistration/v1/validatingadmissionpolicybinding.go b/staging/src/k8s.io/client-go/kubernetes/typed/admissionregistration/v1/validatingadmissionpolicybinding.go index c8f03ca5c32..d3eaa0d2d15 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/admissionregistration/v1/validatingadmissionpolicybinding.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/admissionregistration/v1/validatingadmissionpolicybinding.go @@ -68,6 +68,8 @@ func newValidatingAdmissionPolicyBindings(c *AdmissionregistrationV1Client) *val }, func() *admissionregistrationv1.ValidatingAdmissionPolicyBindingList { return &admissionregistrationv1.ValidatingAdmissionPolicyBindingList{} - }), + }, + gentype.PrefersProtobuf[*admissionregistrationv1.ValidatingAdmissionPolicyBinding](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/admissionregistration/v1/validatingwebhookconfiguration.go b/staging/src/k8s.io/client-go/kubernetes/typed/admissionregistration/v1/validatingwebhookconfiguration.go index 8dcf1e06d93..f8f60f6819d 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/admissionregistration/v1/validatingwebhookconfiguration.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/admissionregistration/v1/validatingwebhookconfiguration.go @@ -68,6 +68,8 @@ func newValidatingWebhookConfigurations(c *AdmissionregistrationV1Client) *valid }, func() *admissionregistrationv1.ValidatingWebhookConfigurationList { return &admissionregistrationv1.ValidatingWebhookConfigurationList{} - }), + }, + gentype.PrefersProtobuf[*admissionregistrationv1.ValidatingWebhookConfiguration](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1/validatingadmissionpolicy.go b/staging/src/k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1/validatingadmissionpolicy.go index 35bbe81c9ed..ce2328b12bd 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1/validatingadmissionpolicy.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1/validatingadmissionpolicy.go @@ -72,6 +72,8 @@ func newValidatingAdmissionPolicies(c *AdmissionregistrationV1alpha1Client) *val }, func() *admissionregistrationv1alpha1.ValidatingAdmissionPolicyList { return &admissionregistrationv1alpha1.ValidatingAdmissionPolicyList{} - }), + }, + gentype.PrefersProtobuf[*admissionregistrationv1alpha1.ValidatingAdmissionPolicy](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1/validatingadmissionpolicybinding.go b/staging/src/k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1/validatingadmissionpolicybinding.go index 291a88218be..6236ea90c96 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1/validatingadmissionpolicybinding.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1/validatingadmissionpolicybinding.go @@ -68,6 +68,8 @@ func newValidatingAdmissionPolicyBindings(c *AdmissionregistrationV1alpha1Client }, func() *admissionregistrationv1alpha1.ValidatingAdmissionPolicyBindingList { return &admissionregistrationv1alpha1.ValidatingAdmissionPolicyBindingList{} - }), + }, + gentype.PrefersProtobuf[*admissionregistrationv1alpha1.ValidatingAdmissionPolicyBinding](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/admissionregistration/v1beta1/mutatingwebhookconfiguration.go b/staging/src/k8s.io/client-go/kubernetes/typed/admissionregistration/v1beta1/mutatingwebhookconfiguration.go index d0748363871..17e3541cc3f 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/admissionregistration/v1beta1/mutatingwebhookconfiguration.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/admissionregistration/v1beta1/mutatingwebhookconfiguration.go @@ -68,6 +68,8 @@ func newMutatingWebhookConfigurations(c *AdmissionregistrationV1beta1Client) *mu }, func() *admissionregistrationv1beta1.MutatingWebhookConfigurationList { return &admissionregistrationv1beta1.MutatingWebhookConfigurationList{} - }), + }, + gentype.PrefersProtobuf[*admissionregistrationv1beta1.MutatingWebhookConfiguration](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/admissionregistration/v1beta1/validatingadmissionpolicy.go b/staging/src/k8s.io/client-go/kubernetes/typed/admissionregistration/v1beta1/validatingadmissionpolicy.go index 49e9a865a29..2c663ba1e5f 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/admissionregistration/v1beta1/validatingadmissionpolicy.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/admissionregistration/v1beta1/validatingadmissionpolicy.go @@ -72,6 +72,8 @@ func newValidatingAdmissionPolicies(c *AdmissionregistrationV1beta1Client) *vali }, func() *admissionregistrationv1beta1.ValidatingAdmissionPolicyList { return &admissionregistrationv1beta1.ValidatingAdmissionPolicyList{} - }), + }, + gentype.PrefersProtobuf[*admissionregistrationv1beta1.ValidatingAdmissionPolicy](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/admissionregistration/v1beta1/validatingadmissionpolicybinding.go b/staging/src/k8s.io/client-go/kubernetes/typed/admissionregistration/v1beta1/validatingadmissionpolicybinding.go index dd803e06fe7..196cc8f0a4c 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/admissionregistration/v1beta1/validatingadmissionpolicybinding.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/admissionregistration/v1beta1/validatingadmissionpolicybinding.go @@ -68,6 +68,8 @@ func newValidatingAdmissionPolicyBindings(c *AdmissionregistrationV1beta1Client) }, func() *admissionregistrationv1beta1.ValidatingAdmissionPolicyBindingList { return &admissionregistrationv1beta1.ValidatingAdmissionPolicyBindingList{} - }), + }, + gentype.PrefersProtobuf[*admissionregistrationv1beta1.ValidatingAdmissionPolicyBinding](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/admissionregistration/v1beta1/validatingwebhookconfiguration.go b/staging/src/k8s.io/client-go/kubernetes/typed/admissionregistration/v1beta1/validatingwebhookconfiguration.go index 69e886e094c..9f28346e8c8 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/admissionregistration/v1beta1/validatingwebhookconfiguration.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/admissionregistration/v1beta1/validatingwebhookconfiguration.go @@ -68,6 +68,8 @@ func newValidatingWebhookConfigurations(c *AdmissionregistrationV1beta1Client) * }, func() *admissionregistrationv1beta1.ValidatingWebhookConfigurationList { return &admissionregistrationv1beta1.ValidatingWebhookConfigurationList{} - }), + }, + gentype.PrefersProtobuf[*admissionregistrationv1beta1.ValidatingWebhookConfiguration](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/apiserverinternal/v1alpha1/storageversion.go b/staging/src/k8s.io/client-go/kubernetes/typed/apiserverinternal/v1alpha1/storageversion.go index 708b046aacf..cea897b3d68 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/apiserverinternal/v1alpha1/storageversion.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/apiserverinternal/v1alpha1/storageversion.go @@ -70,6 +70,8 @@ func newStorageVersions(c *InternalV1alpha1Client) *storageVersions { func() *apiserverinternalv1alpha1.StorageVersion { return &apiserverinternalv1alpha1.StorageVersion{} }, func() *apiserverinternalv1alpha1.StorageVersionList { return &apiserverinternalv1alpha1.StorageVersionList{} - }), + }, + gentype.PrefersProtobuf[*apiserverinternalv1alpha1.StorageVersion](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1/controllerrevision.go b/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1/controllerrevision.go index 54c27933567..8bf810810c6 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1/controllerrevision.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1/controllerrevision.go @@ -64,6 +64,8 @@ func newControllerRevisions(c *AppsV1Client, namespace string) *controllerRevisi scheme.ParameterCodec, namespace, func() *appsv1.ControllerRevision { return &appsv1.ControllerRevision{} }, - func() *appsv1.ControllerRevisionList { return &appsv1.ControllerRevisionList{} }), + func() *appsv1.ControllerRevisionList { return &appsv1.ControllerRevisionList{} }, + gentype.PrefersProtobuf[*appsv1.ControllerRevision](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1/daemonset.go b/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1/daemonset.go index 3d2309c2362..6354da219de 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1/daemonset.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1/daemonset.go @@ -68,6 +68,8 @@ func newDaemonSets(c *AppsV1Client, namespace string) *daemonSets { scheme.ParameterCodec, namespace, func() *appsv1.DaemonSet { return &appsv1.DaemonSet{} }, - func() *appsv1.DaemonSetList { return &appsv1.DaemonSetList{} }), + func() *appsv1.DaemonSetList { return &appsv1.DaemonSetList{} }, + gentype.PrefersProtobuf[*appsv1.DaemonSet](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1/deployment.go b/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1/deployment.go index d190419b1a4..98665eb9de7 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1/deployment.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1/deployment.go @@ -76,7 +76,9 @@ func newDeployments(c *AppsV1Client, namespace string) *deployments { scheme.ParameterCodec, namespace, func() *appsv1.Deployment { return &appsv1.Deployment{} }, - func() *appsv1.DeploymentList { return &appsv1.DeploymentList{} }), + func() *appsv1.DeploymentList { return &appsv1.DeploymentList{} }, + gentype.PrefersProtobuf[*appsv1.Deployment](), + ), } } @@ -84,6 +86,7 @@ func newDeployments(c *AppsV1Client, namespace string) *deployments { func (c *deployments) GetScale(ctx context.Context, deploymentName string, options metav1.GetOptions) (result *autoscalingv1.Scale, err error) { result = &autoscalingv1.Scale{} err = c.GetClient().Get(). + UseProtobufAsDefault(). Namespace(c.GetNamespace()). Resource("deployments"). Name(deploymentName). @@ -98,6 +101,7 @@ func (c *deployments) GetScale(ctx context.Context, deploymentName string, optio func (c *deployments) UpdateScale(ctx context.Context, deploymentName string, scale *autoscalingv1.Scale, opts metav1.UpdateOptions) (result *autoscalingv1.Scale, err error) { result = &autoscalingv1.Scale{} err = c.GetClient().Put(). + UseProtobufAsDefault(). Namespace(c.GetNamespace()). Resource("deployments"). Name(deploymentName). @@ -123,6 +127,7 @@ func (c *deployments) ApplyScale(ctx context.Context, deploymentName string, sca result = &autoscalingv1.Scale{} err = c.GetClient().Patch(types.ApplyPatchType). + UseProtobufAsDefault(). Namespace(c.GetNamespace()). Resource("deployments"). Name(deploymentName). diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1/replicaset.go b/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1/replicaset.go index 8884c0edf7d..b3efc668476 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1/replicaset.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1/replicaset.go @@ -76,7 +76,9 @@ func newReplicaSets(c *AppsV1Client, namespace string) *replicaSets { scheme.ParameterCodec, namespace, func() *appsv1.ReplicaSet { return &appsv1.ReplicaSet{} }, - func() *appsv1.ReplicaSetList { return &appsv1.ReplicaSetList{} }), + func() *appsv1.ReplicaSetList { return &appsv1.ReplicaSetList{} }, + gentype.PrefersProtobuf[*appsv1.ReplicaSet](), + ), } } @@ -84,6 +86,7 @@ func newReplicaSets(c *AppsV1Client, namespace string) *replicaSets { func (c *replicaSets) GetScale(ctx context.Context, replicaSetName string, options metav1.GetOptions) (result *autoscalingv1.Scale, err error) { result = &autoscalingv1.Scale{} err = c.GetClient().Get(). + UseProtobufAsDefault(). Namespace(c.GetNamespace()). Resource("replicasets"). Name(replicaSetName). @@ -98,6 +101,7 @@ func (c *replicaSets) GetScale(ctx context.Context, replicaSetName string, optio func (c *replicaSets) UpdateScale(ctx context.Context, replicaSetName string, scale *autoscalingv1.Scale, opts metav1.UpdateOptions) (result *autoscalingv1.Scale, err error) { result = &autoscalingv1.Scale{} err = c.GetClient().Put(). + UseProtobufAsDefault(). Namespace(c.GetNamespace()). Resource("replicasets"). Name(replicaSetName). @@ -123,6 +127,7 @@ func (c *replicaSets) ApplyScale(ctx context.Context, replicaSetName string, sca result = &autoscalingv1.Scale{} err = c.GetClient().Patch(types.ApplyPatchType). + UseProtobufAsDefault(). Namespace(c.GetNamespace()). Resource("replicasets"). Name(replicaSetName). diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1/statefulset.go b/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1/statefulset.go index e0aaa08f3c7..e135c34089e 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1/statefulset.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1/statefulset.go @@ -76,7 +76,9 @@ func newStatefulSets(c *AppsV1Client, namespace string) *statefulSets { scheme.ParameterCodec, namespace, func() *appsv1.StatefulSet { return &appsv1.StatefulSet{} }, - func() *appsv1.StatefulSetList { return &appsv1.StatefulSetList{} }), + func() *appsv1.StatefulSetList { return &appsv1.StatefulSetList{} }, + gentype.PrefersProtobuf[*appsv1.StatefulSet](), + ), } } @@ -84,6 +86,7 @@ func newStatefulSets(c *AppsV1Client, namespace string) *statefulSets { func (c *statefulSets) GetScale(ctx context.Context, statefulSetName string, options metav1.GetOptions) (result *autoscalingv1.Scale, err error) { result = &autoscalingv1.Scale{} err = c.GetClient().Get(). + UseProtobufAsDefault(). Namespace(c.GetNamespace()). Resource("statefulsets"). Name(statefulSetName). @@ -98,6 +101,7 @@ func (c *statefulSets) GetScale(ctx context.Context, statefulSetName string, opt func (c *statefulSets) UpdateScale(ctx context.Context, statefulSetName string, scale *autoscalingv1.Scale, opts metav1.UpdateOptions) (result *autoscalingv1.Scale, err error) { result = &autoscalingv1.Scale{} err = c.GetClient().Put(). + UseProtobufAsDefault(). Namespace(c.GetNamespace()). Resource("statefulsets"). Name(statefulSetName). @@ -123,6 +127,7 @@ func (c *statefulSets) ApplyScale(ctx context.Context, statefulSetName string, s result = &autoscalingv1.Scale{} err = c.GetClient().Patch(types.ApplyPatchType). + UseProtobufAsDefault(). Namespace(c.GetNamespace()). Resource("statefulsets"). Name(statefulSetName). diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta1/controllerrevision.go b/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta1/controllerrevision.go index f9a526a0861..1bd92695bd6 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta1/controllerrevision.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta1/controllerrevision.go @@ -64,6 +64,8 @@ func newControllerRevisions(c *AppsV1beta1Client, namespace string) *controllerR scheme.ParameterCodec, namespace, func() *appsv1beta1.ControllerRevision { return &appsv1beta1.ControllerRevision{} }, - func() *appsv1beta1.ControllerRevisionList { return &appsv1beta1.ControllerRevisionList{} }), + func() *appsv1beta1.ControllerRevisionList { return &appsv1beta1.ControllerRevisionList{} }, + gentype.PrefersProtobuf[*appsv1beta1.ControllerRevision](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta1/deployment.go b/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta1/deployment.go index be3549eb555..e01dd5a2fa7 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta1/deployment.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta1/deployment.go @@ -68,6 +68,8 @@ func newDeployments(c *AppsV1beta1Client, namespace string) *deployments { scheme.ParameterCodec, namespace, func() *appsv1beta1.Deployment { return &appsv1beta1.Deployment{} }, - func() *appsv1beta1.DeploymentList { return &appsv1beta1.DeploymentList{} }), + func() *appsv1beta1.DeploymentList { return &appsv1beta1.DeploymentList{} }, + gentype.PrefersProtobuf[*appsv1beta1.Deployment](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta1/statefulset.go b/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta1/statefulset.go index 813897c5093..b88acdeb010 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta1/statefulset.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta1/statefulset.go @@ -68,6 +68,8 @@ func newStatefulSets(c *AppsV1beta1Client, namespace string) *statefulSets { scheme.ParameterCodec, namespace, func() *appsv1beta1.StatefulSet { return &appsv1beta1.StatefulSet{} }, - func() *appsv1beta1.StatefulSetList { return &appsv1beta1.StatefulSetList{} }), + func() *appsv1beta1.StatefulSetList { return &appsv1beta1.StatefulSetList{} }, + gentype.PrefersProtobuf[*appsv1beta1.StatefulSet](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta2/controllerrevision.go b/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta2/controllerrevision.go index ed3cfc6ce6c..a170805b33e 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta2/controllerrevision.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta2/controllerrevision.go @@ -64,6 +64,8 @@ func newControllerRevisions(c *AppsV1beta2Client, namespace string) *controllerR scheme.ParameterCodec, namespace, func() *appsv1beta2.ControllerRevision { return &appsv1beta2.ControllerRevision{} }, - func() *appsv1beta2.ControllerRevisionList { return &appsv1beta2.ControllerRevisionList{} }), + func() *appsv1beta2.ControllerRevisionList { return &appsv1beta2.ControllerRevisionList{} }, + gentype.PrefersProtobuf[*appsv1beta2.ControllerRevision](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta2/daemonset.go b/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta2/daemonset.go index a5c61a47cf5..f078121b049 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta2/daemonset.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta2/daemonset.go @@ -68,6 +68,8 @@ func newDaemonSets(c *AppsV1beta2Client, namespace string) *daemonSets { scheme.ParameterCodec, namespace, func() *appsv1beta2.DaemonSet { return &appsv1beta2.DaemonSet{} }, - func() *appsv1beta2.DaemonSetList { return &appsv1beta2.DaemonSetList{} }), + func() *appsv1beta2.DaemonSetList { return &appsv1beta2.DaemonSetList{} }, + gentype.PrefersProtobuf[*appsv1beta2.DaemonSet](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta2/deployment.go b/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta2/deployment.go index ed46cf3be04..1be57edb24a 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta2/deployment.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta2/deployment.go @@ -68,6 +68,8 @@ func newDeployments(c *AppsV1beta2Client, namespace string) *deployments { scheme.ParameterCodec, namespace, func() *appsv1beta2.Deployment { return &appsv1beta2.Deployment{} }, - func() *appsv1beta2.DeploymentList { return &appsv1beta2.DeploymentList{} }), + func() *appsv1beta2.DeploymentList { return &appsv1beta2.DeploymentList{} }, + gentype.PrefersProtobuf[*appsv1beta2.Deployment](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta2/replicaset.go b/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta2/replicaset.go index 6ec54c096fb..12bac0923aa 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta2/replicaset.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta2/replicaset.go @@ -68,6 +68,8 @@ func newReplicaSets(c *AppsV1beta2Client, namespace string) *replicaSets { scheme.ParameterCodec, namespace, func() *appsv1beta2.ReplicaSet { return &appsv1beta2.ReplicaSet{} }, - func() *appsv1beta2.ReplicaSetList { return &appsv1beta2.ReplicaSetList{} }), + func() *appsv1beta2.ReplicaSetList { return &appsv1beta2.ReplicaSetList{} }, + gentype.PrefersProtobuf[*appsv1beta2.ReplicaSet](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta2/statefulset.go b/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta2/statefulset.go index 205c8c8c8cf..879d86bc8dd 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta2/statefulset.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta2/statefulset.go @@ -74,7 +74,9 @@ func newStatefulSets(c *AppsV1beta2Client, namespace string) *statefulSets { scheme.ParameterCodec, namespace, func() *appsv1beta2.StatefulSet { return &appsv1beta2.StatefulSet{} }, - func() *appsv1beta2.StatefulSetList { return &appsv1beta2.StatefulSetList{} }), + func() *appsv1beta2.StatefulSetList { return &appsv1beta2.StatefulSetList{} }, + gentype.PrefersProtobuf[*appsv1beta2.StatefulSet](), + ), } } @@ -82,6 +84,7 @@ func newStatefulSets(c *AppsV1beta2Client, namespace string) *statefulSets { func (c *statefulSets) GetScale(ctx context.Context, statefulSetName string, options v1.GetOptions) (result *appsv1beta2.Scale, err error) { result = &appsv1beta2.Scale{} err = c.GetClient().Get(). + UseProtobufAsDefault(). Namespace(c.GetNamespace()). Resource("statefulsets"). Name(statefulSetName). @@ -96,6 +99,7 @@ func (c *statefulSets) GetScale(ctx context.Context, statefulSetName string, opt func (c *statefulSets) UpdateScale(ctx context.Context, statefulSetName string, scale *appsv1beta2.Scale, opts v1.UpdateOptions) (result *appsv1beta2.Scale, err error) { result = &appsv1beta2.Scale{} err = c.GetClient().Put(). + UseProtobufAsDefault(). Namespace(c.GetNamespace()). Resource("statefulsets"). Name(statefulSetName). @@ -121,6 +125,7 @@ func (c *statefulSets) ApplyScale(ctx context.Context, statefulSetName string, s result = &appsv1beta2.Scale{} err = c.GetClient().Patch(types.ApplyPatchType). + UseProtobufAsDefault(). Namespace(c.GetNamespace()). Resource("statefulsets"). Name(statefulSetName). diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/authentication/v1/selfsubjectreview.go b/staging/src/k8s.io/client-go/kubernetes/typed/authentication/v1/selfsubjectreview.go index c5191596b7d..9113b6a6dc3 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/authentication/v1/selfsubjectreview.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/authentication/v1/selfsubjectreview.go @@ -52,6 +52,8 @@ func newSelfSubjectReviews(c *AuthenticationV1Client) *selfSubjectReviews { c.RESTClient(), scheme.ParameterCodec, "", - func() *authenticationv1.SelfSubjectReview { return &authenticationv1.SelfSubjectReview{} }), + func() *authenticationv1.SelfSubjectReview { return &authenticationv1.SelfSubjectReview{} }, + gentype.PrefersProtobuf[*authenticationv1.SelfSubjectReview](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/authentication/v1/tokenreview.go b/staging/src/k8s.io/client-go/kubernetes/typed/authentication/v1/tokenreview.go index 939dbf9a61d..ce8b62d1b4d 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/authentication/v1/tokenreview.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/authentication/v1/tokenreview.go @@ -52,6 +52,8 @@ func newTokenReviews(c *AuthenticationV1Client) *tokenReviews { c.RESTClient(), scheme.ParameterCodec, "", - func() *authenticationv1.TokenReview { return &authenticationv1.TokenReview{} }), + func() *authenticationv1.TokenReview { return &authenticationv1.TokenReview{} }, + gentype.PrefersProtobuf[*authenticationv1.TokenReview](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/authentication/v1alpha1/selfsubjectreview.go b/staging/src/k8s.io/client-go/kubernetes/typed/authentication/v1alpha1/selfsubjectreview.go index 97b60d7a943..8d5b176f745 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/authentication/v1alpha1/selfsubjectreview.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/authentication/v1alpha1/selfsubjectreview.go @@ -52,6 +52,8 @@ func newSelfSubjectReviews(c *AuthenticationV1alpha1Client) *selfSubjectReviews c.RESTClient(), scheme.ParameterCodec, "", - func() *authenticationv1alpha1.SelfSubjectReview { return &authenticationv1alpha1.SelfSubjectReview{} }), + func() *authenticationv1alpha1.SelfSubjectReview { return &authenticationv1alpha1.SelfSubjectReview{} }, + gentype.PrefersProtobuf[*authenticationv1alpha1.SelfSubjectReview](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/authentication/v1beta1/selfsubjectreview.go b/staging/src/k8s.io/client-go/kubernetes/typed/authentication/v1beta1/selfsubjectreview.go index cbd090fd3e8..e29f814514c 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/authentication/v1beta1/selfsubjectreview.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/authentication/v1beta1/selfsubjectreview.go @@ -52,6 +52,8 @@ func newSelfSubjectReviews(c *AuthenticationV1beta1Client) *selfSubjectReviews { c.RESTClient(), scheme.ParameterCodec, "", - func() *authenticationv1beta1.SelfSubjectReview { return &authenticationv1beta1.SelfSubjectReview{} }), + func() *authenticationv1beta1.SelfSubjectReview { return &authenticationv1beta1.SelfSubjectReview{} }, + gentype.PrefersProtobuf[*authenticationv1beta1.SelfSubjectReview](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/authentication/v1beta1/tokenreview.go b/staging/src/k8s.io/client-go/kubernetes/typed/authentication/v1beta1/tokenreview.go index 0316ef91526..5e1e002be44 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/authentication/v1beta1/tokenreview.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/authentication/v1beta1/tokenreview.go @@ -52,6 +52,8 @@ func newTokenReviews(c *AuthenticationV1beta1Client) *tokenReviews { c.RESTClient(), scheme.ParameterCodec, "", - func() *authenticationv1beta1.TokenReview { return &authenticationv1beta1.TokenReview{} }), + func() *authenticationv1beta1.TokenReview { return &authenticationv1beta1.TokenReview{} }, + gentype.PrefersProtobuf[*authenticationv1beta1.TokenReview](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1/localsubjectaccessreview.go b/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1/localsubjectaccessreview.go index 4c43c80a088..24327e87f20 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1/localsubjectaccessreview.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1/localsubjectaccessreview.go @@ -52,6 +52,8 @@ func newLocalSubjectAccessReviews(c *AuthorizationV1Client, namespace string) *l c.RESTClient(), scheme.ParameterCodec, namespace, - func() *authorizationv1.LocalSubjectAccessReview { return &authorizationv1.LocalSubjectAccessReview{} }), + func() *authorizationv1.LocalSubjectAccessReview { return &authorizationv1.LocalSubjectAccessReview{} }, + gentype.PrefersProtobuf[*authorizationv1.LocalSubjectAccessReview](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1/selfsubjectaccessreview.go b/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1/selfsubjectaccessreview.go index 2f39b3b72c1..014faeffb4a 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1/selfsubjectaccessreview.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1/selfsubjectaccessreview.go @@ -52,6 +52,8 @@ func newSelfSubjectAccessReviews(c *AuthorizationV1Client) *selfSubjectAccessRev c.RESTClient(), scheme.ParameterCodec, "", - func() *authorizationv1.SelfSubjectAccessReview { return &authorizationv1.SelfSubjectAccessReview{} }), + func() *authorizationv1.SelfSubjectAccessReview { return &authorizationv1.SelfSubjectAccessReview{} }, + gentype.PrefersProtobuf[*authorizationv1.SelfSubjectAccessReview](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1/selfsubjectrulesreview.go b/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1/selfsubjectrulesreview.go index 357f9b67e98..a14b2d7d5ea 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1/selfsubjectrulesreview.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1/selfsubjectrulesreview.go @@ -52,6 +52,8 @@ func newSelfSubjectRulesReviews(c *AuthorizationV1Client) *selfSubjectRulesRevie c.RESTClient(), scheme.ParameterCodec, "", - func() *authorizationv1.SelfSubjectRulesReview { return &authorizationv1.SelfSubjectRulesReview{} }), + func() *authorizationv1.SelfSubjectRulesReview { return &authorizationv1.SelfSubjectRulesReview{} }, + gentype.PrefersProtobuf[*authorizationv1.SelfSubjectRulesReview](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1/subjectaccessreview.go b/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1/subjectaccessreview.go index 3df3b347aeb..bdc9955ad68 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1/subjectaccessreview.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1/subjectaccessreview.go @@ -52,6 +52,8 @@ func newSubjectAccessReviews(c *AuthorizationV1Client) *subjectAccessReviews { c.RESTClient(), scheme.ParameterCodec, "", - func() *authorizationv1.SubjectAccessReview { return &authorizationv1.SubjectAccessReview{} }), + func() *authorizationv1.SubjectAccessReview { return &authorizationv1.SubjectAccessReview{} }, + gentype.PrefersProtobuf[*authorizationv1.SubjectAccessReview](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1beta1/localsubjectaccessreview.go b/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1beta1/localsubjectaccessreview.go index ef0f54a2924..8dcc984f794 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1beta1/localsubjectaccessreview.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1beta1/localsubjectaccessreview.go @@ -54,6 +54,8 @@ func newLocalSubjectAccessReviews(c *AuthorizationV1beta1Client, namespace strin namespace, func() *authorizationv1beta1.LocalSubjectAccessReview { return &authorizationv1beta1.LocalSubjectAccessReview{} - }), + }, + gentype.PrefersProtobuf[*authorizationv1beta1.LocalSubjectAccessReview](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1beta1/selfsubjectaccessreview.go b/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1beta1/selfsubjectaccessreview.go index b52a44a7536..b1f111f3fd2 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1beta1/selfsubjectaccessreview.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1beta1/selfsubjectaccessreview.go @@ -54,6 +54,8 @@ func newSelfSubjectAccessReviews(c *AuthorizationV1beta1Client) *selfSubjectAcce "", func() *authorizationv1beta1.SelfSubjectAccessReview { return &authorizationv1beta1.SelfSubjectAccessReview{} - }), + }, + gentype.PrefersProtobuf[*authorizationv1beta1.SelfSubjectAccessReview](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1beta1/selfsubjectrulesreview.go b/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1beta1/selfsubjectrulesreview.go index edd0137212e..11a11b8e6ea 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1beta1/selfsubjectrulesreview.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1beta1/selfsubjectrulesreview.go @@ -54,6 +54,8 @@ func newSelfSubjectRulesReviews(c *AuthorizationV1beta1Client) *selfSubjectRules "", func() *authorizationv1beta1.SelfSubjectRulesReview { return &authorizationv1beta1.SelfSubjectRulesReview{} - }), + }, + gentype.PrefersProtobuf[*authorizationv1beta1.SelfSubjectRulesReview](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1beta1/subjectaccessreview.go b/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1beta1/subjectaccessreview.go index 0c959e415e9..b625375218c 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1beta1/subjectaccessreview.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1beta1/subjectaccessreview.go @@ -52,6 +52,8 @@ func newSubjectAccessReviews(c *AuthorizationV1beta1Client) *subjectAccessReview c.RESTClient(), scheme.ParameterCodec, "", - func() *authorizationv1beta1.SubjectAccessReview { return &authorizationv1beta1.SubjectAccessReview{} }), + func() *authorizationv1beta1.SubjectAccessReview { return &authorizationv1beta1.SubjectAccessReview{} }, + gentype.PrefersProtobuf[*authorizationv1beta1.SubjectAccessReview](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v1/horizontalpodautoscaler.go b/staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v1/horizontalpodautoscaler.go index a7366d05215..c5c69b7c602 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v1/horizontalpodautoscaler.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v1/horizontalpodautoscaler.go @@ -68,6 +68,8 @@ func newHorizontalPodAutoscalers(c *AutoscalingV1Client, namespace string) *hori scheme.ParameterCodec, namespace, func() *autoscalingv1.HorizontalPodAutoscaler { return &autoscalingv1.HorizontalPodAutoscaler{} }, - func() *autoscalingv1.HorizontalPodAutoscalerList { return &autoscalingv1.HorizontalPodAutoscalerList{} }), + func() *autoscalingv1.HorizontalPodAutoscalerList { return &autoscalingv1.HorizontalPodAutoscalerList{} }, + gentype.PrefersProtobuf[*autoscalingv1.HorizontalPodAutoscaler](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v2/horizontalpodautoscaler.go b/staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v2/horizontalpodautoscaler.go index a60efcf98b6..9eb4a6d9380 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v2/horizontalpodautoscaler.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v2/horizontalpodautoscaler.go @@ -68,6 +68,8 @@ func newHorizontalPodAutoscalers(c *AutoscalingV2Client, namespace string) *hori scheme.ParameterCodec, namespace, func() *autoscalingv2.HorizontalPodAutoscaler { return &autoscalingv2.HorizontalPodAutoscaler{} }, - func() *autoscalingv2.HorizontalPodAutoscalerList { return &autoscalingv2.HorizontalPodAutoscalerList{} }), + func() *autoscalingv2.HorizontalPodAutoscalerList { return &autoscalingv2.HorizontalPodAutoscalerList{} }, + gentype.PrefersProtobuf[*autoscalingv2.HorizontalPodAutoscaler](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v2beta1/horizontalpodautoscaler.go b/staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v2beta1/horizontalpodautoscaler.go index 261da42e65c..c1dc75ccc32 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v2beta1/horizontalpodautoscaler.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v2beta1/horizontalpodautoscaler.go @@ -72,6 +72,8 @@ func newHorizontalPodAutoscalers(c *AutoscalingV2beta1Client, namespace string) }, func() *autoscalingv2beta1.HorizontalPodAutoscalerList { return &autoscalingv2beta1.HorizontalPodAutoscalerList{} - }), + }, + gentype.PrefersProtobuf[*autoscalingv2beta1.HorizontalPodAutoscaler](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v2beta2/horizontalpodautoscaler.go b/staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v2beta2/horizontalpodautoscaler.go index 6341665cda4..017b3e1fc0f 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v2beta2/horizontalpodautoscaler.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v2beta2/horizontalpodautoscaler.go @@ -72,6 +72,8 @@ func newHorizontalPodAutoscalers(c *AutoscalingV2beta2Client, namespace string) }, func() *autoscalingv2beta2.HorizontalPodAutoscalerList { return &autoscalingv2beta2.HorizontalPodAutoscalerList{} - }), + }, + gentype.PrefersProtobuf[*autoscalingv2beta2.HorizontalPodAutoscaler](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/batch/v1/cronjob.go b/staging/src/k8s.io/client-go/kubernetes/typed/batch/v1/cronjob.go index eb6c47c2fd1..29ef3e9b72d 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/batch/v1/cronjob.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/batch/v1/cronjob.go @@ -68,6 +68,8 @@ func newCronJobs(c *BatchV1Client, namespace string) *cronJobs { scheme.ParameterCodec, namespace, func() *batchv1.CronJob { return &batchv1.CronJob{} }, - func() *batchv1.CronJobList { return &batchv1.CronJobList{} }), + func() *batchv1.CronJobList { return &batchv1.CronJobList{} }, + gentype.PrefersProtobuf[*batchv1.CronJob](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/batch/v1/job.go b/staging/src/k8s.io/client-go/kubernetes/typed/batch/v1/job.go index 1e85a9043c7..d77aa0f03a6 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/batch/v1/job.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/batch/v1/job.go @@ -68,6 +68,8 @@ func newJobs(c *BatchV1Client, namespace string) *jobs { scheme.ParameterCodec, namespace, func() *batchv1.Job { return &batchv1.Job{} }, - func() *batchv1.JobList { return &batchv1.JobList{} }), + func() *batchv1.JobList { return &batchv1.JobList{} }, + gentype.PrefersProtobuf[*batchv1.Job](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/batch/v1beta1/cronjob.go b/staging/src/k8s.io/client-go/kubernetes/typed/batch/v1beta1/cronjob.go index 261c6e3ddfc..3091020ba27 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/batch/v1beta1/cronjob.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/batch/v1beta1/cronjob.go @@ -68,6 +68,8 @@ func newCronJobs(c *BatchV1beta1Client, namespace string) *cronJobs { scheme.ParameterCodec, namespace, func() *batchv1beta1.CronJob { return &batchv1beta1.CronJob{} }, - func() *batchv1beta1.CronJobList { return &batchv1beta1.CronJobList{} }), + func() *batchv1beta1.CronJobList { return &batchv1beta1.CronJobList{} }, + gentype.PrefersProtobuf[*batchv1beta1.CronJob](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/certificates/v1/certificatesigningrequest.go b/staging/src/k8s.io/client-go/kubernetes/typed/certificates/v1/certificatesigningrequest.go index 0af27658aa5..6863a22d144 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/certificates/v1/certificatesigningrequest.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/certificates/v1/certificatesigningrequest.go @@ -72,7 +72,9 @@ func newCertificateSigningRequests(c *CertificatesV1Client) *certificateSigningR func() *certificatesv1.CertificateSigningRequest { return &certificatesv1.CertificateSigningRequest{} }, func() *certificatesv1.CertificateSigningRequestList { return &certificatesv1.CertificateSigningRequestList{} - }), + }, + gentype.PrefersProtobuf[*certificatesv1.CertificateSigningRequest](), + ), } } @@ -80,6 +82,7 @@ func newCertificateSigningRequests(c *CertificatesV1Client) *certificateSigningR func (c *certificateSigningRequests) UpdateApproval(ctx context.Context, certificateSigningRequestName string, certificateSigningRequest *certificatesv1.CertificateSigningRequest, opts metav1.UpdateOptions) (result *certificatesv1.CertificateSigningRequest, err error) { result = &certificatesv1.CertificateSigningRequest{} err = c.GetClient().Put(). + UseProtobufAsDefault(). Resource("certificatesigningrequests"). Name(certificateSigningRequestName). SubResource("approval"). diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/certificates/v1alpha1/clustertrustbundle.go b/staging/src/k8s.io/client-go/kubernetes/typed/certificates/v1alpha1/clustertrustbundle.go index 806228029cc..df215ff53dd 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/certificates/v1alpha1/clustertrustbundle.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/certificates/v1alpha1/clustertrustbundle.go @@ -66,6 +66,8 @@ func newClusterTrustBundles(c *CertificatesV1alpha1Client) *clusterTrustBundles func() *certificatesv1alpha1.ClusterTrustBundle { return &certificatesv1alpha1.ClusterTrustBundle{} }, func() *certificatesv1alpha1.ClusterTrustBundleList { return &certificatesv1alpha1.ClusterTrustBundleList{} - }), + }, + gentype.PrefersProtobuf[*certificatesv1alpha1.ClusterTrustBundle](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/certificates/v1beta1/certificatesigningrequest.go b/staging/src/k8s.io/client-go/kubernetes/typed/certificates/v1beta1/certificatesigningrequest.go index 5d5c474b81c..4c6e28c65f6 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/certificates/v1beta1/certificatesigningrequest.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/certificates/v1beta1/certificatesigningrequest.go @@ -72,6 +72,8 @@ func newCertificateSigningRequests(c *CertificatesV1beta1Client) *certificateSig }, func() *certificatesv1beta1.CertificateSigningRequestList { return &certificatesv1beta1.CertificateSigningRequestList{} - }), + }, + gentype.PrefersProtobuf[*certificatesv1beta1.CertificateSigningRequest](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/coordination/v1/lease.go b/staging/src/k8s.io/client-go/kubernetes/typed/coordination/v1/lease.go index 58125261a18..6e7784d6aef 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/coordination/v1/lease.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/coordination/v1/lease.go @@ -64,6 +64,8 @@ func newLeases(c *CoordinationV1Client, namespace string) *leases { scheme.ParameterCodec, namespace, func() *coordinationv1.Lease { return &coordinationv1.Lease{} }, - func() *coordinationv1.LeaseList { return &coordinationv1.LeaseList{} }), + func() *coordinationv1.LeaseList { return &coordinationv1.LeaseList{} }, + gentype.PrefersProtobuf[*coordinationv1.Lease](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/coordination/v1alpha1/leasecandidate.go b/staging/src/k8s.io/client-go/kubernetes/typed/coordination/v1alpha1/leasecandidate.go index 8fd6fecae2d..e91abc5fee8 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/coordination/v1alpha1/leasecandidate.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/coordination/v1alpha1/leasecandidate.go @@ -64,6 +64,8 @@ func newLeaseCandidates(c *CoordinationV1alpha1Client, namespace string) *leaseC scheme.ParameterCodec, namespace, func() *coordinationv1alpha1.LeaseCandidate { return &coordinationv1alpha1.LeaseCandidate{} }, - func() *coordinationv1alpha1.LeaseCandidateList { return &coordinationv1alpha1.LeaseCandidateList{} }), + func() *coordinationv1alpha1.LeaseCandidateList { return &coordinationv1alpha1.LeaseCandidateList{} }, + gentype.PrefersProtobuf[*coordinationv1alpha1.LeaseCandidate](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/coordination/v1beta1/lease.go b/staging/src/k8s.io/client-go/kubernetes/typed/coordination/v1beta1/lease.go index 21d42838f3e..18ca9823c05 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/coordination/v1beta1/lease.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/coordination/v1beta1/lease.go @@ -64,6 +64,8 @@ func newLeases(c *CoordinationV1beta1Client, namespace string) *leases { scheme.ParameterCodec, namespace, func() *coordinationv1beta1.Lease { return &coordinationv1beta1.Lease{} }, - func() *coordinationv1beta1.LeaseList { return &coordinationv1beta1.LeaseList{} }), + func() *coordinationv1beta1.LeaseList { return &coordinationv1beta1.LeaseList{} }, + gentype.PrefersProtobuf[*coordinationv1beta1.Lease](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/componentstatus.go b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/componentstatus.go index 6b043274e2b..b8e58cd155d 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/componentstatus.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/componentstatus.go @@ -64,6 +64,8 @@ func newComponentStatuses(c *CoreV1Client) *componentStatuses { scheme.ParameterCodec, "", func() *corev1.ComponentStatus { return &corev1.ComponentStatus{} }, - func() *corev1.ComponentStatusList { return &corev1.ComponentStatusList{} }), + func() *corev1.ComponentStatusList { return &corev1.ComponentStatusList{} }, + gentype.PrefersProtobuf[*corev1.ComponentStatus](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/configmap.go b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/configmap.go index fb43c01986a..74d321193fd 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/configmap.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/configmap.go @@ -64,6 +64,8 @@ func newConfigMaps(c *CoreV1Client, namespace string) *configMaps { scheme.ParameterCodec, namespace, func() *corev1.ConfigMap { return &corev1.ConfigMap{} }, - func() *corev1.ConfigMapList { return &corev1.ConfigMapList{} }), + func() *corev1.ConfigMapList { return &corev1.ConfigMapList{} }, + gentype.PrefersProtobuf[*corev1.ConfigMap](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/endpoints.go b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/endpoints.go index 121f4cb4e3a..b96a8b3854d 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/endpoints.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/endpoints.go @@ -64,6 +64,8 @@ func newEndpoints(c *CoreV1Client, namespace string) *endpoints { scheme.ParameterCodec, namespace, func() *corev1.Endpoints { return &corev1.Endpoints{} }, - func() *corev1.EndpointsList { return &corev1.EndpointsList{} }), + func() *corev1.EndpointsList { return &corev1.EndpointsList{} }, + gentype.PrefersProtobuf[*corev1.Endpoints](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/event.go b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/event.go index cea39569e99..dd0cc80b802 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/event.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/event.go @@ -64,6 +64,8 @@ func newEvents(c *CoreV1Client, namespace string) *events { scheme.ParameterCodec, namespace, func() *corev1.Event { return &corev1.Event{} }, - func() *corev1.EventList { return &corev1.EventList{} }), + func() *corev1.EventList { return &corev1.EventList{} }, + gentype.PrefersProtobuf[*corev1.Event](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/limitrange.go b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/limitrange.go index b6b5b8abec9..51fa11d1b6f 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/limitrange.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/limitrange.go @@ -64,6 +64,8 @@ func newLimitRanges(c *CoreV1Client, namespace string) *limitRanges { scheme.ParameterCodec, namespace, func() *corev1.LimitRange { return &corev1.LimitRange{} }, - func() *corev1.LimitRangeList { return &corev1.LimitRangeList{} }), + func() *corev1.LimitRangeList { return &corev1.LimitRangeList{} }, + gentype.PrefersProtobuf[*corev1.LimitRange](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/namespace.go b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/namespace.go index b050d87ae96..323934938a5 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/namespace.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/namespace.go @@ -67,6 +67,8 @@ func newNamespaces(c *CoreV1Client) *namespaces { scheme.ParameterCodec, "", func() *corev1.Namespace { return &corev1.Namespace{} }, - func() *corev1.NamespaceList { return &corev1.NamespaceList{} }), + func() *corev1.NamespaceList { return &corev1.NamespaceList{} }, + gentype.PrefersProtobuf[*corev1.Namespace](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/node.go b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/node.go index 19e970406c3..1851b025ff0 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/node.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/node.go @@ -68,6 +68,8 @@ func newNodes(c *CoreV1Client) *nodes { scheme.ParameterCodec, "", func() *corev1.Node { return &corev1.Node{} }, - func() *corev1.NodeList { return &corev1.NodeList{} }), + func() *corev1.NodeList { return &corev1.NodeList{} }, + gentype.PrefersProtobuf[*corev1.Node](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/persistentvolume.go b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/persistentvolume.go index bcc3f7ed66e..077a1ba4f84 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/persistentvolume.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/persistentvolume.go @@ -68,6 +68,8 @@ func newPersistentVolumes(c *CoreV1Client) *persistentVolumes { scheme.ParameterCodec, "", func() *corev1.PersistentVolume { return &corev1.PersistentVolume{} }, - func() *corev1.PersistentVolumeList { return &corev1.PersistentVolumeList{} }), + func() *corev1.PersistentVolumeList { return &corev1.PersistentVolumeList{} }, + gentype.PrefersProtobuf[*corev1.PersistentVolume](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/persistentvolumeclaim.go b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/persistentvolumeclaim.go index 85d04c7b9a7..cbe75e81244 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/persistentvolumeclaim.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/persistentvolumeclaim.go @@ -68,6 +68,8 @@ func newPersistentVolumeClaims(c *CoreV1Client, namespace string) *persistentVol scheme.ParameterCodec, namespace, func() *corev1.PersistentVolumeClaim { return &corev1.PersistentVolumeClaim{} }, - func() *corev1.PersistentVolumeClaimList { return &corev1.PersistentVolumeClaimList{} }), + func() *corev1.PersistentVolumeClaimList { return &corev1.PersistentVolumeClaimList{} }, + gentype.PrefersProtobuf[*corev1.PersistentVolumeClaim](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/pod.go b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/pod.go index db7f07f6c52..939d8be4bef 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/pod.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/pod.go @@ -70,7 +70,9 @@ func newPods(c *CoreV1Client, namespace string) *pods { scheme.ParameterCodec, namespace, func() *corev1.Pod { return &corev1.Pod{} }, - func() *corev1.PodList { return &corev1.PodList{} }), + func() *corev1.PodList { return &corev1.PodList{} }, + gentype.PrefersProtobuf[*corev1.Pod](), + ), } } @@ -78,6 +80,7 @@ func newPods(c *CoreV1Client, namespace string) *pods { func (c *pods) UpdateEphemeralContainers(ctx context.Context, podName string, pod *corev1.Pod, opts metav1.UpdateOptions) (result *corev1.Pod, err error) { result = &corev1.Pod{} err = c.GetClient().Put(). + UseProtobufAsDefault(). Namespace(c.GetNamespace()). Resource("pods"). Name(podName). diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/podtemplate.go b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/podtemplate.go index b6e8eb728c2..b0cfa1bc14c 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/podtemplate.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/podtemplate.go @@ -64,6 +64,8 @@ func newPodTemplates(c *CoreV1Client, namespace string) *podTemplates { scheme.ParameterCodec, namespace, func() *corev1.PodTemplate { return &corev1.PodTemplate{} }, - func() *corev1.PodTemplateList { return &corev1.PodTemplateList{} }), + func() *corev1.PodTemplateList { return &corev1.PodTemplateList{} }, + gentype.PrefersProtobuf[*corev1.PodTemplate](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/replicationcontroller.go b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/replicationcontroller.go index adb2a9e3268..f8a7c928585 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/replicationcontroller.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/replicationcontroller.go @@ -72,7 +72,9 @@ func newReplicationControllers(c *CoreV1Client, namespace string) *replicationCo scheme.ParameterCodec, namespace, func() *corev1.ReplicationController { return &corev1.ReplicationController{} }, - func() *corev1.ReplicationControllerList { return &corev1.ReplicationControllerList{} }), + func() *corev1.ReplicationControllerList { return &corev1.ReplicationControllerList{} }, + gentype.PrefersProtobuf[*corev1.ReplicationController](), + ), } } @@ -80,6 +82,7 @@ func newReplicationControllers(c *CoreV1Client, namespace string) *replicationCo func (c *replicationControllers) GetScale(ctx context.Context, replicationControllerName string, options metav1.GetOptions) (result *autoscalingv1.Scale, err error) { result = &autoscalingv1.Scale{} err = c.GetClient().Get(). + UseProtobufAsDefault(). Namespace(c.GetNamespace()). Resource("replicationcontrollers"). Name(replicationControllerName). @@ -94,6 +97,7 @@ func (c *replicationControllers) GetScale(ctx context.Context, replicationContro func (c *replicationControllers) UpdateScale(ctx context.Context, replicationControllerName string, scale *autoscalingv1.Scale, opts metav1.UpdateOptions) (result *autoscalingv1.Scale, err error) { result = &autoscalingv1.Scale{} err = c.GetClient().Put(). + UseProtobufAsDefault(). Namespace(c.GetNamespace()). Resource("replicationcontrollers"). Name(replicationControllerName). diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/resourcequota.go b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/resourcequota.go index 172621cc2de..a0435accc85 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/resourcequota.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/resourcequota.go @@ -68,6 +68,8 @@ func newResourceQuotas(c *CoreV1Client, namespace string) *resourceQuotas { scheme.ParameterCodec, namespace, func() *corev1.ResourceQuota { return &corev1.ResourceQuota{} }, - func() *corev1.ResourceQuotaList { return &corev1.ResourceQuotaList{} }), + func() *corev1.ResourceQuotaList { return &corev1.ResourceQuotaList{} }, + gentype.PrefersProtobuf[*corev1.ResourceQuota](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/secret.go b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/secret.go index 7ebbe719e78..a7ab56a2748 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/secret.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/secret.go @@ -64,6 +64,8 @@ func newSecrets(c *CoreV1Client, namespace string) *secrets { scheme.ParameterCodec, namespace, func() *corev1.Secret { return &corev1.Secret{} }, - func() *corev1.SecretList { return &corev1.SecretList{} }), + func() *corev1.SecretList { return &corev1.SecretList{} }, + gentype.PrefersProtobuf[*corev1.Secret](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/service.go b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/service.go index 14e6b06cebb..f145a137cbf 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/service.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/service.go @@ -67,6 +67,8 @@ func newServices(c *CoreV1Client, namespace string) *services { scheme.ParameterCodec, namespace, func() *corev1.Service { return &corev1.Service{} }, - func() *corev1.ServiceList { return &corev1.ServiceList{} }), + func() *corev1.ServiceList { return &corev1.ServiceList{} }, + gentype.PrefersProtobuf[*corev1.Service](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/serviceaccount.go b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/serviceaccount.go index 9610fa2ea20..8458b6d9b5b 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/serviceaccount.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/serviceaccount.go @@ -67,7 +67,9 @@ func newServiceAccounts(c *CoreV1Client, namespace string) *serviceAccounts { scheme.ParameterCodec, namespace, func() *corev1.ServiceAccount { return &corev1.ServiceAccount{} }, - func() *corev1.ServiceAccountList { return &corev1.ServiceAccountList{} }), + func() *corev1.ServiceAccountList { return &corev1.ServiceAccountList{} }, + gentype.PrefersProtobuf[*corev1.ServiceAccount](), + ), } } @@ -75,6 +77,7 @@ func newServiceAccounts(c *CoreV1Client, namespace string) *serviceAccounts { func (c *serviceAccounts) CreateToken(ctx context.Context, serviceAccountName string, tokenRequest *authenticationv1.TokenRequest, opts metav1.CreateOptions) (result *authenticationv1.TokenRequest, err error) { result = &authenticationv1.TokenRequest{} err = c.GetClient().Post(). + UseProtobufAsDefault(). Namespace(c.GetNamespace()). Resource("serviceaccounts"). Name(serviceAccountName). diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/discovery/v1/endpointslice.go b/staging/src/k8s.io/client-go/kubernetes/typed/discovery/v1/endpointslice.go index c1247a27112..75b9a559e37 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/discovery/v1/endpointslice.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/discovery/v1/endpointslice.go @@ -64,6 +64,8 @@ func newEndpointSlices(c *DiscoveryV1Client, namespace string) *endpointSlices { scheme.ParameterCodec, namespace, func() *discoveryv1.EndpointSlice { return &discoveryv1.EndpointSlice{} }, - func() *discoveryv1.EndpointSliceList { return &discoveryv1.EndpointSliceList{} }), + func() *discoveryv1.EndpointSliceList { return &discoveryv1.EndpointSliceList{} }, + gentype.PrefersProtobuf[*discoveryv1.EndpointSlice](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/discovery/v1beta1/endpointslice.go b/staging/src/k8s.io/client-go/kubernetes/typed/discovery/v1beta1/endpointslice.go index 36a966c8010..4ef2752e790 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/discovery/v1beta1/endpointslice.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/discovery/v1beta1/endpointslice.go @@ -64,6 +64,8 @@ func newEndpointSlices(c *DiscoveryV1beta1Client, namespace string) *endpointSli scheme.ParameterCodec, namespace, func() *discoveryv1beta1.EndpointSlice { return &discoveryv1beta1.EndpointSlice{} }, - func() *discoveryv1beta1.EndpointSliceList { return &discoveryv1beta1.EndpointSliceList{} }), + func() *discoveryv1beta1.EndpointSliceList { return &discoveryv1beta1.EndpointSliceList{} }, + gentype.PrefersProtobuf[*discoveryv1beta1.EndpointSlice](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/events/v1/event.go b/staging/src/k8s.io/client-go/kubernetes/typed/events/v1/event.go index fe10fc3e438..fd335847684 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/events/v1/event.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/events/v1/event.go @@ -64,6 +64,8 @@ func newEvents(c *EventsV1Client, namespace string) *events { scheme.ParameterCodec, namespace, func() *eventsv1.Event { return &eventsv1.Event{} }, - func() *eventsv1.EventList { return &eventsv1.EventList{} }), + func() *eventsv1.EventList { return &eventsv1.EventList{} }, + gentype.PrefersProtobuf[*eventsv1.Event](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/events/v1beta1/event.go b/staging/src/k8s.io/client-go/kubernetes/typed/events/v1beta1/event.go index bc6a2b9e011..c18a1aeb62a 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/events/v1beta1/event.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/events/v1beta1/event.go @@ -64,6 +64,8 @@ func newEvents(c *EventsV1beta1Client, namespace string) *events { scheme.ParameterCodec, namespace, func() *eventsv1beta1.Event { return &eventsv1beta1.Event{} }, - func() *eventsv1beta1.EventList { return &eventsv1beta1.EventList{} }), + func() *eventsv1beta1.EventList { return &eventsv1beta1.EventList{} }, + gentype.PrefersProtobuf[*eventsv1beta1.Event](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/daemonset.go b/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/daemonset.go index 2d9b609fd5b..c04be73a3c9 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/daemonset.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/daemonset.go @@ -68,6 +68,8 @@ func newDaemonSets(c *ExtensionsV1beta1Client, namespace string) *daemonSets { scheme.ParameterCodec, namespace, func() *extensionsv1beta1.DaemonSet { return &extensionsv1beta1.DaemonSet{} }, - func() *extensionsv1beta1.DaemonSetList { return &extensionsv1beta1.DaemonSetList{} }), + func() *extensionsv1beta1.DaemonSetList { return &extensionsv1beta1.DaemonSetList{} }, + gentype.PrefersProtobuf[*extensionsv1beta1.DaemonSet](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/deployment.go b/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/deployment.go index 13180b15572..d7ca65b14cd 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/deployment.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/deployment.go @@ -74,7 +74,9 @@ func newDeployments(c *ExtensionsV1beta1Client, namespace string) *deployments { scheme.ParameterCodec, namespace, func() *extensionsv1beta1.Deployment { return &extensionsv1beta1.Deployment{} }, - func() *extensionsv1beta1.DeploymentList { return &extensionsv1beta1.DeploymentList{} }), + func() *extensionsv1beta1.DeploymentList { return &extensionsv1beta1.DeploymentList{} }, + gentype.PrefersProtobuf[*extensionsv1beta1.Deployment](), + ), } } @@ -82,6 +84,7 @@ func newDeployments(c *ExtensionsV1beta1Client, namespace string) *deployments { func (c *deployments) GetScale(ctx context.Context, deploymentName string, options v1.GetOptions) (result *extensionsv1beta1.Scale, err error) { result = &extensionsv1beta1.Scale{} err = c.GetClient().Get(). + UseProtobufAsDefault(). Namespace(c.GetNamespace()). Resource("deployments"). Name(deploymentName). @@ -96,6 +99,7 @@ func (c *deployments) GetScale(ctx context.Context, deploymentName string, optio func (c *deployments) UpdateScale(ctx context.Context, deploymentName string, scale *extensionsv1beta1.Scale, opts v1.UpdateOptions) (result *extensionsv1beta1.Scale, err error) { result = &extensionsv1beta1.Scale{} err = c.GetClient().Put(). + UseProtobufAsDefault(). Namespace(c.GetNamespace()). Resource("deployments"). Name(deploymentName). @@ -121,6 +125,7 @@ func (c *deployments) ApplyScale(ctx context.Context, deploymentName string, sca result = &extensionsv1beta1.Scale{} err = c.GetClient().Patch(types.ApplyPatchType). + UseProtobufAsDefault(). Namespace(c.GetNamespace()). Resource("deployments"). Name(deploymentName). diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/ingress.go b/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/ingress.go index c90b88c8bd6..9a24621eae6 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/ingress.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/ingress.go @@ -68,6 +68,8 @@ func newIngresses(c *ExtensionsV1beta1Client, namespace string) *ingresses { scheme.ParameterCodec, namespace, func() *extensionsv1beta1.Ingress { return &extensionsv1beta1.Ingress{} }, - func() *extensionsv1beta1.IngressList { return &extensionsv1beta1.IngressList{} }), + func() *extensionsv1beta1.IngressList { return &extensionsv1beta1.IngressList{} }, + gentype.PrefersProtobuf[*extensionsv1beta1.Ingress](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/networkpolicy.go b/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/networkpolicy.go index 9752065fb87..ce6a45a2700 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/networkpolicy.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/networkpolicy.go @@ -64,6 +64,8 @@ func newNetworkPolicies(c *ExtensionsV1beta1Client, namespace string) *networkPo scheme.ParameterCodec, namespace, func() *extensionsv1beta1.NetworkPolicy { return &extensionsv1beta1.NetworkPolicy{} }, - func() *extensionsv1beta1.NetworkPolicyList { return &extensionsv1beta1.NetworkPolicyList{} }), + func() *extensionsv1beta1.NetworkPolicyList { return &extensionsv1beta1.NetworkPolicyList{} }, + gentype.PrefersProtobuf[*extensionsv1beta1.NetworkPolicy](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/replicaset.go b/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/replicaset.go index 3f1d8bd1bf5..4640521af32 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/replicaset.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/replicaset.go @@ -74,7 +74,9 @@ func newReplicaSets(c *ExtensionsV1beta1Client, namespace string) *replicaSets { scheme.ParameterCodec, namespace, func() *extensionsv1beta1.ReplicaSet { return &extensionsv1beta1.ReplicaSet{} }, - func() *extensionsv1beta1.ReplicaSetList { return &extensionsv1beta1.ReplicaSetList{} }), + func() *extensionsv1beta1.ReplicaSetList { return &extensionsv1beta1.ReplicaSetList{} }, + gentype.PrefersProtobuf[*extensionsv1beta1.ReplicaSet](), + ), } } @@ -82,6 +84,7 @@ func newReplicaSets(c *ExtensionsV1beta1Client, namespace string) *replicaSets { func (c *replicaSets) GetScale(ctx context.Context, replicaSetName string, options v1.GetOptions) (result *extensionsv1beta1.Scale, err error) { result = &extensionsv1beta1.Scale{} err = c.GetClient().Get(). + UseProtobufAsDefault(). Namespace(c.GetNamespace()). Resource("replicasets"). Name(replicaSetName). @@ -96,6 +99,7 @@ func (c *replicaSets) GetScale(ctx context.Context, replicaSetName string, optio func (c *replicaSets) UpdateScale(ctx context.Context, replicaSetName string, scale *extensionsv1beta1.Scale, opts v1.UpdateOptions) (result *extensionsv1beta1.Scale, err error) { result = &extensionsv1beta1.Scale{} err = c.GetClient().Put(). + UseProtobufAsDefault(). Namespace(c.GetNamespace()). Resource("replicasets"). Name(replicaSetName). @@ -121,6 +125,7 @@ func (c *replicaSets) ApplyScale(ctx context.Context, replicaSetName string, sca result = &extensionsv1beta1.Scale{} err = c.GetClient().Patch(types.ApplyPatchType). + UseProtobufAsDefault(). Namespace(c.GetNamespace()). Resource("replicasets"). Name(replicaSetName). diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/flowcontrol/v1/flowschema.go b/staging/src/k8s.io/client-go/kubernetes/typed/flowcontrol/v1/flowschema.go index 7f2bf08767a..56d4d806554 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/flowcontrol/v1/flowschema.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/flowcontrol/v1/flowschema.go @@ -68,6 +68,8 @@ func newFlowSchemas(c *FlowcontrolV1Client) *flowSchemas { scheme.ParameterCodec, "", func() *flowcontrolv1.FlowSchema { return &flowcontrolv1.FlowSchema{} }, - func() *flowcontrolv1.FlowSchemaList { return &flowcontrolv1.FlowSchemaList{} }), + func() *flowcontrolv1.FlowSchemaList { return &flowcontrolv1.FlowSchemaList{} }, + gentype.PrefersProtobuf[*flowcontrolv1.FlowSchema](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/flowcontrol/v1/prioritylevelconfiguration.go b/staging/src/k8s.io/client-go/kubernetes/typed/flowcontrol/v1/prioritylevelconfiguration.go index 19d6e5aba89..5d25f393a0e 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/flowcontrol/v1/prioritylevelconfiguration.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/flowcontrol/v1/prioritylevelconfiguration.go @@ -70,6 +70,8 @@ func newPriorityLevelConfigurations(c *FlowcontrolV1Client) *priorityLevelConfig func() *flowcontrolv1.PriorityLevelConfiguration { return &flowcontrolv1.PriorityLevelConfiguration{} }, func() *flowcontrolv1.PriorityLevelConfigurationList { return &flowcontrolv1.PriorityLevelConfigurationList{} - }), + }, + gentype.PrefersProtobuf[*flowcontrolv1.PriorityLevelConfiguration](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/flowcontrol/v1beta1/flowschema.go b/staging/src/k8s.io/client-go/kubernetes/typed/flowcontrol/v1beta1/flowschema.go index d00290a36e6..f0def394742 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/flowcontrol/v1beta1/flowschema.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/flowcontrol/v1beta1/flowschema.go @@ -68,6 +68,8 @@ func newFlowSchemas(c *FlowcontrolV1beta1Client) *flowSchemas { scheme.ParameterCodec, "", func() *flowcontrolv1beta1.FlowSchema { return &flowcontrolv1beta1.FlowSchema{} }, - func() *flowcontrolv1beta1.FlowSchemaList { return &flowcontrolv1beta1.FlowSchemaList{} }), + func() *flowcontrolv1beta1.FlowSchemaList { return &flowcontrolv1beta1.FlowSchemaList{} }, + gentype.PrefersProtobuf[*flowcontrolv1beta1.FlowSchema](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/flowcontrol/v1beta1/prioritylevelconfiguration.go b/staging/src/k8s.io/client-go/kubernetes/typed/flowcontrol/v1beta1/prioritylevelconfiguration.go index e16760751e7..15ee1b8b5cd 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/flowcontrol/v1beta1/prioritylevelconfiguration.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/flowcontrol/v1beta1/prioritylevelconfiguration.go @@ -72,6 +72,8 @@ func newPriorityLevelConfigurations(c *FlowcontrolV1beta1Client) *priorityLevelC }, func() *flowcontrolv1beta1.PriorityLevelConfigurationList { return &flowcontrolv1beta1.PriorityLevelConfigurationList{} - }), + }, + gentype.PrefersProtobuf[*flowcontrolv1beta1.PriorityLevelConfiguration](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/flowcontrol/v1beta2/flowschema.go b/staging/src/k8s.io/client-go/kubernetes/typed/flowcontrol/v1beta2/flowschema.go index 48c2442dd9e..780cf030eed 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/flowcontrol/v1beta2/flowschema.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/flowcontrol/v1beta2/flowschema.go @@ -68,6 +68,8 @@ func newFlowSchemas(c *FlowcontrolV1beta2Client) *flowSchemas { scheme.ParameterCodec, "", func() *flowcontrolv1beta2.FlowSchema { return &flowcontrolv1beta2.FlowSchema{} }, - func() *flowcontrolv1beta2.FlowSchemaList { return &flowcontrolv1beta2.FlowSchemaList{} }), + func() *flowcontrolv1beta2.FlowSchemaList { return &flowcontrolv1beta2.FlowSchemaList{} }, + gentype.PrefersProtobuf[*flowcontrolv1beta2.FlowSchema](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/flowcontrol/v1beta2/prioritylevelconfiguration.go b/staging/src/k8s.io/client-go/kubernetes/typed/flowcontrol/v1beta2/prioritylevelconfiguration.go index eb3d38e47d0..65b9feafa47 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/flowcontrol/v1beta2/prioritylevelconfiguration.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/flowcontrol/v1beta2/prioritylevelconfiguration.go @@ -72,6 +72,8 @@ func newPriorityLevelConfigurations(c *FlowcontrolV1beta2Client) *priorityLevelC }, func() *flowcontrolv1beta2.PriorityLevelConfigurationList { return &flowcontrolv1beta2.PriorityLevelConfigurationList{} - }), + }, + gentype.PrefersProtobuf[*flowcontrolv1beta2.PriorityLevelConfiguration](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/flowcontrol/v1beta3/flowschema.go b/staging/src/k8s.io/client-go/kubernetes/typed/flowcontrol/v1beta3/flowschema.go index 8ceb7b83170..1e0d9feb1aa 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/flowcontrol/v1beta3/flowschema.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/flowcontrol/v1beta3/flowschema.go @@ -68,6 +68,8 @@ func newFlowSchemas(c *FlowcontrolV1beta3Client) *flowSchemas { scheme.ParameterCodec, "", func() *flowcontrolv1beta3.FlowSchema { return &flowcontrolv1beta3.FlowSchema{} }, - func() *flowcontrolv1beta3.FlowSchemaList { return &flowcontrolv1beta3.FlowSchemaList{} }), + func() *flowcontrolv1beta3.FlowSchemaList { return &flowcontrolv1beta3.FlowSchemaList{} }, + gentype.PrefersProtobuf[*flowcontrolv1beta3.FlowSchema](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/flowcontrol/v1beta3/prioritylevelconfiguration.go b/staging/src/k8s.io/client-go/kubernetes/typed/flowcontrol/v1beta3/prioritylevelconfiguration.go index 30e1566446b..91bbf3fb14f 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/flowcontrol/v1beta3/prioritylevelconfiguration.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/flowcontrol/v1beta3/prioritylevelconfiguration.go @@ -72,6 +72,8 @@ func newPriorityLevelConfigurations(c *FlowcontrolV1beta3Client) *priorityLevelC }, func() *flowcontrolv1beta3.PriorityLevelConfigurationList { return &flowcontrolv1beta3.PriorityLevelConfigurationList{} - }), + }, + gentype.PrefersProtobuf[*flowcontrolv1beta3.PriorityLevelConfiguration](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/networking/v1/ingress.go b/staging/src/k8s.io/client-go/kubernetes/typed/networking/v1/ingress.go index 83854692066..76d416249c9 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/networking/v1/ingress.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/networking/v1/ingress.go @@ -68,6 +68,8 @@ func newIngresses(c *NetworkingV1Client, namespace string) *ingresses { scheme.ParameterCodec, namespace, func() *networkingv1.Ingress { return &networkingv1.Ingress{} }, - func() *networkingv1.IngressList { return &networkingv1.IngressList{} }), + func() *networkingv1.IngressList { return &networkingv1.IngressList{} }, + gentype.PrefersProtobuf[*networkingv1.Ingress](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/networking/v1/ingressclass.go b/staging/src/k8s.io/client-go/kubernetes/typed/networking/v1/ingressclass.go index 8b1ed3c1e6a..3bbbf9e157c 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/networking/v1/ingressclass.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/networking/v1/ingressclass.go @@ -64,6 +64,8 @@ func newIngressClasses(c *NetworkingV1Client) *ingressClasses { scheme.ParameterCodec, "", func() *networkingv1.IngressClass { return &networkingv1.IngressClass{} }, - func() *networkingv1.IngressClassList { return &networkingv1.IngressClassList{} }), + func() *networkingv1.IngressClassList { return &networkingv1.IngressClassList{} }, + gentype.PrefersProtobuf[*networkingv1.IngressClass](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/networking/v1/networkpolicy.go b/staging/src/k8s.io/client-go/kubernetes/typed/networking/v1/networkpolicy.go index 4c7dc8d223d..2758c2bfbcb 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/networking/v1/networkpolicy.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/networking/v1/networkpolicy.go @@ -64,6 +64,8 @@ func newNetworkPolicies(c *NetworkingV1Client, namespace string) *networkPolicie scheme.ParameterCodec, namespace, func() *networkingv1.NetworkPolicy { return &networkingv1.NetworkPolicy{} }, - func() *networkingv1.NetworkPolicyList { return &networkingv1.NetworkPolicyList{} }), + func() *networkingv1.NetworkPolicyList { return &networkingv1.NetworkPolicyList{} }, + gentype.PrefersProtobuf[*networkingv1.NetworkPolicy](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/networking/v1alpha1/ipaddress.go b/staging/src/k8s.io/client-go/kubernetes/typed/networking/v1alpha1/ipaddress.go index 2f03313cd24..e96a564ab41 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/networking/v1alpha1/ipaddress.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/networking/v1alpha1/ipaddress.go @@ -64,6 +64,8 @@ func newIPAddresses(c *NetworkingV1alpha1Client) *iPAddresses { scheme.ParameterCodec, "", func() *networkingv1alpha1.IPAddress { return &networkingv1alpha1.IPAddress{} }, - func() *networkingv1alpha1.IPAddressList { return &networkingv1alpha1.IPAddressList{} }), + func() *networkingv1alpha1.IPAddressList { return &networkingv1alpha1.IPAddressList{} }, + gentype.PrefersProtobuf[*networkingv1alpha1.IPAddress](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/networking/v1alpha1/servicecidr.go b/staging/src/k8s.io/client-go/kubernetes/typed/networking/v1alpha1/servicecidr.go index e1094c5b1a2..38cc26010cf 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/networking/v1alpha1/servicecidr.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/networking/v1alpha1/servicecidr.go @@ -68,6 +68,8 @@ func newServiceCIDRs(c *NetworkingV1alpha1Client) *serviceCIDRs { scheme.ParameterCodec, "", func() *networkingv1alpha1.ServiceCIDR { return &networkingv1alpha1.ServiceCIDR{} }, - func() *networkingv1alpha1.ServiceCIDRList { return &networkingv1alpha1.ServiceCIDRList{} }), + func() *networkingv1alpha1.ServiceCIDRList { return &networkingv1alpha1.ServiceCIDRList{} }, + gentype.PrefersProtobuf[*networkingv1alpha1.ServiceCIDR](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/networking/v1beta1/ingress.go b/staging/src/k8s.io/client-go/kubernetes/typed/networking/v1beta1/ingress.go index 6b356b7db16..b2d5aa2ce28 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/networking/v1beta1/ingress.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/networking/v1beta1/ingress.go @@ -68,6 +68,8 @@ func newIngresses(c *NetworkingV1beta1Client, namespace string) *ingresses { scheme.ParameterCodec, namespace, func() *networkingv1beta1.Ingress { return &networkingv1beta1.Ingress{} }, - func() *networkingv1beta1.IngressList { return &networkingv1beta1.IngressList{} }), + func() *networkingv1beta1.IngressList { return &networkingv1beta1.IngressList{} }, + gentype.PrefersProtobuf[*networkingv1beta1.Ingress](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/networking/v1beta1/ingressclass.go b/staging/src/k8s.io/client-go/kubernetes/typed/networking/v1beta1/ingressclass.go index 9828d027c06..dd37fc5cd6b 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/networking/v1beta1/ingressclass.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/networking/v1beta1/ingressclass.go @@ -64,6 +64,8 @@ func newIngressClasses(c *NetworkingV1beta1Client) *ingressClasses { scheme.ParameterCodec, "", func() *networkingv1beta1.IngressClass { return &networkingv1beta1.IngressClass{} }, - func() *networkingv1beta1.IngressClassList { return &networkingv1beta1.IngressClassList{} }), + func() *networkingv1beta1.IngressClassList { return &networkingv1beta1.IngressClassList{} }, + gentype.PrefersProtobuf[*networkingv1beta1.IngressClass](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/networking/v1beta1/ipaddress.go b/staging/src/k8s.io/client-go/kubernetes/typed/networking/v1beta1/ipaddress.go index 487955d3e07..0b7ffff7289 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/networking/v1beta1/ipaddress.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/networking/v1beta1/ipaddress.go @@ -64,6 +64,8 @@ func newIPAddresses(c *NetworkingV1beta1Client) *iPAddresses { scheme.ParameterCodec, "", func() *networkingv1beta1.IPAddress { return &networkingv1beta1.IPAddress{} }, - func() *networkingv1beta1.IPAddressList { return &networkingv1beta1.IPAddressList{} }), + func() *networkingv1beta1.IPAddressList { return &networkingv1beta1.IPAddressList{} }, + gentype.PrefersProtobuf[*networkingv1beta1.IPAddress](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/networking/v1beta1/servicecidr.go b/staging/src/k8s.io/client-go/kubernetes/typed/networking/v1beta1/servicecidr.go index e506d707a43..6ad1daf74c3 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/networking/v1beta1/servicecidr.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/networking/v1beta1/servicecidr.go @@ -68,6 +68,8 @@ func newServiceCIDRs(c *NetworkingV1beta1Client) *serviceCIDRs { scheme.ParameterCodec, "", func() *networkingv1beta1.ServiceCIDR { return &networkingv1beta1.ServiceCIDR{} }, - func() *networkingv1beta1.ServiceCIDRList { return &networkingv1beta1.ServiceCIDRList{} }), + func() *networkingv1beta1.ServiceCIDRList { return &networkingv1beta1.ServiceCIDRList{} }, + gentype.PrefersProtobuf[*networkingv1beta1.ServiceCIDR](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/node/v1/runtimeclass.go b/staging/src/k8s.io/client-go/kubernetes/typed/node/v1/runtimeclass.go index 5cd791730d8..77311fab723 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/node/v1/runtimeclass.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/node/v1/runtimeclass.go @@ -64,6 +64,8 @@ func newRuntimeClasses(c *NodeV1Client) *runtimeClasses { scheme.ParameterCodec, "", func() *nodev1.RuntimeClass { return &nodev1.RuntimeClass{} }, - func() *nodev1.RuntimeClassList { return &nodev1.RuntimeClassList{} }), + func() *nodev1.RuntimeClassList { return &nodev1.RuntimeClassList{} }, + gentype.PrefersProtobuf[*nodev1.RuntimeClass](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/node/v1alpha1/runtimeclass.go b/staging/src/k8s.io/client-go/kubernetes/typed/node/v1alpha1/runtimeclass.go index b890abd8f5f..f9da4f07bd6 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/node/v1alpha1/runtimeclass.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/node/v1alpha1/runtimeclass.go @@ -64,6 +64,8 @@ func newRuntimeClasses(c *NodeV1alpha1Client) *runtimeClasses { scheme.ParameterCodec, "", func() *nodev1alpha1.RuntimeClass { return &nodev1alpha1.RuntimeClass{} }, - func() *nodev1alpha1.RuntimeClassList { return &nodev1alpha1.RuntimeClassList{} }), + func() *nodev1alpha1.RuntimeClassList { return &nodev1alpha1.RuntimeClassList{} }, + gentype.PrefersProtobuf[*nodev1alpha1.RuntimeClass](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/node/v1beta1/runtimeclass.go b/staging/src/k8s.io/client-go/kubernetes/typed/node/v1beta1/runtimeclass.go index 091345a650d..18089defdc0 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/node/v1beta1/runtimeclass.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/node/v1beta1/runtimeclass.go @@ -64,6 +64,8 @@ func newRuntimeClasses(c *NodeV1beta1Client) *runtimeClasses { scheme.ParameterCodec, "", func() *nodev1beta1.RuntimeClass { return &nodev1beta1.RuntimeClass{} }, - func() *nodev1beta1.RuntimeClassList { return &nodev1beta1.RuntimeClassList{} }), + func() *nodev1beta1.RuntimeClassList { return &nodev1beta1.RuntimeClassList{} }, + gentype.PrefersProtobuf[*nodev1beta1.RuntimeClass](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/policy/v1/eviction.go b/staging/src/k8s.io/client-go/kubernetes/typed/policy/v1/eviction.go index ab042855c44..6cf60806a80 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/policy/v1/eviction.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/policy/v1/eviction.go @@ -48,6 +48,8 @@ func newEvictions(c *PolicyV1Client, namespace string) *evictions { c.RESTClient(), scheme.ParameterCodec, namespace, - func() *policyv1.Eviction { return &policyv1.Eviction{} }), + func() *policyv1.Eviction { return &policyv1.Eviction{} }, + gentype.PrefersProtobuf[*policyv1.Eviction](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/policy/v1/poddisruptionbudget.go b/staging/src/k8s.io/client-go/kubernetes/typed/policy/v1/poddisruptionbudget.go index 30d1dcf179e..d45ed21f554 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/policy/v1/poddisruptionbudget.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/policy/v1/poddisruptionbudget.go @@ -68,6 +68,8 @@ func newPodDisruptionBudgets(c *PolicyV1Client, namespace string) *podDisruption scheme.ParameterCodec, namespace, func() *policyv1.PodDisruptionBudget { return &policyv1.PodDisruptionBudget{} }, - func() *policyv1.PodDisruptionBudgetList { return &policyv1.PodDisruptionBudgetList{} }), + func() *policyv1.PodDisruptionBudgetList { return &policyv1.PodDisruptionBudgetList{} }, + gentype.PrefersProtobuf[*policyv1.PodDisruptionBudget](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/policy/v1beta1/eviction.go b/staging/src/k8s.io/client-go/kubernetes/typed/policy/v1beta1/eviction.go index c6a39a0f1fa..de4c35e766d 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/policy/v1beta1/eviction.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/policy/v1beta1/eviction.go @@ -48,6 +48,8 @@ func newEvictions(c *PolicyV1beta1Client, namespace string) *evictions { c.RESTClient(), scheme.ParameterCodec, namespace, - func() *policyv1beta1.Eviction { return &policyv1beta1.Eviction{} }), + func() *policyv1beta1.Eviction { return &policyv1beta1.Eviction{} }, + gentype.PrefersProtobuf[*policyv1beta1.Eviction](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/policy/v1beta1/poddisruptionbudget.go b/staging/src/k8s.io/client-go/kubernetes/typed/policy/v1beta1/poddisruptionbudget.go index cebf115d58f..00e04496158 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/policy/v1beta1/poddisruptionbudget.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/policy/v1beta1/poddisruptionbudget.go @@ -68,6 +68,8 @@ func newPodDisruptionBudgets(c *PolicyV1beta1Client, namespace string) *podDisru scheme.ParameterCodec, namespace, func() *policyv1beta1.PodDisruptionBudget { return &policyv1beta1.PodDisruptionBudget{} }, - func() *policyv1beta1.PodDisruptionBudgetList { return &policyv1beta1.PodDisruptionBudgetList{} }), + func() *policyv1beta1.PodDisruptionBudgetList { return &policyv1beta1.PodDisruptionBudgetList{} }, + gentype.PrefersProtobuf[*policyv1beta1.PodDisruptionBudget](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1/clusterrole.go b/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1/clusterrole.go index d48dca63f0f..cccad0487a5 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1/clusterrole.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1/clusterrole.go @@ -64,6 +64,8 @@ func newClusterRoles(c *RbacV1Client) *clusterRoles { scheme.ParameterCodec, "", func() *rbacv1.ClusterRole { return &rbacv1.ClusterRole{} }, - func() *rbacv1.ClusterRoleList { return &rbacv1.ClusterRoleList{} }), + func() *rbacv1.ClusterRoleList { return &rbacv1.ClusterRoleList{} }, + gentype.PrefersProtobuf[*rbacv1.ClusterRole](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1/clusterrolebinding.go b/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1/clusterrolebinding.go index 9422c9e4f7a..4a75fdcb56f 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1/clusterrolebinding.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1/clusterrolebinding.go @@ -64,6 +64,8 @@ func newClusterRoleBindings(c *RbacV1Client) *clusterRoleBindings { scheme.ParameterCodec, "", func() *rbacv1.ClusterRoleBinding { return &rbacv1.ClusterRoleBinding{} }, - func() *rbacv1.ClusterRoleBindingList { return &rbacv1.ClusterRoleBindingList{} }), + func() *rbacv1.ClusterRoleBindingList { return &rbacv1.ClusterRoleBindingList{} }, + gentype.PrefersProtobuf[*rbacv1.ClusterRoleBinding](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1/role.go b/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1/role.go index ef6d0cdb37a..c3a9ba135b7 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1/role.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1/role.go @@ -64,6 +64,8 @@ func newRoles(c *RbacV1Client, namespace string) *roles { scheme.ParameterCodec, namespace, func() *rbacv1.Role { return &rbacv1.Role{} }, - func() *rbacv1.RoleList { return &rbacv1.RoleList{} }), + func() *rbacv1.RoleList { return &rbacv1.RoleList{} }, + gentype.PrefersProtobuf[*rbacv1.Role](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1/rolebinding.go b/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1/rolebinding.go index 9269b3a2779..1f5a394904d 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1/rolebinding.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1/rolebinding.go @@ -64,6 +64,8 @@ func newRoleBindings(c *RbacV1Client, namespace string) *roleBindings { scheme.ParameterCodec, namespace, func() *rbacv1.RoleBinding { return &rbacv1.RoleBinding{} }, - func() *rbacv1.RoleBindingList { return &rbacv1.RoleBindingList{} }), + func() *rbacv1.RoleBindingList { return &rbacv1.RoleBindingList{} }, + gentype.PrefersProtobuf[*rbacv1.RoleBinding](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1alpha1/clusterrole.go b/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1alpha1/clusterrole.go index 947f29b3364..3874f9dee99 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1alpha1/clusterrole.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1alpha1/clusterrole.go @@ -64,6 +64,8 @@ func newClusterRoles(c *RbacV1alpha1Client) *clusterRoles { scheme.ParameterCodec, "", func() *rbacv1alpha1.ClusterRole { return &rbacv1alpha1.ClusterRole{} }, - func() *rbacv1alpha1.ClusterRoleList { return &rbacv1alpha1.ClusterRoleList{} }), + func() *rbacv1alpha1.ClusterRoleList { return &rbacv1alpha1.ClusterRoleList{} }, + gentype.PrefersProtobuf[*rbacv1alpha1.ClusterRole](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1alpha1/clusterrolebinding.go b/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1alpha1/clusterrolebinding.go index a6050da0b93..434f875f8ed 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1alpha1/clusterrolebinding.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1alpha1/clusterrolebinding.go @@ -64,6 +64,8 @@ func newClusterRoleBindings(c *RbacV1alpha1Client) *clusterRoleBindings { scheme.ParameterCodec, "", func() *rbacv1alpha1.ClusterRoleBinding { return &rbacv1alpha1.ClusterRoleBinding{} }, - func() *rbacv1alpha1.ClusterRoleBindingList { return &rbacv1alpha1.ClusterRoleBindingList{} }), + func() *rbacv1alpha1.ClusterRoleBindingList { return &rbacv1alpha1.ClusterRoleBindingList{} }, + gentype.PrefersProtobuf[*rbacv1alpha1.ClusterRoleBinding](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1alpha1/role.go b/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1alpha1/role.go index bcc5db9fe9b..3a47f673e63 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1alpha1/role.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1alpha1/role.go @@ -64,6 +64,8 @@ func newRoles(c *RbacV1alpha1Client, namespace string) *roles { scheme.ParameterCodec, namespace, func() *rbacv1alpha1.Role { return &rbacv1alpha1.Role{} }, - func() *rbacv1alpha1.RoleList { return &rbacv1alpha1.RoleList{} }), + func() *rbacv1alpha1.RoleList { return &rbacv1alpha1.RoleList{} }, + gentype.PrefersProtobuf[*rbacv1alpha1.Role](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1alpha1/rolebinding.go b/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1alpha1/rolebinding.go index fccf7d7a589..a6293171dac 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1alpha1/rolebinding.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1alpha1/rolebinding.go @@ -64,6 +64,8 @@ func newRoleBindings(c *RbacV1alpha1Client, namespace string) *roleBindings { scheme.ParameterCodec, namespace, func() *rbacv1alpha1.RoleBinding { return &rbacv1alpha1.RoleBinding{} }, - func() *rbacv1alpha1.RoleBindingList { return &rbacv1alpha1.RoleBindingList{} }), + func() *rbacv1alpha1.RoleBindingList { return &rbacv1alpha1.RoleBindingList{} }, + gentype.PrefersProtobuf[*rbacv1alpha1.RoleBinding](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1beta1/clusterrole.go b/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1beta1/clusterrole.go index a4f85cfc2e0..92388f2f110 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1beta1/clusterrole.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1beta1/clusterrole.go @@ -64,6 +64,8 @@ func newClusterRoles(c *RbacV1beta1Client) *clusterRoles { scheme.ParameterCodec, "", func() *rbacv1beta1.ClusterRole { return &rbacv1beta1.ClusterRole{} }, - func() *rbacv1beta1.ClusterRoleList { return &rbacv1beta1.ClusterRoleList{} }), + func() *rbacv1beta1.ClusterRoleList { return &rbacv1beta1.ClusterRoleList{} }, + gentype.PrefersProtobuf[*rbacv1beta1.ClusterRole](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1beta1/clusterrolebinding.go b/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1beta1/clusterrolebinding.go index 7b49cc6381c..beb50f7b710 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1beta1/clusterrolebinding.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1beta1/clusterrolebinding.go @@ -64,6 +64,8 @@ func newClusterRoleBindings(c *RbacV1beta1Client) *clusterRoleBindings { scheme.ParameterCodec, "", func() *rbacv1beta1.ClusterRoleBinding { return &rbacv1beta1.ClusterRoleBinding{} }, - func() *rbacv1beta1.ClusterRoleBindingList { return &rbacv1beta1.ClusterRoleBindingList{} }), + func() *rbacv1beta1.ClusterRoleBindingList { return &rbacv1beta1.ClusterRoleBindingList{} }, + gentype.PrefersProtobuf[*rbacv1beta1.ClusterRoleBinding](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1beta1/role.go b/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1beta1/role.go index adb12f16b76..700fc6d22bf 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1beta1/role.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1beta1/role.go @@ -64,6 +64,8 @@ func newRoles(c *RbacV1beta1Client, namespace string) *roles { scheme.ParameterCodec, namespace, func() *rbacv1beta1.Role { return &rbacv1beta1.Role{} }, - func() *rbacv1beta1.RoleList { return &rbacv1beta1.RoleList{} }), + func() *rbacv1beta1.RoleList { return &rbacv1beta1.RoleList{} }, + gentype.PrefersProtobuf[*rbacv1beta1.Role](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1beta1/rolebinding.go b/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1beta1/rolebinding.go index 37e31a1e2cb..0f423a0d9eb 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1beta1/rolebinding.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1beta1/rolebinding.go @@ -64,6 +64,8 @@ func newRoleBindings(c *RbacV1beta1Client, namespace string) *roleBindings { scheme.ParameterCodec, namespace, func() *rbacv1beta1.RoleBinding { return &rbacv1beta1.RoleBinding{} }, - func() *rbacv1beta1.RoleBindingList { return &rbacv1beta1.RoleBindingList{} }), + func() *rbacv1beta1.RoleBindingList { return &rbacv1beta1.RoleBindingList{} }, + gentype.PrefersProtobuf[*rbacv1beta1.RoleBinding](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/resource/v1alpha3/deviceclass.go b/staging/src/k8s.io/client-go/kubernetes/typed/resource/v1alpha3/deviceclass.go index dcb3ceb02b2..6cdf57c53d3 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/resource/v1alpha3/deviceclass.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/resource/v1alpha3/deviceclass.go @@ -64,6 +64,8 @@ func newDeviceClasses(c *ResourceV1alpha3Client) *deviceClasses { scheme.ParameterCodec, "", func() *resourcev1alpha3.DeviceClass { return &resourcev1alpha3.DeviceClass{} }, - func() *resourcev1alpha3.DeviceClassList { return &resourcev1alpha3.DeviceClassList{} }), + func() *resourcev1alpha3.DeviceClassList { return &resourcev1alpha3.DeviceClassList{} }, + gentype.PrefersProtobuf[*resourcev1alpha3.DeviceClass](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/resource/v1alpha3/resourceclaim.go b/staging/src/k8s.io/client-go/kubernetes/typed/resource/v1alpha3/resourceclaim.go index f915281ff70..a95ac56d30e 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/resource/v1alpha3/resourceclaim.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/resource/v1alpha3/resourceclaim.go @@ -68,6 +68,8 @@ func newResourceClaims(c *ResourceV1alpha3Client, namespace string) *resourceCla scheme.ParameterCodec, namespace, func() *resourcev1alpha3.ResourceClaim { return &resourcev1alpha3.ResourceClaim{} }, - func() *resourcev1alpha3.ResourceClaimList { return &resourcev1alpha3.ResourceClaimList{} }), + func() *resourcev1alpha3.ResourceClaimList { return &resourcev1alpha3.ResourceClaimList{} }, + gentype.PrefersProtobuf[*resourcev1alpha3.ResourceClaim](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/resource/v1alpha3/resourceclaimtemplate.go b/staging/src/k8s.io/client-go/kubernetes/typed/resource/v1alpha3/resourceclaimtemplate.go index 7a6fdcdc069..a8ba1f69698 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/resource/v1alpha3/resourceclaimtemplate.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/resource/v1alpha3/resourceclaimtemplate.go @@ -66,6 +66,8 @@ func newResourceClaimTemplates(c *ResourceV1alpha3Client, namespace string) *res func() *resourcev1alpha3.ResourceClaimTemplate { return &resourcev1alpha3.ResourceClaimTemplate{} }, func() *resourcev1alpha3.ResourceClaimTemplateList { return &resourcev1alpha3.ResourceClaimTemplateList{} - }), + }, + gentype.PrefersProtobuf[*resourcev1alpha3.ResourceClaimTemplate](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/resource/v1alpha3/resourceslice.go b/staging/src/k8s.io/client-go/kubernetes/typed/resource/v1alpha3/resourceslice.go index 553298d7051..91dfce5ecaa 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/resource/v1alpha3/resourceslice.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/resource/v1alpha3/resourceslice.go @@ -64,6 +64,8 @@ func newResourceSlices(c *ResourceV1alpha3Client) *resourceSlices { scheme.ParameterCodec, "", func() *resourcev1alpha3.ResourceSlice { return &resourcev1alpha3.ResourceSlice{} }, - func() *resourcev1alpha3.ResourceSliceList { return &resourcev1alpha3.ResourceSliceList{} }), + func() *resourcev1alpha3.ResourceSliceList { return &resourcev1alpha3.ResourceSliceList{} }, + gentype.PrefersProtobuf[*resourcev1alpha3.ResourceSlice](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/scheduling/v1/priorityclass.go b/staging/src/k8s.io/client-go/kubernetes/typed/scheduling/v1/priorityclass.go index 797003ab363..3642b404ab3 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/scheduling/v1/priorityclass.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/scheduling/v1/priorityclass.go @@ -64,6 +64,8 @@ func newPriorityClasses(c *SchedulingV1Client) *priorityClasses { scheme.ParameterCodec, "", func() *schedulingv1.PriorityClass { return &schedulingv1.PriorityClass{} }, - func() *schedulingv1.PriorityClassList { return &schedulingv1.PriorityClassList{} }), + func() *schedulingv1.PriorityClassList { return &schedulingv1.PriorityClassList{} }, + gentype.PrefersProtobuf[*schedulingv1.PriorityClass](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/scheduling/v1alpha1/priorityclass.go b/staging/src/k8s.io/client-go/kubernetes/typed/scheduling/v1alpha1/priorityclass.go index 25159774405..e7125f9fc35 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/scheduling/v1alpha1/priorityclass.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/scheduling/v1alpha1/priorityclass.go @@ -64,6 +64,8 @@ func newPriorityClasses(c *SchedulingV1alpha1Client) *priorityClasses { scheme.ParameterCodec, "", func() *schedulingv1alpha1.PriorityClass { return &schedulingv1alpha1.PriorityClass{} }, - func() *schedulingv1alpha1.PriorityClassList { return &schedulingv1alpha1.PriorityClassList{} }), + func() *schedulingv1alpha1.PriorityClassList { return &schedulingv1alpha1.PriorityClassList{} }, + gentype.PrefersProtobuf[*schedulingv1alpha1.PriorityClass](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/scheduling/v1beta1/priorityclass.go b/staging/src/k8s.io/client-go/kubernetes/typed/scheduling/v1beta1/priorityclass.go index b2d2de3550f..dcba291e335 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/scheduling/v1beta1/priorityclass.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/scheduling/v1beta1/priorityclass.go @@ -64,6 +64,8 @@ func newPriorityClasses(c *SchedulingV1beta1Client) *priorityClasses { scheme.ParameterCodec, "", func() *schedulingv1beta1.PriorityClass { return &schedulingv1beta1.PriorityClass{} }, - func() *schedulingv1beta1.PriorityClassList { return &schedulingv1beta1.PriorityClassList{} }), + func() *schedulingv1beta1.PriorityClassList { return &schedulingv1beta1.PriorityClassList{} }, + gentype.PrefersProtobuf[*schedulingv1beta1.PriorityClass](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1/csidriver.go b/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1/csidriver.go index a7391ad4df2..9eb82f9ed43 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1/csidriver.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1/csidriver.go @@ -64,6 +64,8 @@ func newCSIDrivers(c *StorageV1Client) *cSIDrivers { scheme.ParameterCodec, "", func() *storagev1.CSIDriver { return &storagev1.CSIDriver{} }, - func() *storagev1.CSIDriverList { return &storagev1.CSIDriverList{} }), + func() *storagev1.CSIDriverList { return &storagev1.CSIDriverList{} }, + gentype.PrefersProtobuf[*storagev1.CSIDriver](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1/csinode.go b/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1/csinode.go index e244178cf4d..a4fe6a0ee58 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1/csinode.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1/csinode.go @@ -64,6 +64,8 @@ func newCSINodes(c *StorageV1Client) *cSINodes { scheme.ParameterCodec, "", func() *storagev1.CSINode { return &storagev1.CSINode{} }, - func() *storagev1.CSINodeList { return &storagev1.CSINodeList{} }), + func() *storagev1.CSINodeList { return &storagev1.CSINodeList{} }, + gentype.PrefersProtobuf[*storagev1.CSINode](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1/csistoragecapacity.go b/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1/csistoragecapacity.go index 80963c8c257..50a942978c6 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1/csistoragecapacity.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1/csistoragecapacity.go @@ -64,6 +64,8 @@ func newCSIStorageCapacities(c *StorageV1Client, namespace string) *cSIStorageCa scheme.ParameterCodec, namespace, func() *storagev1.CSIStorageCapacity { return &storagev1.CSIStorageCapacity{} }, - func() *storagev1.CSIStorageCapacityList { return &storagev1.CSIStorageCapacityList{} }), + func() *storagev1.CSIStorageCapacityList { return &storagev1.CSIStorageCapacityList{} }, + gentype.PrefersProtobuf[*storagev1.CSIStorageCapacity](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1/storageclass.go b/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1/storageclass.go index 483c5a6fd9b..f33a351f1a6 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1/storageclass.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1/storageclass.go @@ -64,6 +64,8 @@ func newStorageClasses(c *StorageV1Client) *storageClasses { scheme.ParameterCodec, "", func() *storagev1.StorageClass { return &storagev1.StorageClass{} }, - func() *storagev1.StorageClassList { return &storagev1.StorageClassList{} }), + func() *storagev1.StorageClassList { return &storagev1.StorageClassList{} }, + gentype.PrefersProtobuf[*storagev1.StorageClass](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1/volumeattachment.go b/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1/volumeattachment.go index 545b8cb3be0..60db4844fb7 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1/volumeattachment.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1/volumeattachment.go @@ -68,6 +68,8 @@ func newVolumeAttachments(c *StorageV1Client) *volumeAttachments { scheme.ParameterCodec, "", func() *storagev1.VolumeAttachment { return &storagev1.VolumeAttachment{} }, - func() *storagev1.VolumeAttachmentList { return &storagev1.VolumeAttachmentList{} }), + func() *storagev1.VolumeAttachmentList { return &storagev1.VolumeAttachmentList{} }, + gentype.PrefersProtobuf[*storagev1.VolumeAttachment](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1alpha1/csistoragecapacity.go b/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1alpha1/csistoragecapacity.go index 37a89d5d4ae..63ca27fa491 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1alpha1/csistoragecapacity.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1alpha1/csistoragecapacity.go @@ -64,6 +64,8 @@ func newCSIStorageCapacities(c *StorageV1alpha1Client, namespace string) *cSISto scheme.ParameterCodec, namespace, func() *storagev1alpha1.CSIStorageCapacity { return &storagev1alpha1.CSIStorageCapacity{} }, - func() *storagev1alpha1.CSIStorageCapacityList { return &storagev1alpha1.CSIStorageCapacityList{} }), + func() *storagev1alpha1.CSIStorageCapacityList { return &storagev1alpha1.CSIStorageCapacityList{} }, + gentype.PrefersProtobuf[*storagev1alpha1.CSIStorageCapacity](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1alpha1/volumeattachment.go b/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1alpha1/volumeattachment.go index 73fbcdd6243..d9c24ab5b58 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1alpha1/volumeattachment.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1alpha1/volumeattachment.go @@ -68,6 +68,8 @@ func newVolumeAttachments(c *StorageV1alpha1Client) *volumeAttachments { scheme.ParameterCodec, "", func() *storagev1alpha1.VolumeAttachment { return &storagev1alpha1.VolumeAttachment{} }, - func() *storagev1alpha1.VolumeAttachmentList { return &storagev1alpha1.VolumeAttachmentList{} }), + func() *storagev1alpha1.VolumeAttachmentList { return &storagev1alpha1.VolumeAttachmentList{} }, + gentype.PrefersProtobuf[*storagev1alpha1.VolumeAttachment](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1alpha1/volumeattributesclass.go b/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1alpha1/volumeattributesclass.go index d34d0563acf..ef7d6f4baa7 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1alpha1/volumeattributesclass.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1alpha1/volumeattributesclass.go @@ -64,6 +64,8 @@ func newVolumeAttributesClasses(c *StorageV1alpha1Client) *volumeAttributesClass scheme.ParameterCodec, "", func() *storagev1alpha1.VolumeAttributesClass { return &storagev1alpha1.VolumeAttributesClass{} }, - func() *storagev1alpha1.VolumeAttributesClassList { return &storagev1alpha1.VolumeAttributesClassList{} }), + func() *storagev1alpha1.VolumeAttributesClassList { return &storagev1alpha1.VolumeAttributesClassList{} }, + gentype.PrefersProtobuf[*storagev1alpha1.VolumeAttributesClass](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1beta1/csidriver.go b/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1beta1/csidriver.go index 968fce70fd7..063fdb8d161 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1beta1/csidriver.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1beta1/csidriver.go @@ -64,6 +64,8 @@ func newCSIDrivers(c *StorageV1beta1Client) *cSIDrivers { scheme.ParameterCodec, "", func() *storagev1beta1.CSIDriver { return &storagev1beta1.CSIDriver{} }, - func() *storagev1beta1.CSIDriverList { return &storagev1beta1.CSIDriverList{} }), + func() *storagev1beta1.CSIDriverList { return &storagev1beta1.CSIDriverList{} }, + gentype.PrefersProtobuf[*storagev1beta1.CSIDriver](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1beta1/csinode.go b/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1beta1/csinode.go index 4b0e5e26ebc..5e8eb2e376d 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1beta1/csinode.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1beta1/csinode.go @@ -64,6 +64,8 @@ func newCSINodes(c *StorageV1beta1Client) *cSINodes { scheme.ParameterCodec, "", func() *storagev1beta1.CSINode { return &storagev1beta1.CSINode{} }, - func() *storagev1beta1.CSINodeList { return &storagev1beta1.CSINodeList{} }), + func() *storagev1beta1.CSINodeList { return &storagev1beta1.CSINodeList{} }, + gentype.PrefersProtobuf[*storagev1beta1.CSINode](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1beta1/csistoragecapacity.go b/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1beta1/csistoragecapacity.go index 63fb0e05e9b..d1f5a702926 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1beta1/csistoragecapacity.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1beta1/csistoragecapacity.go @@ -64,6 +64,8 @@ func newCSIStorageCapacities(c *StorageV1beta1Client, namespace string) *cSIStor scheme.ParameterCodec, namespace, func() *storagev1beta1.CSIStorageCapacity { return &storagev1beta1.CSIStorageCapacity{} }, - func() *storagev1beta1.CSIStorageCapacityList { return &storagev1beta1.CSIStorageCapacityList{} }), + func() *storagev1beta1.CSIStorageCapacityList { return &storagev1beta1.CSIStorageCapacityList{} }, + gentype.PrefersProtobuf[*storagev1beta1.CSIStorageCapacity](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1beta1/storageclass.go b/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1beta1/storageclass.go index 4d9a34550ec..341d5ba8254 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1beta1/storageclass.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1beta1/storageclass.go @@ -64,6 +64,8 @@ func newStorageClasses(c *StorageV1beta1Client) *storageClasses { scheme.ParameterCodec, "", func() *storagev1beta1.StorageClass { return &storagev1beta1.StorageClass{} }, - func() *storagev1beta1.StorageClassList { return &storagev1beta1.StorageClassList{} }), + func() *storagev1beta1.StorageClassList { return &storagev1beta1.StorageClassList{} }, + gentype.PrefersProtobuf[*storagev1beta1.StorageClass](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1beta1/volumeattachment.go b/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1beta1/volumeattachment.go index a68138c388b..42c1bd7e0b1 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1beta1/volumeattachment.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1beta1/volumeattachment.go @@ -68,6 +68,8 @@ func newVolumeAttachments(c *StorageV1beta1Client) *volumeAttachments { scheme.ParameterCodec, "", func() *storagev1beta1.VolumeAttachment { return &storagev1beta1.VolumeAttachment{} }, - func() *storagev1beta1.VolumeAttachmentList { return &storagev1beta1.VolumeAttachmentList{} }), + func() *storagev1beta1.VolumeAttachmentList { return &storagev1beta1.VolumeAttachmentList{} }, + gentype.PrefersProtobuf[*storagev1beta1.VolumeAttachment](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1beta1/volumeattributesclass.go b/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1beta1/volumeattributesclass.go index e0caa7dd360..09f9f117870 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1beta1/volumeattributesclass.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1beta1/volumeattributesclass.go @@ -64,6 +64,8 @@ func newVolumeAttributesClasses(c *StorageV1beta1Client) *volumeAttributesClasse scheme.ParameterCodec, "", func() *storagev1beta1.VolumeAttributesClass { return &storagev1beta1.VolumeAttributesClass{} }, - func() *storagev1beta1.VolumeAttributesClassList { return &storagev1beta1.VolumeAttributesClassList{} }), + func() *storagev1beta1.VolumeAttributesClassList { return &storagev1beta1.VolumeAttributesClassList{} }, + gentype.PrefersProtobuf[*storagev1beta1.VolumeAttributesClass](), + ), } } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/storagemigration/v1alpha1/storageversionmigration.go b/staging/src/k8s.io/client-go/kubernetes/typed/storagemigration/v1alpha1/storageversionmigration.go index 2e9c0f7b680..5c6981ec87d 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/storagemigration/v1alpha1/storageversionmigration.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/storagemigration/v1alpha1/storageversionmigration.go @@ -72,6 +72,8 @@ func newStorageVersionMigrations(c *StoragemigrationV1alpha1Client) *storageVers }, func() *storagemigrationv1alpha1.StorageVersionMigrationList { return &storagemigrationv1alpha1.StorageVersionMigrationList{} - }), + }, + gentype.PrefersProtobuf[*storagemigrationv1alpha1.StorageVersionMigration](), + ), } } diff --git a/staging/src/k8s.io/client-go/rest/client.go b/staging/src/k8s.io/client-go/rest/client.go index 60df7e568c3..c864d1ec79c 100644 --- a/staging/src/k8s.io/client-go/rest/client.go +++ b/staging/src/k8s.io/client-go/rest/client.go @@ -105,10 +105,6 @@ type RESTClient struct { // NewRESTClient creates a new RESTClient. This client performs generic REST functions // such as Get, Put, Post, and Delete on specified paths. func NewRESTClient(baseURL *url.URL, versionedAPIPath string, config ClientContentConfig, rateLimiter flowcontrol.RateLimiter, client *http.Client) (*RESTClient, error) { - if len(config.ContentType) == 0 { - config.ContentType = "application/json" - } - base := *baseURL if !strings.HasSuffix(base.Path, "/") { base.Path += "/" diff --git a/staging/src/k8s.io/client-go/rest/request.go b/staging/src/k8s.io/client-go/rest/request.go index d30c3898260..2f325ecd628 100644 --- a/staging/src/k8s.io/client-go/rest/request.go +++ b/staging/src/k8s.io/client-go/rest/request.go @@ -100,6 +100,9 @@ func defaultRequestRetryFn(maxRetries int) WithRetry { type Request struct { c *RESTClient + contentConfig ClientContentConfig + contentTypeNotSet bool + warningHandler WarningHandler rateLimiter flowcontrol.RateLimiter @@ -153,6 +156,12 @@ func NewRequest(c *RESTClient) *Request { timeout = c.Client.Timeout } + contentConfig := c.content + contentTypeNotSet := len(contentConfig.ContentType) == 0 + if contentTypeNotSet { + contentConfig.ContentType = "application/json" + } + r := &Request{ c: c, rateLimiter: c.rateLimiter, @@ -162,14 +171,12 @@ func NewRequest(c *RESTClient) *Request { maxRetries: 10, retryFn: defaultRequestRetryFn, warningHandler: c.warningHandler, + + contentConfig: contentConfig, + contentTypeNotSet: contentTypeNotSet, } - switch { - case len(c.content.AcceptContentTypes) > 0: - r.SetHeader("Accept", c.content.AcceptContentTypes) - case len(c.content.ContentType) > 0: - r.SetHeader("Accept", c.content.ContentType+", */*") - } + r.setAcceptHeader() return r } @@ -183,6 +190,31 @@ func NewRequestWithClient(base *url.URL, versionedAPIPath string, content Client }) } +func (r *Request) UseProtobufAsDefaultIfPreferred(prefersProtobuf bool) *Request { + if prefersProtobuf { + return r.UseProtobufAsDefault() + } + return r +} + +func (r *Request) UseProtobufAsDefault() *Request { + if r.contentTypeNotSet && len(r.contentConfig.AcceptContentTypes) == 0 { + r.contentConfig.AcceptContentTypes = "application/vnd.kubernetes.protobuf,application/json" + r.contentConfig.ContentType = "application/vnd.kubernetes.protobuf" + r.setAcceptHeader() + } + return r +} + +func (r *Request) setAcceptHeader() { + switch { + case len(r.contentConfig.AcceptContentTypes) > 0: + r.SetHeader("Accept", r.contentConfig.AcceptContentTypes) + case len(r.contentConfig.ContentType) > 0: + r.SetHeader("Accept", r.contentConfig.ContentType+", */*") + } +} + // Verb sets the verb this request will use. func (r *Request) Verb(verb string) *Request { r.verb = verb @@ -371,7 +403,7 @@ func (r *Request) Param(paramName, s string) *Request { // VersionedParams will not write query parameters that have omitempty set and are empty. If a // parameter has already been set it is appended to (Params and VersionedParams are additive). func (r *Request) VersionedParams(obj runtime.Object, codec runtime.ParameterCodec) *Request { - return r.SpecificallyVersionedParams(obj, codec, r.c.content.GroupVersion) + return r.SpecificallyVersionedParams(obj, codec, r.contentConfig.GroupVersion) } func (r *Request) SpecificallyVersionedParams(obj runtime.Object, codec runtime.ParameterCodec, version schema.GroupVersion) *Request { @@ -464,7 +496,7 @@ func (r *Request) Body(obj interface{}) *Request { if reflect.ValueOf(t).IsNil() { return r } - encoder, err := r.c.content.Negotiator.Encoder(r.c.content.ContentType, nil) + encoder, err := r.contentConfig.Negotiator.Encoder(r.contentConfig.ContentType, nil) if err != nil { r.err = err return r @@ -476,7 +508,7 @@ func (r *Request) Body(obj interface{}) *Request { } r.body = nil r.bodyBytes = data - r.SetHeader("Content-Type", r.c.content.ContentType) + r.SetHeader("Content-Type", r.contentConfig.ContentType) default: r.err = fmt.Errorf("unknown type used for body: %+v", obj) } @@ -944,7 +976,7 @@ func (r *Request) newStreamWatcher(resp *http.Response) (watch.Interface, runtim if err != nil { klog.V(4).Infof("Unexpected content type from the server: %q: %v", contentType, err) } - objectDecoder, streamingSerializer, framer, err := r.c.content.Negotiator.StreamDecoder(mediaType, params) + objectDecoder, streamingSerializer, framer, err := r.contentConfig.Negotiator.StreamDecoder(mediaType, params) if err != nil { return nil, nil, err } @@ -1310,7 +1342,7 @@ func (r *Request) transformResponse(ctx context.Context, resp *http.Response, re var decoder runtime.Decoder contentType := resp.Header.Get("Content-Type") if len(contentType) == 0 { - contentType = r.c.content.ContentType + contentType = r.contentConfig.ContentType } if len(contentType) > 0 { var err error @@ -1318,7 +1350,7 @@ func (r *Request) transformResponse(ctx context.Context, resp *http.Response, re if err != nil { return Result{err: errors.NewInternalError(err)} } - decoder, err = r.c.content.Negotiator.Decoder(mediaType, params) + decoder, err = r.contentConfig.Negotiator.Decoder(mediaType, params) if err != nil { // if we fail to negotiate a decoder, treat this as an unstructured error switch { @@ -1445,7 +1477,7 @@ func (r *Request) newUnstructuredResponseError(body []byte, isTextResponse bool, } var groupResource schema.GroupResource if len(r.resource) > 0 { - groupResource.Group = r.c.content.GroupVersion.Group + groupResource.Group = r.contentConfig.GroupVersion.Group groupResource.Resource = r.resource } return errors.NewGenericServerResponse( diff --git a/staging/src/k8s.io/client-go/rest/request_test.go b/staging/src/k8s.io/client-go/rest/request_test.go index 7d87c384648..186c5a35b9f 100644 --- a/staging/src/k8s.io/client-go/rest/request_test.go +++ b/staging/src/k8s.io/client-go/rest/request_test.go @@ -43,6 +43,7 @@ import ( "github.com/stretchr/testify/require" "github.com/google/go-cmp/cmp" + v1 "k8s.io/api/core/v1" apiequality "k8s.io/apimachinery/pkg/api/equality" apierrors "k8s.io/apimachinery/pkg/api/errors" @@ -66,7 +67,7 @@ import ( func TestNewRequestSetsAccept(t *testing.T) { r := NewRequestWithClient(&url.URL{Path: "/path/"}, "", ClientContentConfig{}, nil).Verb("get") - if r.headers.Get("Accept") != "" { + if r.headers.Get("Accept") != "application/json, */*" { t.Errorf("unexpected headers: %#v", r.headers) } r = NewRequestWithClient(&url.URL{Path: "/path/"}, "", ClientContentConfig{ContentType: "application/other"}, nil).Verb("get") @@ -112,9 +113,9 @@ func TestRequestWithErrorWontChange(t *testing.T) { gvCopy := v1.SchemeGroupVersion original := Request{ err: errors.New("test"), - c: &RESTClient{ - content: ClientContentConfig{GroupVersion: gvCopy}, - }, + c: &RESTClient{}, + + contentConfig: ClientContentConfig{GroupVersion: gvCopy}, } r := original changed := r.Param("foo", "bar"). @@ -236,7 +237,7 @@ func TestRequestParam(t *testing.T) { } func TestRequestVersionedParams(t *testing.T) { - r := (&Request{c: &RESTClient{content: ClientContentConfig{GroupVersion: v1.SchemeGroupVersion}}}).Param("foo", "a") + r := (&Request{c: &RESTClient{}, contentConfig: ClientContentConfig{GroupVersion: v1.SchemeGroupVersion}}).Param("foo", "a") if !reflect.DeepEqual(r.params, url.Values{"foo": []string{"a"}}) { t.Errorf("should have set a param: %#v", r) } @@ -252,7 +253,7 @@ func TestRequestVersionedParams(t *testing.T) { } func TestRequestVersionedParamsFromListOptions(t *testing.T) { - r := &Request{c: &RESTClient{content: ClientContentConfig{GroupVersion: v1.SchemeGroupVersion}}} + r := &Request{c: &RESTClient{}, contentConfig: ClientContentConfig{GroupVersion: v1.SchemeGroupVersion}} r.VersionedParams(&metav1.ListOptions{ResourceVersion: "1"}, scheme.ParameterCodec) if !reflect.DeepEqual(r.params, url.Values{ "resourceVersion": []string{"1"}, @@ -272,7 +273,7 @@ func TestRequestVersionedParamsFromListOptions(t *testing.T) { func TestRequestVersionedParamsWithInvalidScheme(t *testing.T) { parameterCodec := runtime.NewParameterCodec(runtime.NewScheme()) - r := (&Request{c: &RESTClient{content: ClientContentConfig{GroupVersion: v1.SchemeGroupVersion}}}) + r := &Request{c: &RESTClient{}, contentConfig: ClientContentConfig{GroupVersion: v1.SchemeGroupVersion}} r.VersionedParams(&v1.PodExecOptions{Stdin: false, Stdout: true}, parameterCodec) @@ -336,7 +337,7 @@ func TestRequestBody(t *testing.T) { } // test unencodable api object - r = (&Request{c: &RESTClient{content: defaultContentConfig()}}).Body(&NotAnAPIObject{}) + r = (&Request{c: &RESTClient{}, contentConfig: defaultContentConfig()}).Body(&NotAnAPIObject{}) if r.err == nil || r.body != nil { t.Errorf("should have set err and left body nil: %#v", r) } @@ -901,11 +902,10 @@ func TestTransformUnstructuredError(t *testing.T) { t.Run("", func(t *testing.T) { _, ctx := ktesting.NewTestContext(t) r := &Request{ - c: &RESTClient{ - content: defaultContentConfig(), - }, - resourceName: testCase.Name, - resource: testCase.Resource, + contentConfig: defaultContentConfig(), + c: &RESTClient{}, + resourceName: testCase.Name, + resource: testCase.Resource, } result := r.transformResponse(ctx, testCase.Res, testCase.Req) err := result.err @@ -989,9 +989,9 @@ func TestRequestWatch(t *testing.T) { { name: "server returns forbidden with json content", Request: &Request{ + contentConfig: defaultContentConfig(), c: &RESTClient{ - content: defaultContentConfig(), - base: &url.URL{}, + base: &url.URL{}, }, }, serverReturns: []responseErr{ @@ -1018,9 +1018,9 @@ func TestRequestWatch(t *testing.T) { { name: "server returns forbidden without content", Request: &Request{ + contentConfig: defaultContentConfig(), c: &RESTClient{ - content: defaultContentConfig(), - base: &url.URL{}, + base: &url.URL{}, }, }, serverReturns: []responseErr{ @@ -1038,9 +1038,9 @@ func TestRequestWatch(t *testing.T) { { name: "server returns unauthorized", Request: &Request{ + contentConfig: defaultContentConfig(), c: &RESTClient{ - content: defaultContentConfig(), - base: &url.URL{}, + base: &url.URL{}, }, }, serverReturns: []responseErr{ @@ -1058,9 +1058,9 @@ func TestRequestWatch(t *testing.T) { { name: "server returns unauthorized", Request: &Request{ + contentConfig: defaultContentConfig(), c: &RESTClient{ - content: defaultContentConfig(), - base: &url.URL{}, + base: &url.URL{}, }, }, serverReturns: []responseErr{ @@ -1254,9 +1254,9 @@ func TestRequestStream(t *testing.T) { }, { Request: &Request{ + contentConfig: defaultContentConfig(), c: &RESTClient{ - content: defaultContentConfig(), - base: &url.URL{}, + base: &url.URL{}, }, }, serverReturns: []responseErr{ @@ -1273,9 +1273,9 @@ func TestRequestStream(t *testing.T) { }, { Request: &Request{ + contentConfig: defaultContentConfig(), c: &RESTClient{ - content: defaultContentConfig(), - base: &url.URL{}, + base: &url.URL{}, }, }, serverReturns: []responseErr{ @@ -2957,12 +2957,12 @@ func testRequestWithRetry(t *testing.T, key string, doFunc func(ctx context.Cont }) req := &Request{ - verb: test.verb, - body: test.body, - bodyBytes: test.bodyBytes, + verb: test.verb, + body: test.body, + bodyBytes: test.bodyBytes, + contentConfig: defaultContentConfig(), c: &RESTClient{ - content: defaultContentConfig(), - Client: client, + Client: client, }, backoff: &noSleepBackOff{}, maxRetries: test.maxRetries, @@ -3251,11 +3251,11 @@ func testRetryWithRateLimiterBackoffAndMetrics(t *testing.T, key string, doFunc t.Fatalf("Wrong test setup - did not find expected for: %s", key) } req := &Request{ - verb: "GET", - bodyBytes: []byte{}, + verb: "GET", + bodyBytes: []byte{}, + contentConfig: defaultContentConfig(), c: &RESTClient{ base: base, - content: defaultContentConfig(), Client: client, rateLimiter: interceptor, }, @@ -3387,12 +3387,12 @@ func testWithRetryInvokeOrder(t *testing.T, key string, doFunc func(ctx context. t.Fatalf("Wrong test setup - did not find expected for: %s", key) } req := &Request{ - verb: "GET", - bodyBytes: []byte{}, + verb: "GET", + bodyBytes: []byte{}, + contentConfig: defaultContentConfig(), c: &RESTClient{ - base: base, - content: defaultContentConfig(), - Client: client, + base: base, + Client: client, }, pathPrefix: "/api/v1", rateLimiter: flowcontrol.NewFakeAlwaysRateLimiter(), @@ -3562,12 +3562,12 @@ func testWithWrapPreviousError(t *testing.T, doFunc func(ctx context.Context, r t.Fatalf("Failed to create new HTTP request - %v", err) } req := &Request{ - verb: "GET", - bodyBytes: []byte{}, + verb: "GET", + bodyBytes: []byte{}, + contentConfig: defaultContentConfig(), c: &RESTClient{ - base: base, - content: defaultContentConfig(), - Client: client, + base: base, + Client: client, }, pathPrefix: "/api/v1", rateLimiter: flowcontrol.NewFakeAlwaysRateLimiter(), @@ -3986,11 +3986,11 @@ func TestRetryableConditions(t *testing.T) { u, _ := url.Parse("http://localhost:123" + "/apis") req := &Request{ - verb: verb, + verb: verb, + contentConfig: defaultContentConfig(), c: &RESTClient{ - base: u, - content: defaultContentConfig(), - Client: client, + base: u, + Client: client, }, backoff: &noSleepBackOff{}, maxRetries: 2, @@ -4030,10 +4030,10 @@ func TestRequestConcurrencyWithRetry(t *testing.T) { }) req := &Request{ - verb: "POST", + verb: "POST", + contentConfig: defaultContentConfig(), c: &RESTClient{ - content: defaultContentConfig(), - Client: client, + Client: client, }, backoff: &noSleepBackOff{}, maxRetries: 9, // 10 attempts in total, including the first diff --git a/staging/src/k8s.io/client-go/rest/request_watchlist_test.go b/staging/src/k8s.io/client-go/rest/request_watchlist_test.go index 2fff568f609..8195ece1c32 100644 --- a/staging/src/k8s.io/client-go/rest/request_watchlist_test.go +++ b/staging/src/k8s.io/client-go/rest/request_watchlist_test.go @@ -200,9 +200,7 @@ func TestWatchListSuccess(t *testing.T) { ctx := context.Background() fakeWatcher := watch.NewFake() target := &Request{ - c: &RESTClient{ - content: ClientContentConfig{}, - }, + c: &RESTClient{}, } go func(watchEvents []watch.Event) { diff --git a/staging/src/k8s.io/code-generator/cmd/client-gen/args/args.go b/staging/src/k8s.io/code-generator/cmd/client-gen/args/args.go index e0914e69d2f..5620fc0c2e0 100644 --- a/staging/src/k8s.io/code-generator/cmd/client-gen/args/args.go +++ b/staging/src/k8s.io/code-generator/cmd/client-gen/args/args.go @@ -61,6 +61,9 @@ type Args struct { // If non-empty, Apply functions are generated for each type and reference the apply builders. // If empty (""), Apply functions are not generated. ApplyConfigurationPackage string + + // PrefersProtobuf determines if the generated clientset uses protobuf for API requests. + PrefersProtobuf bool } func New() *Args { @@ -99,6 +102,8 @@ func (args *Args) AddFlags(fs *pflag.FlagSet, inputBase string) { "list of comma separated plural exception definitions in Type:PluralizedType form") fs.StringVar(&args.ApplyConfigurationPackage, "apply-configuration-package", args.ApplyConfigurationPackage, "optional package of apply configurations, generated by applyconfiguration-gen, that are required to generate Apply functions for each type in the clientset. By default Apply functions are not generated.") + fs.BoolVar(&args.PrefersProtobuf, "prefers-protobuf", args.PrefersProtobuf, + "when set, client-gen will generate a clientset that uses protobuf for API requests") // support old flags fs.SetNormalizeFunc(mapFlagName("clientset-path", "output-pkg", fs.GetNormalizeFunc())) diff --git a/staging/src/k8s.io/code-generator/cmd/client-gen/generators/client_generator.go b/staging/src/k8s.io/code-generator/cmd/client-gen/generators/client_generator.go index 1fc21c224b5..c8fa01a8ecd 100644 --- a/staging/src/k8s.io/code-generator/cmd/client-gen/generators/client_generator.go +++ b/staging/src/k8s.io/code-generator/cmd/client-gen/generators/client_generator.go @@ -128,7 +128,7 @@ func DefaultNameSystem() string { return "public" } -func targetForGroup(gv clientgentypes.GroupVersion, typeList []*types.Type, clientsetDir, clientsetPkg string, groupPkgName string, groupGoName string, apiPath string, inputPkg string, applyBuilderPkg string, boilerplate []byte) generator.Target { +func targetForGroup(gv clientgentypes.GroupVersion, typeList []*types.Type, clientsetDir, clientsetPkg string, groupPkgName string, groupGoName string, apiPath string, inputPkg string, applyBuilderPkg string, boilerplate []byte, prefersProtobuf bool) generator.Target { subdir := []string{"typed", strings.ToLower(groupPkgName), strings.ToLower(gv.Version.NonEmpty())} gvDir := filepath.Join(clientsetDir, filepath.Join(subdir...)) gvPkg := path.Join(clientsetPkg, path.Join(subdir...)) @@ -160,6 +160,7 @@ func targetForGroup(gv clientgentypes.GroupVersion, typeList []*types.Type, clie group: gv.Group.NonEmpty(), version: gv.Version.String(), groupGoName: groupGoName, + prefersProtobuf: prefersProtobuf, typeToMatch: t, imports: generator.NewImportTrackerForPackage(gvPkg), }) @@ -424,7 +425,7 @@ func GetTargets(context *generator.Context, args *args.Args) []generator.Target targetForGroup( gv, orderer.OrderTypes(types), clientsetDir, clientsetPkg, group.PackageName, groupGoNames[gv], args.ClientsetAPIPath, - inputPath, args.ApplyConfigurationPackage, boilerplate)) + inputPath, args.ApplyConfigurationPackage, boilerplate, args.PrefersProtobuf)) if args.FakeClient { targetList = append(targetList, fake.TargetForGroup(gv, orderer.OrderTypes(types), clientsetDir, clientsetPkg, group.PackageName, groupGoNames[gv], inputPath, args.ApplyConfigurationPackage, boilerplate)) diff --git a/staging/src/k8s.io/code-generator/cmd/client-gen/generators/generator_for_type.go b/staging/src/k8s.io/code-generator/cmd/client-gen/generators/generator_for_type.go index 53e970c05ee..4c63b8f8ebd 100644 --- a/staging/src/k8s.io/code-generator/cmd/client-gen/generators/generator_for_type.go +++ b/staging/src/k8s.io/code-generator/cmd/client-gen/generators/generator_for_type.go @@ -41,6 +41,7 @@ type genClientForType struct { group string version string groupGoName string + prefersProtobuf bool typeToMatch *types.Type imports namer.ImportTracker } @@ -161,6 +162,7 @@ func (g *genClientForType) GenerateType(c *generator.Context, t *types.Type, w i "subresource": false, "subresourcePath": "", "GroupGoName": g.groupGoName, + "prefersProtobuf": g.prefersProtobuf, "Version": namer.IC(g.version), "CreateOptions": c.Universe.Type(types.Name{Package: "k8s.io/apimachinery/pkg/apis/meta/v1", Name: "CreateOptions"}), "DeleteOptions": c.Universe.Type(types.Name{Package: "k8s.io/apimachinery/pkg/apis/meta/v1", Name: "DeleteOptions"}), @@ -483,7 +485,9 @@ var newStruct = []string{ c.RESTClient(), $.schemeParameterCodec|raw$, namespace, - func() *$.resultType|raw$ { return &$.resultType|raw${} }), + func() *$.resultType|raw$ { return &$.resultType|raw${} }, + $if .prefersProtobuf$gentype.PrefersProtobuf[*$.resultType|raw$](),$end$ + ), } } `, @@ -496,7 +500,9 @@ var newStruct = []string{ c.RESTClient(), $.schemeParameterCodec|raw$, namespace, - func() *$.resultType|raw$ { return &$.resultType|raw${} }), + func() *$.resultType|raw$ { return &$.resultType|raw${} }, + $if .prefersProtobuf$gentype.PrefersProtobuf[*$.resultType|raw$](),$end$ + ), } } `, @@ -510,7 +516,9 @@ var newStruct = []string{ $.schemeParameterCodec|raw$, namespace, func() *$.resultType|raw$ { return &$.resultType|raw${} }, - func() *$.resultType|raw$List { return &$.resultType|raw$List{} }), + func() *$.resultType|raw$List { return &$.resultType|raw$List{} }, + $if .prefersProtobuf$gentype.PrefersProtobuf[*$.resultType|raw$](),$end$ + ), } } `, @@ -524,7 +532,9 @@ var newStruct = []string{ $.schemeParameterCodec|raw$, namespace, func() *$.resultType|raw$ { return &$.resultType|raw${} }, - func() *$.resultType|raw$List { return &$.resultType|raw$List{} }), + func() *$.resultType|raw$List { return &$.resultType|raw$List{} }, + $if .prefersProtobuf$gentype.PrefersProtobuf[*$.resultType|raw$](),$end$ + ), } } `, @@ -537,7 +547,9 @@ var newStruct = []string{ c.RESTClient(), $.schemeParameterCodec|raw$, "", - func() *$.resultType|raw$ { return &$.resultType|raw${} }), + func() *$.resultType|raw$ { return &$.resultType|raw${} }, + $if .prefersProtobuf$gentype.PrefersProtobuf[*$.resultType|raw$](),$end$ + ), } } `, @@ -550,7 +562,9 @@ var newStruct = []string{ c.RESTClient(), $.schemeParameterCodec|raw$, "", - func() *$.resultType|raw$ { return &$.resultType|raw${} }), + func() *$.resultType|raw$ { return &$.resultType|raw${} }, + $if .prefersProtobuf$gentype.PrefersProtobuf[*$.resultType|raw$](),$end$ + ), } } `, @@ -564,7 +578,9 @@ var newStruct = []string{ $.schemeParameterCodec|raw$, "", func() *$.resultType|raw$ { return &$.resultType|raw${} }, - func() *$.resultType|raw$List { return &$.resultType|raw$List{} }), + func() *$.resultType|raw$List { return &$.resultType|raw$List{} }, + $if .prefersProtobuf$gentype.PrefersProtobuf[*$.resultType|raw$](),$end$ + ), } } `, @@ -578,7 +594,9 @@ var newStruct = []string{ $.schemeParameterCodec|raw$, "", func() *$.resultType|raw$ { return &$.resultType|raw${} }, - func() *$.resultType|raw$List { return &$.resultType|raw$List{} }), + func() *$.resultType|raw$List { return &$.resultType|raw$List{} }, + $if .prefersProtobuf$gentype.PrefersProtobuf[*$.resultType|raw$](),$end$ + ), } } `, @@ -614,6 +632,7 @@ func (c *$.type|privatePlural$) list(ctx $.context|raw$, opts $.ListOptions|raw$ } result = &$.resultType|raw$List{} err = c.GetClient().Get(). + $if .prefersProtobuf$UseProtobufAsDefault().$end$ $if .namespaced$Namespace(c.GetNamespace()).$end$ Resource("$.type|resource$"). VersionedParams(&opts, $.schemeParameterCodec|raw$). @@ -633,6 +652,7 @@ func (c *$.type|privatePlural$) $.verb$(ctx $.context|raw$, $.type|private$Name } result = &$.resultType|raw$List{} err = c.GetClient().Get(). + $if .prefersProtobuf$UseProtobufAsDefault().$end$ $if .namespaced$Namespace(c.GetNamespace()).$end$ Resource("$.type|resource$"). Name($.type|private$Name). @@ -650,6 +670,7 @@ var getTemplate = ` func (c *$.type|privatePlural$) $.verb$(ctx $.context|raw$, name string, options $.GetOptions|raw$) (result *$.resultType|raw$, err error) { result = &$.resultType|raw${} err = c.GetClient().Get(). + $if .prefersProtobuf$UseProtobufAsDefault().$end$ $if .namespaced$Namespace(c.GetNamespace()).$end$ Resource("$.type|resource$"). Name(name). @@ -665,6 +686,7 @@ var getSubresourceTemplate = ` func (c *$.type|privatePlural$) $.verb$(ctx $.context|raw$, $.type|private$Name string, options $.GetOptions|raw$) (result *$.resultType|raw$, err error) { result = &$.resultType|raw${} err = c.GetClient().Get(). + $if .prefersProtobuf$UseProtobufAsDefault().$end$ $if .namespaced$Namespace(c.GetNamespace()).$end$ Resource("$.type|resource$"). Name($.type|private$Name). @@ -680,6 +702,7 @@ var deleteTemplate = ` // $.verb$ takes name of the $.type|private$ and deletes it. Returns an error if one occurs. func (c *$.type|privatePlural$) $.verb$(ctx $.context|raw$, name string, opts $.DeleteOptions|raw$) error { return c.GetClient().Delete(). + $if .prefersProtobuf$UseProtobufAsDefault().$end$ $if .namespaced$Namespace(c.GetNamespace()).$end$ Resource("$.type|resource$"). Name(name). @@ -694,6 +717,7 @@ var createSubresourceTemplate = ` func (c *$.type|privatePlural$) $.verb$(ctx $.context|raw$, $.type|private$Name string, $.inputType|private$ *$.inputType|raw$, opts $.CreateOptions|raw$) (result *$.resultType|raw$, err error) { result = &$.resultType|raw${} err = c.GetClient().Post(). + $if .prefersProtobuf$UseProtobufAsDefault().$end$ $if .namespaced$Namespace(c.GetNamespace()).$end$ Resource("$.type|resource$"). Name($.type|private$Name). @@ -711,6 +735,7 @@ var createTemplate = ` func (c *$.type|privatePlural$) $.verb$(ctx $.context|raw$, $.inputType|private$ *$.inputType|raw$, opts $.CreateOptions|raw$) (result *$.resultType|raw$, err error) { result = &$.resultType|raw${} err = c.GetClient().Post(). + $if .prefersProtobuf$UseProtobufAsDefault().$end$ $if .namespaced$Namespace(c.GetNamespace()).$end$ Resource("$.type|resource$"). VersionedParams(&opts, $.schemeParameterCodec|raw$). @@ -726,6 +751,7 @@ var updateSubresourceTemplate = ` func (c *$.type|privatePlural$) $.verb$(ctx $.context|raw$, $.type|private$Name string, $.inputType|private$ *$.inputType|raw$, opts $.UpdateOptions|raw$) (result *$.resultType|raw$, err error) { result = &$.resultType|raw${} err = c.GetClient().Put(). + $if .prefersProtobuf$UseProtobufAsDefault().$end$ $if .namespaced$Namespace(c.GetNamespace()).$end$ Resource("$.type|resource$"). Name($.type|private$Name). @@ -743,6 +769,7 @@ var updateTemplate = ` func (c *$.type|privatePlural$) $.verb$(ctx $.context|raw$, $.inputType|private$ *$.inputType|raw$, opts $.UpdateOptions|raw$) (result *$.resultType|raw$, err error) { result = &$.resultType|raw${} err = c.GetClient().Put(). + $if .prefersProtobuf$UseProtobufAsDefault().$end$ $if .namespaced$Namespace(c.GetNamespace()).$end$ Resource("$.type|resource$"). Name($.inputType|private$.Name). @@ -763,6 +790,7 @@ func (c *$.type|privatePlural$) $.verb$(ctx $.context|raw$, opts $.ListOptions|r } opts.Watch = true return c.GetClient().Get(). + $if .prefersProtobuf$UseProtobufAsDefault().$end$ $if .namespaced$Namespace(c.GetNamespace()).$end$ VersionedParams(&opts, $.schemeParameterCodec|raw$). Timeout(timeout). @@ -779,6 +807,7 @@ func (c *$.type|privatePlural$) watchList(ctx $.context|raw$, opts $.ListOptions } result = &$.resultType|raw$List{} err = c.GetClient().Get(). + $if .prefersProtobuf$UseProtobufAsDefault().$end$ $if .namespaced$Namespace(c.GetNamespace()).$end$ Resource("$.type|resource$"). VersionedParams(&opts, $.schemeParameterCodec|raw$). @@ -794,6 +823,7 @@ var patchTemplate = ` func (c *$.type|privatePlural$) $.verb$(ctx $.context|raw$, name string, pt $.PatchType|raw$, data []byte, opts $.PatchOptions|raw$, subresources ...string) (result *$.resultType|raw$, err error) { result = &$.resultType|raw${} err = c.GetClient().Patch(pt). + $if .prefersProtobuf$UseProtobufAsDefault().$end$ $if .namespaced$Namespace(c.GetNamespace()).$end$ Resource("$.type|resource$"). Name(name). @@ -823,6 +853,7 @@ func (c *$.type|privatePlural$) $.verb$(ctx $.context|raw$, $.inputType|private$ } result = &$.resultType|raw${} err = c.GetClient().Patch($.ApplyPatchType|raw$). + $if .prefersProtobuf$UseProtobufAsDefault().$end$ $if .namespaced$Namespace(c.GetNamespace()).$end$ Resource("$.type|resource$"). Name(*name). @@ -849,6 +880,7 @@ func (c *$.type|privatePlural$) $.verb$(ctx $.context|raw$, $.type|private$Name result = &$.resultType|raw${} err = c.GetClient().Patch($.ApplyPatchType|raw$). + $if .prefersProtobuf$UseProtobufAsDefault().$end$ $if .namespaced$Namespace(c.GetNamespace()).$end$ Resource("$.type|resource$"). Name($.type|private$Name). diff --git a/staging/src/k8s.io/code-generator/examples/HyphenGroup/clientset/versioned/typed/example/v1/clustertesttype.go b/staging/src/k8s.io/code-generator/examples/HyphenGroup/clientset/versioned/typed/example/v1/clustertesttype.go index fe88fd87434..9824e061c6b 100644 --- a/staging/src/k8s.io/code-generator/examples/HyphenGroup/clientset/versioned/typed/example/v1/clustertesttype.go +++ b/staging/src/k8s.io/code-generator/examples/HyphenGroup/clientset/versioned/typed/example/v1/clustertesttype.go @@ -72,7 +72,8 @@ func newClusterTestTypes(c *ExampleGroupV1Client) *clusterTestTypes { scheme.ParameterCodec, "", func() *examplev1.ClusterTestType { return &examplev1.ClusterTestType{} }, - func() *examplev1.ClusterTestTypeList { return &examplev1.ClusterTestTypeList{} }), + func() *examplev1.ClusterTestTypeList { return &examplev1.ClusterTestTypeList{} }, + ), } } diff --git a/staging/src/k8s.io/code-generator/examples/HyphenGroup/clientset/versioned/typed/example/v1/testtype.go b/staging/src/k8s.io/code-generator/examples/HyphenGroup/clientset/versioned/typed/example/v1/testtype.go index ae38728a7c7..8fcecd1409f 100644 --- a/staging/src/k8s.io/code-generator/examples/HyphenGroup/clientset/versioned/typed/example/v1/testtype.go +++ b/staging/src/k8s.io/code-generator/examples/HyphenGroup/clientset/versioned/typed/example/v1/testtype.go @@ -68,6 +68,7 @@ func newTestTypes(c *ExampleGroupV1Client, namespace string) *testTypes { scheme.ParameterCodec, namespace, func() *examplev1.TestType { return &examplev1.TestType{} }, - func() *examplev1.TestTypeList { return &examplev1.TestTypeList{} }), + func() *examplev1.TestTypeList { return &examplev1.TestTypeList{} }, + ), } } diff --git a/staging/src/k8s.io/code-generator/examples/MixedCase/clientset/versioned/typed/example/v1/clustertesttype.go b/staging/src/k8s.io/code-generator/examples/MixedCase/clientset/versioned/typed/example/v1/clustertesttype.go index 81367683ed0..b9a4fc8e201 100644 --- a/staging/src/k8s.io/code-generator/examples/MixedCase/clientset/versioned/typed/example/v1/clustertesttype.go +++ b/staging/src/k8s.io/code-generator/examples/MixedCase/clientset/versioned/typed/example/v1/clustertesttype.go @@ -73,7 +73,8 @@ func newClusterTestTypes(c *ExampleV1Client) *clusterTestTypes { scheme.ParameterCodec, "", func() *examplev1.ClusterTestType { return &examplev1.ClusterTestType{} }, - func() *examplev1.ClusterTestTypeList { return &examplev1.ClusterTestTypeList{} }), + func() *examplev1.ClusterTestTypeList { return &examplev1.ClusterTestTypeList{} }, + ), } } diff --git a/staging/src/k8s.io/code-generator/examples/MixedCase/clientset/versioned/typed/example/v1/testtype.go b/staging/src/k8s.io/code-generator/examples/MixedCase/clientset/versioned/typed/example/v1/testtype.go index 7962b507ea6..78336bfda54 100644 --- a/staging/src/k8s.io/code-generator/examples/MixedCase/clientset/versioned/typed/example/v1/testtype.go +++ b/staging/src/k8s.io/code-generator/examples/MixedCase/clientset/versioned/typed/example/v1/testtype.go @@ -68,6 +68,7 @@ func newTestTypes(c *ExampleV1Client, namespace string) *testTypes { scheme.ParameterCodec, namespace, func() *examplev1.TestType { return &examplev1.TestType{} }, - func() *examplev1.TestTypeList { return &examplev1.TestTypeList{} }), + func() *examplev1.TestTypeList { return &examplev1.TestTypeList{} }, + ), } } diff --git a/staging/src/k8s.io/code-generator/examples/apiserver/clientset/versioned/typed/core/v1/testtype.go b/staging/src/k8s.io/code-generator/examples/apiserver/clientset/versioned/typed/core/v1/testtype.go index 69c862041ad..85a6d1e54a7 100644 --- a/staging/src/k8s.io/code-generator/examples/apiserver/clientset/versioned/typed/core/v1/testtype.go +++ b/staging/src/k8s.io/code-generator/examples/apiserver/clientset/versioned/typed/core/v1/testtype.go @@ -64,6 +64,7 @@ func newTestTypes(c *CoreV1Client, namespace string) *testTypes { scheme.ParameterCodec, namespace, func() *corev1.TestType { return &corev1.TestType{} }, - func() *corev1.TestTypeList { return &corev1.TestTypeList{} }), + func() *corev1.TestTypeList { return &corev1.TestTypeList{} }, + ), } } diff --git a/staging/src/k8s.io/code-generator/examples/apiserver/clientset/versioned/typed/example/v1/testtype.go b/staging/src/k8s.io/code-generator/examples/apiserver/clientset/versioned/typed/example/v1/testtype.go index 4d7a5a00124..2aa8d3bb2b2 100644 --- a/staging/src/k8s.io/code-generator/examples/apiserver/clientset/versioned/typed/example/v1/testtype.go +++ b/staging/src/k8s.io/code-generator/examples/apiserver/clientset/versioned/typed/example/v1/testtype.go @@ -64,6 +64,7 @@ func newTestTypes(c *ExampleV1Client, namespace string) *testTypes { scheme.ParameterCodec, namespace, func() *examplev1.TestType { return &examplev1.TestType{} }, - func() *examplev1.TestTypeList { return &examplev1.TestTypeList{} }), + func() *examplev1.TestTypeList { return &examplev1.TestTypeList{} }, + ), } } diff --git a/staging/src/k8s.io/code-generator/examples/apiserver/clientset/versioned/typed/example2/v1/testtype.go b/staging/src/k8s.io/code-generator/examples/apiserver/clientset/versioned/typed/example2/v1/testtype.go index 06dcab4de9c..ce7a9bd13c2 100644 --- a/staging/src/k8s.io/code-generator/examples/apiserver/clientset/versioned/typed/example2/v1/testtype.go +++ b/staging/src/k8s.io/code-generator/examples/apiserver/clientset/versioned/typed/example2/v1/testtype.go @@ -64,6 +64,7 @@ func newTestTypes(c *SecondExampleV1Client, namespace string) *testTypes { scheme.ParameterCodec, namespace, func() *example2v1.TestType { return &example2v1.TestType{} }, - func() *example2v1.TestTypeList { return &example2v1.TestTypeList{} }), + func() *example2v1.TestTypeList { return &example2v1.TestTypeList{} }, + ), } } diff --git a/staging/src/k8s.io/code-generator/examples/apiserver/clientset/versioned/typed/example3.io/v1/testtype.go b/staging/src/k8s.io/code-generator/examples/apiserver/clientset/versioned/typed/example3.io/v1/testtype.go index 13e8a797541..408e9f1dba8 100644 --- a/staging/src/k8s.io/code-generator/examples/apiserver/clientset/versioned/typed/example3.io/v1/testtype.go +++ b/staging/src/k8s.io/code-generator/examples/apiserver/clientset/versioned/typed/example3.io/v1/testtype.go @@ -64,6 +64,7 @@ func newTestTypes(c *ThirdExampleV1Client, namespace string) *testTypes { scheme.ParameterCodec, namespace, func() *example3iov1.TestType { return &example3iov1.TestType{} }, - func() *example3iov1.TestTypeList { return &example3iov1.TestTypeList{} }), + func() *example3iov1.TestTypeList { return &example3iov1.TestTypeList{} }, + ), } } diff --git a/staging/src/k8s.io/code-generator/examples/crd/clientset/versioned/typed/conflicting/v1/testtype.go b/staging/src/k8s.io/code-generator/examples/crd/clientset/versioned/typed/conflicting/v1/testtype.go index 5d089755eaa..a685e01e41c 100644 --- a/staging/src/k8s.io/code-generator/examples/crd/clientset/versioned/typed/conflicting/v1/testtype.go +++ b/staging/src/k8s.io/code-generator/examples/crd/clientset/versioned/typed/conflicting/v1/testtype.go @@ -68,6 +68,7 @@ func newTestTypes(c *ConflictingExampleV1Client, namespace string) *testTypes { scheme.ParameterCodec, namespace, func() *conflictingv1.TestType { return &conflictingv1.TestType{} }, - func() *conflictingv1.TestTypeList { return &conflictingv1.TestTypeList{} }), + func() *conflictingv1.TestTypeList { return &conflictingv1.TestTypeList{} }, + ), } } diff --git a/staging/src/k8s.io/code-generator/examples/crd/clientset/versioned/typed/example/v1/clustertesttype.go b/staging/src/k8s.io/code-generator/examples/crd/clientset/versioned/typed/example/v1/clustertesttype.go index 6178e0a66ee..b577b840c45 100644 --- a/staging/src/k8s.io/code-generator/examples/crd/clientset/versioned/typed/example/v1/clustertesttype.go +++ b/staging/src/k8s.io/code-generator/examples/crd/clientset/versioned/typed/example/v1/clustertesttype.go @@ -72,7 +72,8 @@ func newClusterTestTypes(c *ExampleV1Client) *clusterTestTypes { scheme.ParameterCodec, "", func() *examplev1.ClusterTestType { return &examplev1.ClusterTestType{} }, - func() *examplev1.ClusterTestTypeList { return &examplev1.ClusterTestTypeList{} }), + func() *examplev1.ClusterTestTypeList { return &examplev1.ClusterTestTypeList{} }, + ), } } diff --git a/staging/src/k8s.io/code-generator/examples/crd/clientset/versioned/typed/example/v1/testtype.go b/staging/src/k8s.io/code-generator/examples/crd/clientset/versioned/typed/example/v1/testtype.go index 721b8cd9ea9..045dd4b9360 100644 --- a/staging/src/k8s.io/code-generator/examples/crd/clientset/versioned/typed/example/v1/testtype.go +++ b/staging/src/k8s.io/code-generator/examples/crd/clientset/versioned/typed/example/v1/testtype.go @@ -70,7 +70,8 @@ func newTestTypes(c *ExampleV1Client, namespace string) *testTypes { scheme.ParameterCodec, namespace, func() *examplev1.TestType { return &examplev1.TestType{} }, - func() *examplev1.TestTypeList { return &examplev1.TestTypeList{} }), + func() *examplev1.TestTypeList { return &examplev1.TestTypeList{} }, + ), } } diff --git a/staging/src/k8s.io/code-generator/examples/crd/clientset/versioned/typed/example2/v1/testtype.go b/staging/src/k8s.io/code-generator/examples/crd/clientset/versioned/typed/example2/v1/testtype.go index 224af4caa21..dddaac5eace 100644 --- a/staging/src/k8s.io/code-generator/examples/crd/clientset/versioned/typed/example2/v1/testtype.go +++ b/staging/src/k8s.io/code-generator/examples/crd/clientset/versioned/typed/example2/v1/testtype.go @@ -68,6 +68,7 @@ func newTestTypes(c *SecondExampleV1Client, namespace string) *testTypes { scheme.ParameterCodec, namespace, func() *example2v1.TestType { return &example2v1.TestType{} }, - func() *example2v1.TestTypeList { return &example2v1.TestTypeList{} }), + func() *example2v1.TestTypeList { return &example2v1.TestTypeList{} }, + ), } } diff --git a/staging/src/k8s.io/code-generator/examples/crd/clientset/versioned/typed/extensions/v1/testtype.go b/staging/src/k8s.io/code-generator/examples/crd/clientset/versioned/typed/extensions/v1/testtype.go index 8c51ce511cd..6a62aa00d73 100644 --- a/staging/src/k8s.io/code-generator/examples/crd/clientset/versioned/typed/extensions/v1/testtype.go +++ b/staging/src/k8s.io/code-generator/examples/crd/clientset/versioned/typed/extensions/v1/testtype.go @@ -85,7 +85,8 @@ func newTestTypes(c *ExtensionsExampleV1Client, namespace string) *testTypes { scheme.ParameterCodec, namespace, func() *extensionsv1.TestType { return &extensionsv1.TestType{} }, - func() *extensionsv1.TestTypeList { return &extensionsv1.TestTypeList{} }), + func() *extensionsv1.TestTypeList { return &extensionsv1.TestTypeList{} }, + ), } } diff --git a/staging/src/k8s.io/code-generator/examples/single/clientset/versioned/typed/api/v1/clustertesttype.go b/staging/src/k8s.io/code-generator/examples/single/clientset/versioned/typed/api/v1/clustertesttype.go index 5536ac2a038..993ee309424 100644 --- a/staging/src/k8s.io/code-generator/examples/single/clientset/versioned/typed/api/v1/clustertesttype.go +++ b/staging/src/k8s.io/code-generator/examples/single/clientset/versioned/typed/api/v1/clustertesttype.go @@ -72,7 +72,8 @@ func newClusterTestTypes(c *ExampleV1Client) *clusterTestTypes { scheme.ParameterCodec, "", func() *apiv1.ClusterTestType { return &apiv1.ClusterTestType{} }, - func() *apiv1.ClusterTestTypeList { return &apiv1.ClusterTestTypeList{} }), + func() *apiv1.ClusterTestTypeList { return &apiv1.ClusterTestTypeList{} }, + ), } } diff --git a/staging/src/k8s.io/code-generator/examples/single/clientset/versioned/typed/api/v1/testtype.go b/staging/src/k8s.io/code-generator/examples/single/clientset/versioned/typed/api/v1/testtype.go index a747554b8cc..9945284e475 100644 --- a/staging/src/k8s.io/code-generator/examples/single/clientset/versioned/typed/api/v1/testtype.go +++ b/staging/src/k8s.io/code-generator/examples/single/clientset/versioned/typed/api/v1/testtype.go @@ -68,6 +68,7 @@ func newTestTypes(c *ExampleV1Client, namespace string) *testTypes { scheme.ParameterCodec, namespace, func() *apiv1.TestType { return &apiv1.TestType{} }, - func() *apiv1.TestTypeList { return &apiv1.TestTypeList{} }), + func() *apiv1.TestTypeList { return &apiv1.TestTypeList{} }, + ), } } diff --git a/staging/src/k8s.io/code-generator/kube_codegen.sh b/staging/src/k8s.io/code-generator/kube_codegen.sh index f57c52caec8..8207da5eddd 100755 --- a/staging/src/k8s.io/code-generator/kube_codegen.sh +++ b/staging/src/k8s.io/code-generator/kube_codegen.sh @@ -433,6 +433,9 @@ function kube::codegen::gen_openapi() { # --plural-exceptions # An optional list of comma separated plural exception definitions in Type:PluralizedType form. # +# --prefers-protobuf +# Enables generation of clientsets that use protobuf for API requests. +# function kube::codegen::gen_client() { local in_dir="" local one_input_api="" @@ -450,6 +453,7 @@ function kube::codegen::gen_client() { local boilerplate="${KUBE_CODEGEN_ROOT}/hack/boilerplate.go.txt" local plural_exceptions="" local v="${KUBE_VERBOSE:-0}" + local prefers_protobuf="false" while [ "$#" -gt 0 ]; do case "$1" in @@ -509,6 +513,10 @@ function kube::codegen::gen_client() { plural_exceptions="$2" shift 2 ;; + "--prefers-protobuf") + prefers_protobuf="true" + shift + ;; *) if [[ "$1" =~ ^-- ]]; then echo "unknown argument: $1" >&2 @@ -625,6 +633,7 @@ function kube::codegen::gen_client() { --apply-configuration-package "${applyconfig_pkg}" \ --input-base "$(cd "${in_dir}" && pwd -P)" `# must be absolute path or Go import path"` \ --plural-exceptions "${plural_exceptions}" \ + --prefers-protobuf="${prefers_protobuf}" \ "${inputs[@]}" if [ "${watchable}" == "true" ]; then diff --git a/staging/src/k8s.io/kube-aggregator/hack/update-codegen.sh b/staging/src/k8s.io/kube-aggregator/hack/update-codegen.sh index fcb08291f5c..a58ff7ffad3 100755 --- a/staging/src/k8s.io/kube-aggregator/hack/update-codegen.sh +++ b/staging/src/k8s.io/kube-aggregator/hack/update-codegen.sh @@ -51,4 +51,5 @@ kube::codegen::gen_client \ --clientset-name "clientset_generated" \ --versioned-name "clientset" \ --boilerplate "${SCRIPT_ROOT}/hack/boilerplate.go.txt" \ + --prefers-protobuf \ "${SCRIPT_ROOT}/pkg/apis" diff --git a/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1/apiservice.go b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1/apiservice.go index e2ac1cd4a8a..a27b9848d8c 100644 --- a/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1/apiservice.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1/apiservice.go @@ -64,6 +64,8 @@ func newAPIServices(c *ApiregistrationV1Client) *aPIServices { scheme.ParameterCodec, "", func() *apiregistrationv1.APIService { return &apiregistrationv1.APIService{} }, - func() *apiregistrationv1.APIServiceList { return &apiregistrationv1.APIServiceList{} }), + func() *apiregistrationv1.APIServiceList { return &apiregistrationv1.APIServiceList{} }, + gentype.PrefersProtobuf[*apiregistrationv1.APIService](), + ), } } diff --git a/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1beta1/apiservice.go b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1beta1/apiservice.go index 04ef2930209..33321982e76 100644 --- a/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1beta1/apiservice.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1beta1/apiservice.go @@ -64,6 +64,8 @@ func newAPIServices(c *ApiregistrationV1beta1Client) *aPIServices { scheme.ParameterCodec, "", func() *apiregistrationv1beta1.APIService { return &apiregistrationv1beta1.APIService{} }, - func() *apiregistrationv1beta1.APIServiceList { return &apiregistrationv1beta1.APIServiceList{} }), + func() *apiregistrationv1beta1.APIServiceList { return &apiregistrationv1beta1.APIServiceList{} }, + gentype.PrefersProtobuf[*apiregistrationv1beta1.APIService](), + ), } } diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/auth/cani_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/auth/cani_test.go index c0ac3411eef..b49400f6360 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/auth/cani_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/auth/cani_test.go @@ -161,7 +161,7 @@ func TestRunAccessCheck(t *testing.T) { test.serverErr }), } - tf.ClientConfigVal = &restclient.Config{ContentConfig: restclient.ContentConfig{GroupVersion: &schema.GroupVersion{Group: "", Version: "v1"}}} + tf.ClientConfigVal = &restclient.Config{ContentConfig: restclient.ContentConfig{GroupVersion: &schema.GroupVersion{Group: "", Version: "v1"}, ContentType: runtime.ContentTypeJSON}} if err := test.o.Complete(tf, test.args); err != nil { t.Errorf("%s: %v", test.name, err) @@ -196,6 +196,7 @@ func TestRunAccessList(t *testing.T) { " [/version] [] [get]\n" tf := cmdtesting.NewTestFactory().WithNamespace("test") + tf.ClientConfigVal.ContentType = runtime.ContentTypeJSON defer tf.Cleanup() ns := scheme.Codecs.WithoutConversion() diff --git a/staging/src/k8s.io/metrics/hack/update-codegen.sh b/staging/src/k8s.io/metrics/hack/update-codegen.sh index 465169dc2bd..23e4e3ee241 100755 --- a/staging/src/k8s.io/metrics/hack/update-codegen.sh +++ b/staging/src/k8s.io/metrics/hack/update-codegen.sh @@ -36,4 +36,5 @@ kube::codegen::gen_client \ --output-dir "${SCRIPT_ROOT}/pkg/client" \ --output-pkg "${THIS_PKG}/pkg/client" \ --boilerplate "${SCRIPT_ROOT}/hack/boilerplate.go.txt" \ + --prefers-protobuf \ "${SCRIPT_ROOT}/pkg/apis" diff --git a/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1alpha1/nodemetrics.go b/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1alpha1/nodemetrics.go index 91fa208cc4b..751939778b8 100644 --- a/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1alpha1/nodemetrics.go +++ b/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1alpha1/nodemetrics.go @@ -56,6 +56,8 @@ func newNodeMetricses(c *MetricsV1alpha1Client) *nodeMetricses { scheme.ParameterCodec, "", func() *metricsv1alpha1.NodeMetrics { return &metricsv1alpha1.NodeMetrics{} }, - func() *metricsv1alpha1.NodeMetricsList { return &metricsv1alpha1.NodeMetricsList{} }), + func() *metricsv1alpha1.NodeMetricsList { return &metricsv1alpha1.NodeMetricsList{} }, + gentype.PrefersProtobuf[*metricsv1alpha1.NodeMetrics](), + ), } } diff --git a/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1alpha1/podmetrics.go b/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1alpha1/podmetrics.go index b2ff7f38efd..8f76c708408 100644 --- a/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1alpha1/podmetrics.go +++ b/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1alpha1/podmetrics.go @@ -56,6 +56,8 @@ func newPodMetricses(c *MetricsV1alpha1Client, namespace string) *podMetricses { scheme.ParameterCodec, namespace, func() *metricsv1alpha1.PodMetrics { return &metricsv1alpha1.PodMetrics{} }, - func() *metricsv1alpha1.PodMetricsList { return &metricsv1alpha1.PodMetricsList{} }), + func() *metricsv1alpha1.PodMetricsList { return &metricsv1alpha1.PodMetricsList{} }, + gentype.PrefersProtobuf[*metricsv1alpha1.PodMetrics](), + ), } } diff --git a/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1/nodemetrics.go b/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1/nodemetrics.go index 1e47d55320d..d21c0afb96e 100644 --- a/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1/nodemetrics.go +++ b/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1/nodemetrics.go @@ -56,6 +56,8 @@ func newNodeMetricses(c *MetricsV1beta1Client) *nodeMetricses { scheme.ParameterCodec, "", func() *metricsv1beta1.NodeMetrics { return &metricsv1beta1.NodeMetrics{} }, - func() *metricsv1beta1.NodeMetricsList { return &metricsv1beta1.NodeMetricsList{} }), + func() *metricsv1beta1.NodeMetricsList { return &metricsv1beta1.NodeMetricsList{} }, + gentype.PrefersProtobuf[*metricsv1beta1.NodeMetrics](), + ), } } diff --git a/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1/podmetrics.go b/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1/podmetrics.go index 01ded8f6453..aa117b6b8aa 100644 --- a/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1/podmetrics.go +++ b/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1/podmetrics.go @@ -56,6 +56,8 @@ func newPodMetricses(c *MetricsV1beta1Client, namespace string) *podMetricses { scheme.ParameterCodec, namespace, func() *metricsv1beta1.PodMetrics { return &metricsv1beta1.PodMetrics{} }, - func() *metricsv1beta1.PodMetricsList { return &metricsv1beta1.PodMetricsList{} }), + func() *metricsv1beta1.PodMetricsList { return &metricsv1beta1.PodMetricsList{} }, + gentype.PrefersProtobuf[*metricsv1beta1.PodMetrics](), + ), } } diff --git a/staging/src/k8s.io/sample-apiserver/pkg/generated/clientset/versioned/typed/wardle/v1alpha1/fischer.go b/staging/src/k8s.io/sample-apiserver/pkg/generated/clientset/versioned/typed/wardle/v1alpha1/fischer.go index 06e9a6e23a5..2797d160451 100644 --- a/staging/src/k8s.io/sample-apiserver/pkg/generated/clientset/versioned/typed/wardle/v1alpha1/fischer.go +++ b/staging/src/k8s.io/sample-apiserver/pkg/generated/clientset/versioned/typed/wardle/v1alpha1/fischer.go @@ -64,6 +64,7 @@ func newFischers(c *WardleV1alpha1Client) *fischers { scheme.ParameterCodec, "", func() *wardlev1alpha1.Fischer { return &wardlev1alpha1.Fischer{} }, - func() *wardlev1alpha1.FischerList { return &wardlev1alpha1.FischerList{} }), + func() *wardlev1alpha1.FischerList { return &wardlev1alpha1.FischerList{} }, + ), } } diff --git a/staging/src/k8s.io/sample-apiserver/pkg/generated/clientset/versioned/typed/wardle/v1alpha1/flunder.go b/staging/src/k8s.io/sample-apiserver/pkg/generated/clientset/versioned/typed/wardle/v1alpha1/flunder.go index 8ea3322a2d0..c089154f948 100644 --- a/staging/src/k8s.io/sample-apiserver/pkg/generated/clientset/versioned/typed/wardle/v1alpha1/flunder.go +++ b/staging/src/k8s.io/sample-apiserver/pkg/generated/clientset/versioned/typed/wardle/v1alpha1/flunder.go @@ -68,6 +68,7 @@ func newFlunders(c *WardleV1alpha1Client, namespace string) *flunders { scheme.ParameterCodec, namespace, func() *wardlev1alpha1.Flunder { return &wardlev1alpha1.Flunder{} }, - func() *wardlev1alpha1.FlunderList { return &wardlev1alpha1.FlunderList{} }), + func() *wardlev1alpha1.FlunderList { return &wardlev1alpha1.FlunderList{} }, + ), } } diff --git a/staging/src/k8s.io/sample-apiserver/pkg/generated/clientset/versioned/typed/wardle/v1beta1/flunder.go b/staging/src/k8s.io/sample-apiserver/pkg/generated/clientset/versioned/typed/wardle/v1beta1/flunder.go index 5b75b0dc8a2..85417a9b941 100644 --- a/staging/src/k8s.io/sample-apiserver/pkg/generated/clientset/versioned/typed/wardle/v1beta1/flunder.go +++ b/staging/src/k8s.io/sample-apiserver/pkg/generated/clientset/versioned/typed/wardle/v1beta1/flunder.go @@ -68,6 +68,7 @@ func newFlunders(c *WardleV1beta1Client, namespace string) *flunders { scheme.ParameterCodec, namespace, func() *wardlev1beta1.Flunder { return &wardlev1beta1.Flunder{} }, - func() *wardlev1beta1.FlunderList { return &wardlev1beta1.FlunderList{} }), + func() *wardlev1beta1.FlunderList { return &wardlev1beta1.FlunderList{} }, + ), } } diff --git a/staging/src/k8s.io/sample-controller/pkg/generated/clientset/versioned/typed/samplecontroller/v1alpha1/foo.go b/staging/src/k8s.io/sample-controller/pkg/generated/clientset/versioned/typed/samplecontroller/v1alpha1/foo.go index 47e32500b85..e44caa8dc60 100644 --- a/staging/src/k8s.io/sample-controller/pkg/generated/clientset/versioned/typed/samplecontroller/v1alpha1/foo.go +++ b/staging/src/k8s.io/sample-controller/pkg/generated/clientset/versioned/typed/samplecontroller/v1alpha1/foo.go @@ -64,6 +64,7 @@ func newFoos(c *SamplecontrollerV1alpha1Client, namespace string) *foos { scheme.ParameterCodec, namespace, func() *samplecontrollerv1alpha1.Foo { return &samplecontrollerv1alpha1.Foo{} }, - func() *samplecontrollerv1alpha1.FooList { return &samplecontrollerv1alpha1.FooList{} }), + func() *samplecontrollerv1alpha1.FooList { return &samplecontrollerv1alpha1.FooList{} }, + ), } }