github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #34828 from deads2k/api-26-apiserver-annoyance

Browse Source 
Automatic merge from submit-queue

default serializer

Everyone uses the same serializer.  Set it as the default, but still allow someone to take control if they want.

Found while trying to use genericapiserver for composition.
This commit is contained in:
Kubernetes Submit Queue
2016-10-15 07:29:59 -07:00
committed by GitHub
parent 9174429776 7412be4465
commit 864a7bacaa
7 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
test/integration/framework/master_utils.go
View File

@@ -347,7 +347,6 @@ func NewMasterConfig() *master.Config {
genericConfig.APIResourceConfigSource = master.DefaultAPIResourceConfigSource()
genericConfig.Authorizer = authorizer.NewAlwaysAllowAuthorizer()
genericConfig.AdmissionControl = admit.NewAlwaysAdmit()
genericConfig.Serializer = api.Codecs
genericConfig.EnableOpenAPISupport = true
return &master.Config{