Merge pull request #24772 from nikhiljindal/newConfig

Automatic merge from submit-queue

Using genericapiserver.NewConfig() instead of initialising Config in example apiserver
pull/6/head
k8s-merge-robot 2016-04-25 23:33:44 -07:00
commit 9db45590cf
1 changed files with 2 additions and 7 deletions

View File

@ -62,13 +62,8 @@ func Run(serverOptions *genericapiserver.ServerRunOptions) error {
_, serviceClusterIPRange, _ := net.ParseCIDR("10.0.0.0/24")
serverOptions.ServiceClusterIPRange = *serviceClusterIPRange
genericapiserver.ValidateRunOptions(serverOptions)
config := &genericapiserver.Config{
EnableIndex: true,
EnableSwaggerSupport: true,
APIPrefix: "/api",
APIGroupPrefix: "/apis",
Serializer: api.Codecs,
}
config := genericapiserver.NewConfig(serverOptions)
config.Serializer = api.Codecs
s, err := genericapiserver.New(config)
if err != nil {
return fmt.Errorf("Error in bringing up the server: %v", err)