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

Merge pull request #24474 from deads2k/fix-version-registration

Browse Source 
Automatic merge from submit-queue

stop changing the root path of the root webservice

We shouldn't mutate the root path of the root webservice (see usage).  Just write the path we want.
This commit is contained in:
k8s-merge-robot
2016-04-23 17:51:56 -07:00
parent ea15d792a1 a79cb3c44e
commit 0d4b039d87
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

@@ -229,7 +229,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)
@@ -237,8 +237,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{}