kubernetes
/
examples
mirror of https://github.com/kubernetes/examples.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Moving more logic to genericapiserver

This commit is contained in:
nikhiljindal 2016-04-14 18:01:31 -07:00
parent cb3a53c090
commit 3a6ba8a6c2
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apiserver/apiserver.go
View File

@ -18,6 +18,7 @@ package apiserver
import ( import (
"fmt" "fmt"
"net"
"k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testdata/apis/testgroup.k8s.io/v1" "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testdata/apis/testgroup.k8s.io/v1"
testgroupetcd "k8s.io/kubernetes/examples/apiserver/rest" testgroupetcd "k8s.io/kubernetes/examples/apiserver/rest"
@ -63,14 +64,18 @@ func NewServerRunOptions() *genericapiserver.ServerRunOptions {
} }
func Run(serverOptions *genericapiserver.ServerRunOptions) error { func Run(serverOptions *genericapiserver.ServerRunOptions) error {
config := genericapiserver.Config{ // Set ServiceClusterIPRange
_, serviceClusterIPRange, _ := net.ParseCIDR("10.0.0.0/24")
serverOptions.ServiceClusterIPRange = *serviceClusterIPRange
genericapiserver.ValidateRunOptions(serverOptions)
config := &genericapiserver.Config{
EnableIndex: true, EnableIndex: true,
EnableSwaggerSupport: true, EnableSwaggerSupport: true,
APIPrefix: "/api", APIPrefix: "/api",
APIGroupPrefix: "/apis", APIGroupPrefix: "/apis",
Serializer: api.Codecs, 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)
} }