mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-25 04:33:26 +00:00
Merge pull request #24772 from nikhiljindal/newConfig
Automatic merge from submit-queue Using genericapiserver.NewConfig() instead of initialising Config in example apiserver
This commit is contained in:
commit
9db45590cf
@ -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)
|
||||||
|
Loading…
Reference in New Issue
Block a user