Merge pull request #28587 from wojtek-t/remove_codec_from_content_config

Automatic merge from submit-queue

Remove Codec from ContentConfig.

This is the remaining cleanup after adding NegotiatedSerializer to ContentConfig.

pkg/client/unversioned/apps.go

@@ -71,7 +71,6 @@ func setAppsDefaults(config *restclient.Config) error {
 	config.GroupVersion = &copyGroupVersion
 	//}
 
-	config.Codec = api.Codecs.LegacyCodec(*config.GroupVersion)
 	config.NegotiatedSerializer = api.Codecs
 	return nil
 }

pkg/client/unversioned/autoscaling.go

@@ -72,7 +72,6 @@ func setAutoscalingDefaults(config *restclient.Config) error {
 	config.GroupVersion = &copyGroupVersion
 	//}
 
-	config.Codec = api.Codecs.LegacyCodec(*config.GroupVersion)
 	config.NegotiatedSerializer = api.Codecs
 	return nil
 }

pkg/client/unversioned/batch.go

@@ -102,7 +102,6 @@ func setBatchDefaults(config *restclient.Config, gv *unversioned.GroupVersion) e
 	config.GroupVersion = &copyGroupVersion
 	//}
 
-	config.Codec = api.Codecs.LegacyCodec(*config.GroupVersion)
 	config.NegotiatedSerializer = api.Codecs
 	return nil
 }

pkg/client/unversioned/certificates.go

@@ -75,7 +75,6 @@ func setCertificatesDefaults(config *restclient.Config) error {
 	config.GroupVersion = &copyGroupVersion
 	//}
 
-	config.Codec = api.Codecs.LegacyCodec(*config.GroupVersion)
 	config.NegotiatedSerializer = api.Codecs
 	if config.QPS == 0 {
 		config.QPS = 5

pkg/client/unversioned/extensions.go

@@ -126,7 +126,6 @@ func setExtensionsDefaults(config *restclient.Config) error {
 	config.GroupVersion = &copyGroupVersion
 	//}
 
-	config.Codec = api.Codecs.LegacyCodec(*config.GroupVersion)
 	config.NegotiatedSerializer = api.Codecs
 	return nil
 }

pkg/client/unversioned/fake/fake.go

@@ -24,6 +24,7 @@ import (
 
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/testapi"
+	"k8s.io/kubernetes/pkg/api/unversioned"
 	"k8s.io/kubernetes/pkg/client/restclient"
 	"k8s.io/kubernetes/pkg/runtime"
 )
@@ -42,11 +43,12 @@ func (f roundTripperFunc) RoundTrip(req *http.Request) (*http.Response, error) {
 
 // RESTClient provides a fake RESTClient interface.
 type RESTClient struct {
-	Client *http.Client
-	Codec  runtime.Codec
-	Req    *http.Request
-	Resp   *http.Response
-	Err    error
+	Client               *http.Client
+	NegotiatedSerializer runtime.NegotiatedSerializer
+
+	Req  *http.Request
+	Resp *http.Response
+	Err  error
 }
 
 func (c *RESTClient) Get() *restclient.Request {
@@ -71,15 +73,23 @@ func (c *RESTClient) Delete() *restclient.Request {
 
 func (c *RESTClient) request(verb string) *restclient.Request {
 	config := restclient.ContentConfig{
-		ContentType:  runtime.ContentTypeJSON,
-		GroupVersion: testapi.Default.GroupVersion(),
-		Codec:        c.Codec,
+		ContentType:          runtime.ContentTypeJSON,
+		GroupVersion:         testapi.Default.GroupVersion(),
+		NegotiatedSerializer: c.NegotiatedSerializer,
 	}
+	ns := c.NegotiatedSerializer
+	serializer, _ := ns.SerializerForMediaType(runtime.ContentTypeJSON, nil)
+	streamingSerializer, _ := ns.StreamingSerializerForMediaType(runtime.ContentTypeJSON, nil)
+	internalVersion := unversioned.GroupVersion{
+		Group:   testapi.Default.GroupVersion().Group,
+		Version: runtime.APIVersionInternal,
+	}
+	internalVersion.Version = runtime.APIVersionInternal
 	serializers := restclient.Serializers{
-		Encoder:             c.Codec,
-		Decoder:             c.Codec,
-		StreamingSerializer: c.Codec,
-		Framer:              runtime.DefaultFramer,
+		Encoder:             ns.EncoderForVersion(serializer, *testapi.Default.GroupVersion()),
+		Decoder:             ns.DecoderToVersion(serializer, internalVersion),
+		StreamingSerializer: streamingSerializer,
+		Framer:              streamingSerializer.Framer,
 	}
 	return restclient.NewRequest(c, verb, &url.URL{Host: "localhost"}, "", config, serializers, nil, nil)
 }

pkg/client/unversioned/helper.go

@@ -268,9 +268,6 @@ func SetKubernetesDefaults(config *restclient.Config) error {
 	if config.NegotiatedSerializer == nil {
 		config.NegotiatedSerializer = api.Codecs
 	}
-	if config.Codec == nil {
-		config.Codec = api.Codecs.LegacyCodec(*config.GroupVersion)
-	}
 
 	return restclient.SetKubernetesDefaults(config)
 }

pkg/client/unversioned/helper_blackbox_test.go

@@ -120,11 +120,10 @@ func TestNegotiateVersion(t *testing.T) {
 			statusCode:     http.StatusForbidden,
 		},
 	}
-	codec := testapi.Default.Codec()
 
 	for _, test := range tests {
 		fakeClient := &fake.RESTClient{
-			Codec: codec,
+			NegotiatedSerializer: testapi.Default.NegotiatedSerializer(),
 			Resp: &http.Response{
 				StatusCode: test.statusCode,
 				Body:       objBody(&uapi.APIVersions{Versions: test.serverVersions}),

pkg/client/unversioned/helper_test.go

@@ -41,7 +41,6 @@ func TestSetKubernetesDefaults(t *testing.T) {
 				APIPath: "/api",
 				ContentConfig: restclient.ContentConfig{
 					GroupVersion:         testapi.Default.GroupVersion(),
-					Codec:                testapi.Default.Codec(),
 					NegotiatedSerializer: testapi.Default.NegotiatedSerializer(),
 				},
 			},
@@ -135,11 +134,15 @@ func TestHelperGetServerAPIVersions(t *testing.T) {
 
 func TestSetsCodec(t *testing.T) {
 	testCases := map[string]struct {
-		Err    bool
-		Prefix string
-		Codec  runtime.Codec
+		Err                  bool
+		Prefix               string
+		NegotiatedSerializer runtime.NegotiatedSerializer
 	}{
-		testapi.Default.GroupVersion().Version: {false, "/api/" + testapi.Default.GroupVersion().Version, testapi.Default.Codec()},
+		testapi.Default.GroupVersion().Version: {
+			Err:                  false,
+			Prefix:               "/api/" + testapi.Default.GroupVersion().Version,
+			NegotiatedSerializer: testapi.Default.NegotiatedSerializer(),
+		},
 		// Add this test back when we fixed config and SetKubernetesDefaults
 		// "invalidVersion":                       {true, "", nil},
 	}
@@ -170,7 +173,7 @@ func TestSetsCodec(t *testing.T) {
 		if e, a := expected.Prefix, versionedPath; e != a {
 			t.Errorf("expected %#v, got %#v", e, a)
 		}
-		if e, a := expected.Codec, conf.Codec; !reflect.DeepEqual(e, a) {
+		if e, a := expected.NegotiatedSerializer, conf.NegotiatedSerializer; !reflect.DeepEqual(e, a) {
 			t.Errorf("expected %#v, got %#v", e, a)
 		}
 	}

pkg/client/unversioned/policy.go

@@ -71,7 +71,6 @@ func setPolicyDefaults(config *restclient.Config) error {
 	config.GroupVersion = &copyGroupVersion
 	//}
 
-	config.Codec = api.Codecs.LegacyCodec(*config.GroupVersion)
 	config.NegotiatedSerializer = api.Codecs
 	return nil
 }

pkg/client/unversioned/rbac.go

@@ -91,7 +91,6 @@ func setRbacDefaults(config *restclient.Config) error {
 	config.GroupVersion = &copyGroupVersion
 	//}
 
-	config.Codec = api.Codecs.LegacyCodec(*config.GroupVersion)
 	config.NegotiatedSerializer = api.Codecs
 	return nil
 }