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

Merge pull request #14926 from caesarxuchao/fix-discovery-1

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-10-02 06:39:44 -07:00
parent 2fa0971ee3 4927cec3be
commit f5adbb7e12
6 changed files with 169 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/master/master.go
View File

@@ -592,8 +592,8 @@ func (m *Master) init(c *Config) {
}
expAPIVersions := []api.GroupVersion{
{
GroupVersion: g.Group + "/" + expVersion.Version,
Version: expVersion.Version,
GroupVersion: expVersion.Version,
Version: apiutil.GetVersion(expVersion.Version),
},
}
storageVersion, found := c.StorageVersions[g.Group]
@@ -603,7 +603,7 @@ func (m *Master) init(c *Config) {
group := api.APIGroup{
Name: g.Group,
Versions: expAPIVersions,
PreferredVersion: api.GroupVersion{GroupVersion: g.Group + "/" + storageVersion, Version: storageVersion},
PreferredVersion: api.GroupVersion{GroupVersion: storageVersion, Version: apiutil.GetVersion(storageVersion)},
}
apiserver.AddGroupWebService(m.handlerContainer, c.APIGroupPrefix+"/"+latest.GroupOrDie("experimental").Group+"/", group)
allGroups = append(allGroups, group)