Merge pull request #26251 from caesarxuchao/add-serializer

Automatic merge from submit-queue

Add direct serializer

Fix #25589. Implemented a direct codec that doesn't do conversion, but sets the group, version and kind before serialization as Clayton suggested [here](https://github.com/kubernetes/kubernetes/issues/25589#issuecomment-219168009).

First commit is cherry-picked from #24826.

@kubernetes/sig-api-machinery

pkg/client/clientset_generated/release_1_3/typed/autoscaling/v1/autoscaling_client.go

@@ -20,6 +20,7 @@ import (
 	api "k8s.io/kubernetes/pkg/api"
 	registered "k8s.io/kubernetes/pkg/apimachinery/registered"
 	restclient "k8s.io/kubernetes/pkg/client/restclient"
+	serializer "k8s.io/kubernetes/pkg/runtime/serializer"
 )
 
 type AutoscalingInterface interface {
@@ -80,7 +81,7 @@ func setConfigDefaults(config *restclient.Config) error {
 	config.GroupVersion = &copyGroupVersion
 	//}
 
-	config.NegotiatedSerializer = api.Codecs
+	config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: api.Codecs}
 
 	if config.QPS == 0 {
 		config.QPS = 5

pkg/client/clientset_generated/release_1_3/typed/batch/v1/batch_client.go

@@ -20,6 +20,7 @@ import (
 	api "k8s.io/kubernetes/pkg/api"
 	registered "k8s.io/kubernetes/pkg/apimachinery/registered"
 	restclient "k8s.io/kubernetes/pkg/client/restclient"
+	serializer "k8s.io/kubernetes/pkg/runtime/serializer"
 )
 
 type BatchInterface interface {
@@ -80,7 +81,7 @@ func setConfigDefaults(config *restclient.Config) error {
 	config.GroupVersion = &copyGroupVersion
 	//}
 
-	config.NegotiatedSerializer = api.Codecs
+	config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: api.Codecs}
 
 	if config.QPS == 0 {
 		config.QPS = 5

pkg/client/clientset_generated/release_1_3/typed/core/v1/core_client.go

@@ -20,6 +20,7 @@ import (
 	api "k8s.io/kubernetes/pkg/api"
 	registered "k8s.io/kubernetes/pkg/apimachinery/registered"
 	restclient "k8s.io/kubernetes/pkg/client/restclient"
+	serializer "k8s.io/kubernetes/pkg/runtime/serializer"
 )
 
 type CoreInterface interface {
@@ -150,7 +151,7 @@ func setConfigDefaults(config *restclient.Config) error {
 	config.GroupVersion = &copyGroupVersion
 	//}
 
-	config.NegotiatedSerializer = api.Codecs
+	config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: api.Codecs}
 
 	if config.QPS == 0 {
 		config.QPS = 5

pkg/client/clientset_generated/release_1_3/typed/extensions/v1beta1/extensions_client.go

@@ -20,6 +20,7 @@ import (
 	api "k8s.io/kubernetes/pkg/api"
 	registered "k8s.io/kubernetes/pkg/apimachinery/registered"
 	restclient "k8s.io/kubernetes/pkg/client/restclient"
+	serializer "k8s.io/kubernetes/pkg/runtime/serializer"
 )
 
 type ExtensionsInterface interface {
@@ -120,7 +121,7 @@ func setConfigDefaults(config *restclient.Config) error {
 	config.GroupVersion = &copyGroupVersion
 	//}
 
-	config.NegotiatedSerializer = api.Codecs
+	config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: api.Codecs}
 
 	if config.QPS == 0 {
 		config.QPS = 5

pkg/client/unversioned/adapters/release_1_2/clientset_adaption.go

@@ -1,50 +0,0 @@
-/*
-Copyright 2016 The Kubernetes Authors All rights reserved.
-
-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 release_1_2
-
-import (
-	"k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2"
-	v1core "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2/typed/core/v1"
-	v1beta1extensions "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2/typed/extensions/v1beta1"
-	"k8s.io/kubernetes/pkg/client/typed/discovery"
-	"k8s.io/kubernetes/pkg/client/unversioned"
-)
-
-// FromUnversionedClient adapts a unversioned.Client to a release_1_2.Clientset.
-// This function is temporary. We will remove it when everyone has moved to using
-// Clientset. New code should NOT use this function.
-func FromUnversionedClient(c *unversioned.Client) *release_1_2.Clientset {
-	var clientset release_1_2.Clientset
-	if c != nil {
-		clientset.CoreClient = v1core.New(c.RESTClient)
-	} else {
-		clientset.CoreClient = v1core.New(nil)
-	}
-	if c != nil && c.ExtensionsClient != nil {
-		clientset.ExtensionsClient = v1beta1extensions.New(c.ExtensionsClient.RESTClient)
-	} else {
-		clientset.ExtensionsClient = v1beta1extensions.New(nil)
-	}
-
-	if c != nil && c.DiscoveryClient != nil {
-		clientset.DiscoveryClient = discovery.NewDiscoveryClient(c.DiscoveryClient.RESTClient)
-	} else {
-		clientset.DiscoveryClient = discovery.NewDiscoveryClient(nil)
-	}
-
-	return &clientset
-}

pkg/client/unversioned/adapters/release_1_3/clientset_adaption.go

@@ -1,50 +0,0 @@
-/*
-Copyright 2016 The Kubernetes Authors All rights reserved.
-
-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 release_1_3
-
-import (
-	"k8s.io/kubernetes/pkg/client/clientset_generated/release_1_3"
-	v1core "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_3/typed/core/v1"
-	v1beta1extensions "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_3/typed/extensions/v1beta1"
-	"k8s.io/kubernetes/pkg/client/typed/discovery"
-	"k8s.io/kubernetes/pkg/client/unversioned"
-)
-
-// FromUnversionedClient adapts a unversioned.Client to a release_1_3.Clientset.
-// This function is temporary. We will remove it when everyone has moved to using
-// Clientset. New code should NOT use this function.
-func FromUnversionedClient(c *unversioned.Client) *release_1_3.Clientset {
-	var clientset release_1_3.Clientset
-	if c != nil {
-		clientset.CoreClient = v1core.New(c.RESTClient)
-	} else {
-		clientset.CoreClient = v1core.New(nil)
-	}
-	if c != nil && c.ExtensionsClient != nil {
-		clientset.ExtensionsClient = v1beta1extensions.New(c.ExtensionsClient.RESTClient)
-	} else {
-		clientset.ExtensionsClient = v1beta1extensions.New(nil)
-	}
-
-	if c != nil && c.DiscoveryClient != nil {
-		clientset.DiscoveryClient = discovery.NewDiscoveryClient(c.DiscoveryClient.RESTClient)
-	} else {
-		clientset.DiscoveryClient = discovery.NewDiscoveryClient(nil)
-	}
-
-	return &clientset
-}