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

Merge registered and latest and move to apimachinery

Browse Source
This commit is contained in:
nikhiljindal
2016-01-13 14:40:56 -08:00
parent a5dddfcb32
commit 2ad642d370
63 changed files with 378 additions and 387 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/master/master.go
View File

@@ -27,9 +27,9 @@ import (
"time"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/latest"
"k8s.io/kubernetes/pkg/api/rest"
"k8s.io/kubernetes/pkg/api/unversioned"
"k8s.io/kubernetes/pkg/apimachinery/registered"
"k8s.io/kubernetes/pkg/apis/extensions"
"k8s.io/kubernetes/pkg/apiserver"
"k8s.io/kubernetes/pkg/genericapiserver"
@@ -179,7 +179,7 @@ func (m *Master) InstallAPIs(c *Config) {
// Install v1 API.
m.initV1ResourcesStorage(c)
apiGroupInfo := genericapiserver.APIGroupInfo{
GroupMeta: *latest.GroupOrDie(api.GroupName),
GroupMeta: *registered.GroupOrDie(api.GroupName),
VersionedResourcesStorageMap: map[string]map[string]rest.Storage{
"v1": m.v1ResourcesStorage,
},
@@ -199,7 +199,7 @@ func (m *Master) InstallAPIs(c *Config) {
m.thirdPartyResources = map[string]thirdPartyEntry{}
extensionResources := m.getExtensionResources(c)
extensionsGroupMeta := latest.GroupOrDie(extensions.GroupName)
extensionsGroupMeta := registered.GroupOrDie(extensions.GroupName)
// Update the prefered version as per StorageVersions in the config.
storageVersion, found := c.StorageVersions[extensionsGroupMeta.GroupVersion.Group]
if !found {
@@ -216,7 +216,7 @@ func (m *Master) InstallAPIs(c *Config) {
VersionedResourcesStorageMap: map[string]map[string]rest.Storage{
"v1beta1": extensionResources,
},
OptionsExternalVersion: &latest.GroupOrDie(api.GroupName).GroupVersion,
OptionsExternalVersion: &registered.GroupOrDie(api.GroupName).GroupVersion,
}
apiGroupsInfo = append(apiGroupsInfo, apiGroupInfo)
@@ -532,7 +532,7 @@ func (m *Master) thirdpartyapi(group, kind, version string) *apiserver.APIGroupV
strings.ToLower(kind) + "s": resourceStorage,
}
optionsExternalVersion := latest.GroupOrDie(api.GroupName).GroupVersion
optionsExternalVersion := registered.GroupOrDie(api.GroupName).GroupVersion
return &apiserver.APIGroupVersion{
Root: apiRoot,
@@ -543,9 +543,9 @@ func (m *Master) thirdpartyapi(group, kind, version string) *apiserver.APIGroupV
Convertor: api.Scheme,
Typer: api.Scheme,
Mapper: thirdpartyresourcedata.NewMapper(latest.GroupOrDie(extensions.GroupName).RESTMapper, kind, version, group),
Codec: thirdpartyresourcedata.NewCodec(latest.GroupOrDie(extensions.GroupName).Codec, kind),
Linker: latest.GroupOrDie(extensions.GroupName).SelfLinker,
Mapper: thirdpartyresourcedata.NewMapper(registered.GroupOrDie(extensions.GroupName).RESTMapper, kind, version, group),
Codec: thirdpartyresourcedata.NewCodec(registered.GroupOrDie(extensions.GroupName).Codec, kind),
Linker: registered.GroupOrDie(extensions.GroupName).SelfLinker,
Storage: storage,
OptionsExternalVersion: &optionsExternalVersion,