github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 17:30:00 +00:00
Code Issues Projects Releases Wiki Activity

optimise the New function

Browse Source 
Signed-off-by: PingWang <wang.ping5@zte.com.cn>
This commit is contained in:
PingWang 2016-07-14 11:43:53 +08:00
parent 8f08cb3391
commit 97b4a6fa42
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/genericapiserver/genericapiserver.go
View File

@ -372,16 +372,14 @@ func New(c *Config) (*GenericAPIServer, error) {
apiGroupsForDiscovery: map[string]unversioned.APIGroup{}, apiGroupsForDiscovery: map[string]unversioned.APIGroup{},
} }
var handlerContainer *restful.Container
if c.RestfulContainer != nil { if c.RestfulContainer != nil {
s.mux = c.RestfulContainer.ServeMux s.mux = c.RestfulContainer.ServeMux
handlerContainer = c.RestfulContainer s.HandlerContainer = c.RestfulContainer
} else { } else {
mux := http.NewServeMux() mux := http.NewServeMux()
s.mux = mux s.mux = mux
handlerContainer = NewHandlerContainer(mux, c.Serializer) s.HandlerContainer = NewHandlerContainer(mux, c.Serializer)
} }
s.HandlerContainer = handlerContainer
// Use CurlyRouter to be able to use regular expressions in paths. Regular expressions are required in paths for example for proxy (where the path is proxy/{kind}/{name}/{*}) // Use CurlyRouter to be able to use regular expressions in paths. Regular expressions are required in paths for example for proxy (where the path is proxy/{kind}/{name}/{*})
s.HandlerContainer.Router(restful.CurlyRouter{}) s.HandlerContainer.Router(restful.CurlyRouter{})
s.MuxHelper = &apiserver.MuxHelper{Mux: s.mux, RegisteredPaths: []string{}} s.MuxHelper = &apiserver.MuxHelper{Mux: s.mux, RegisteredPaths: []string{}}