Merge pull request #149 from apelisse/fix-gvk-initialization

Fix kubernetes gvk initialization order
kubernetes-sigs · Sep 16, 2017 · 1f2cd2a · 1f2cd2a
2 parents b8da02a + 8557167
commit 1f2cd2a
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/pkg/cmd/server/start.go b/pkg/cmd/server/start.go
@@ -188,10 +188,6 @@ func (o *ServerOptions) RunServer(stopCh <-chan struct{}, title, version string)
 		return err
 	}
 
-	config.GenericConfig.OpenAPIConfig = genericapiserver.DefaultOpenAPIConfig(GetOpenApiDefinition, builders.Scheme)
-	config.GenericConfig.OpenAPIConfig.Info.Title = title
-	config.GenericConfig.OpenAPIConfig.Info.Version = version
-
 	if o.PrintBearerToken {
 		glog.Infof("Serving on loopback...")
 		glog.Infof("\n\n********************************\nTo test the server run:\n"+
@@ -205,7 +201,13 @@ func (o *ServerOptions) RunServer(stopCh <-chan struct{}, title, version string)
 		config.AddApi(provider)
 	}
 
-	server, err := config.Init().Complete().New()
+	config.Init()
+
+	config.GenericConfig.OpenAPIConfig = genericapiserver.DefaultOpenAPIConfig(GetOpenApiDefinition, builders.Scheme)
+	config.GenericConfig.OpenAPIConfig.Info.Title = title
+	config.GenericConfig.OpenAPIConfig.Info.Version = version
+
+	server, err := config.Complete().New()
 	if err != nil {
 		return err
 	}