From 8c644986dc6d03eb24892dc55d9e4e175676e3d1 Mon Sep 17 00:00:00 2001
From: deads2k <deads@redhat.com>
Date: Fri, 10 Mar 2017 12:38:40 -0500
Subject: [PATCH] require codecfactory

Kubernetes-commit: 087a03022106c02f82a497f65b945f3cbab3f643
---
 pkg/server/config.go                     | 8 ++------
 pkg/server/config_test.go                | 4 ++--
 pkg/server/genericapiserver_test.go      | 2 +-
 pkg/server/options/feature.go            | 3 ++-
 pkg/server/options/server_run_options.go | 3 ++-
 pkg/server/options/serving_test.go       | 2 +-
 6 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/pkg/server/config.go b/pkg/server/config.go
index 7f023cf65..e59876e03 100644
--- a/pkg/server/config.go
+++ b/pkg/server/config.go
@@ -196,8 +196,9 @@ type SecureServingInfo struct {
 }
 
 // NewConfig returns a Config struct with the default values
-func NewConfig() *Config {
+func NewConfig(codecs serializer.CodecFactory) *Config {
 	return &Config{
+		Serializer:                  codecs,
 		ReadWritePort:               443,
 		RequestContextMapper:        apirequest.NewRequestContextMapper(),
 		BuildHandlerChainsFunc:      DefaultBuildHandlerChain,
@@ -216,11 +217,6 @@ func NewConfig() *Config {
 	}
 }
 
-func (c *Config) WithSerializer(codecs serializer.CodecFactory) *Config {
-	c.Serializer = codecs
-	return c
-}
-
 func DefaultOpenAPIConfig(getDefinitions openapicommon.GetOpenAPIDefinitions, scheme *runtime.Scheme) *openapicommon.Config {
 	defNamer := apiopenapi.NewDefinitionNamer(scheme)
 	return &openapicommon.Config{
diff --git a/pkg/server/config_test.go b/pkg/server/config_test.go
index 2902f5279..04a824d4b 100644
--- a/pkg/server/config_test.go
+++ b/pkg/server/config_test.go
@@ -33,7 +33,7 @@ import (
 )
 
 func TestNewWithDelegate(t *testing.T) {
-	delegateConfig := NewConfig().WithSerializer(codecs)
+	delegateConfig := NewConfig(codecs)
 	delegateConfig.PublicAddress = net.ParseIP("192.168.10.4")
 	delegateConfig.RequestContextMapper = genericapirequest.NewRequestContextMapper()
 	delegateConfig.LegacyAPIGroupPrefixes = sets.NewString("/api")
@@ -63,7 +63,7 @@ func TestNewWithDelegate(t *testing.T) {
 	// this wires up swagger
 	delegateServer.PrepareRun()
 
-	wrappingConfig := NewConfig().WithSerializer(codecs)
+	wrappingConfig := NewConfig(codecs)
 	wrappingConfig.PublicAddress = net.ParseIP("192.168.10.4")
 	wrappingConfig.RequestContextMapper = genericapirequest.NewRequestContextMapper()
 	wrappingConfig.LegacyAPIGroupPrefixes = sets.NewString("/api")
diff --git a/pkg/server/genericapiserver_test.go b/pkg/server/genericapiserver_test.go
index f3170dcbe..58a094326 100644
--- a/pkg/server/genericapiserver_test.go
+++ b/pkg/server/genericapiserver_test.go
@@ -86,7 +86,7 @@ func testGetOpenAPIDefinitions(ref openapi.ReferenceCallback) map[string]openapi
 func setUp(t *testing.T) (*etcdtesting.EtcdTestServer, Config, *assert.Assertions) {
 	etcdServer, _ := etcdtesting.NewUnsecuredEtcd3TestClientServer(t, scheme)
 
-	config := NewConfig().WithSerializer(codecs)
+	config := NewConfig(codecs)
 	config.PublicAddress = net.ParseIP("192.168.10.4")
 	config.RequestContextMapper = genericapirequest.NewRequestContextMapper()
 	config.LegacyAPIGroupPrefixes = sets.NewString("/api")
diff --git a/pkg/server/options/feature.go b/pkg/server/options/feature.go
index 32922c12d..d99a73495 100644
--- a/pkg/server/options/feature.go
+++ b/pkg/server/options/feature.go
@@ -19,6 +19,7 @@ package options
 import (
 	"github.com/spf13/pflag"
 
+	"k8s.io/apimachinery/pkg/runtime/serializer"
 	"k8s.io/apiserver/pkg/server"
 )
 
@@ -29,7 +30,7 @@ type FeatureOptions struct {
 }
 
 func NewFeatureOptions() *FeatureOptions {
-	defaults := server.NewConfig()
+	defaults := server.NewConfig(serializer.CodecFactory{})
 
 	return &FeatureOptions{
 		EnableProfiling:           defaults.EnableProfiling,
diff --git a/pkg/server/options/server_run_options.go b/pkg/server/options/server_run_options.go
index a3733d49b..4d51ae072 100644
--- a/pkg/server/options/server_run_options.go
+++ b/pkg/server/options/server_run_options.go
@@ -22,6 +22,7 @@ import (
 	"strings"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime/serializer"
 	"k8s.io/apiserver/pkg/admission"
 	"k8s.io/apiserver/pkg/server"
 	utilfeature "k8s.io/apiserver/pkg/util/feature"
@@ -48,7 +49,7 @@ type ServerRunOptions struct {
 }
 
 func NewServerRunOptions() *ServerRunOptions {
-	defaults := server.NewConfig()
+	defaults := server.NewConfig(serializer.CodecFactory{})
 
 	return &ServerRunOptions{
 		AdmissionControl:            "AlwaysAdmit",
diff --git a/pkg/server/options/serving_test.go b/pkg/server/options/serving_test.go
index ea615b785..a13c618ed 100644
--- a/pkg/server/options/serving_test.go
+++ b/pkg/server/options/serving_test.go
@@ -46,7 +46,7 @@ func setUp(t *testing.T) Config {
 	scheme := runtime.NewScheme()
 	codecs := serializer.NewCodecFactory(scheme)
 
-	config := NewConfig().WithSerializer(codecs)
+	config := NewConfig(codecs)
 	config.RequestContextMapper = genericapirequest.NewRequestContextMapper()
 
 	return *config