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

refactoring latest.go GroupVersion;

Browse Source 
clean up latest.go GroupVersions;
remove latest.GroupMeta.Group;
remove latest.GroupMeta.Version.
This commit is contained in:
Chao Xu
2015-11-16 10:34:28 -08:00
parent 851ed7a9f2
commit 6e192760e3
32 changed files with 82 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/master/master.go
View File

@@ -673,16 +673,16 @@ func (m *Master) init(c *Config) {
Version: expVersion.GroupVersion.Version,
},
}
storageVersion, found := c.StorageVersions[g.Group]
storageVersion, found := c.StorageVersions[g.GroupVersion.Group]
if !found {
glog.Fatalf("Couldn't find storage version of group %v", g.Group)
glog.Fatalf("Couldn't find storage version of group %v", g.GroupVersion.Group)
}
group := unversioned.APIGroup{
Name: g.Group,
Name: g.GroupVersion.Group,
Versions: expAPIVersions,
PreferredVersion: unversioned.GroupVersionForDiscovery{GroupVersion: storageVersion, Version: apiutil.GetVersion(storageVersion)},
}
apiserver.AddGroupWebService(m.handlerContainer, c.APIGroupPrefix+"/"+latest.GroupOrDie("extensions").Group, group)
apiserver.AddGroupWebService(m.handlerContainer, c.APIGroupPrefix+"/"+latest.GroupOrDie("extensions").GroupVersion.Group, group)
allGroups = append(allGroups, group)
apiserver.InstallServiceErrorHandler(m.handlerContainer, m.newRequestInfoResolver(), []string{expVersion.GroupVersion.String()})
}
@@ -1021,7 +1021,7 @@ func (m *Master) thirdpartyapi(group, kind, version string) *apiserver.APIGroupV
strings.ToLower(kind) + "s": resourceStorage,
}
serverGroupVersion := unversioned.ParseGroupVersionOrDie(latest.GroupOrDie("").GroupVersion)
serverGroupVersion := latest.GroupOrDie("").GroupVersion
return &apiserver.APIGroupVersion{
Root: apiRoot,
@@ -1111,7 +1111,7 @@ func (m *Master) experimental(c *Config) *apiserver.APIGroupVersion {
}
extensionsGroup := latest.GroupOrDie("extensions")
serverGroupVersion := unversioned.ParseGroupVersionOrDie(latest.GroupOrDie("").GroupVersion)
serverGroupVersion := latest.GroupOrDie("").GroupVersion
return &apiserver.APIGroupVersion{
Root: m.apiGroupPrefix,
@@ -1125,7 +1125,7 @@ func (m *Master) experimental(c *Config) *apiserver.APIGroupVersion {
Codec: extensionsGroup.Codec,
Linker: extensionsGroup.SelfLinker,
Storage: storage,
GroupVersion: unversioned.ParseGroupVersionOrDie(extensionsGroup.GroupVersion),
GroupVersion: extensionsGroup.GroupVersion,
ServerGroupVersion: &serverGroupVersion,
Admit: m.admissionControl,