github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-06 07:57:35 +00:00
Code Issues Projects Releases Wiki Activity

stop changing the root path of the root webservice

Browse Source
This commit is contained in:
deads2k
2016-04-19 11:28:13 -04:00
parent 7ab0a9f634
commit a79cb3c44e
3 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/master/master.go
View File

@@ -226,7 +226,7 @@ func (m *Master) InstallAPIs(c *Config) {
}
// TODO(nikhiljindal): Refactor generic parts of support services (like /versions) to genericapiserver.
apiserver.InstallSupport(m.MuxHelper, m.RootWebService, healthzChecks...)
webservices := apiserver.InstallSupport(m.MuxHelper, healthzChecks...)
if c.EnableProfiling {
m.MuxHelper.HandleFunc("/metrics", MetricsWithReset)
@@ -234,8 +234,9 @@ func (m *Master) InstallAPIs(c *Config) {
m.MuxHelper.HandleFunc("/metrics", defaultMetricsHandler)
}
// Install root web services
m.HandlerContainer.Add(m.RootWebService)
for i := range webservices {
m.HandlerContainer.Add(webservices[i])
}
// allGroups records all supported groups at /apis
allGroups := []unversioned.APIGroup{}