github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 04:33:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #24772 from nikhiljindal/newConfig

Browse Source 
Automatic merge from submit-queue

Using genericapiserver.NewConfig() instead of initialising Config in example apiserver
This commit is contained in:
k8s-merge-robot 2016-04-25 23:33:44 -07:00
commit 9db45590cf
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
examples/apiserver/apiserver.go
View File

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