Skip to content

K
k3s
Commit 9db45590 authored by k8s-merge-robot's avatar k8s-merge-robot
Browse files
Options

Merge pull request #24772 from nikhiljindal/newConfig

Automatic merge from submit-queue Using genericapiserver.NewConfig() instead of initialising Config in example apiserver
parents a5861773 e17da8b4
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 7 deletions
examples/apiserver/apiserver.go
View file @ 9db45590
...@@ -62,13 +62,8 @@ func Run(serverOptions *genericapiserver.ServerRunOptions) error { ...@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment