github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #10892 from nikhiljindal/beta1

Browse Source 
Removing references to pre v1beta3 apis in code
This commit is contained in:
Vish Kannan
2015-07-23 17:05:43 -07:00
parent 2a10eabfdf fc4da6844e
commit 136d53466a
20 changed files with 60 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/master/master.go
View File

@@ -488,8 +488,6 @@ func (m *Master) init(c *Config) {
"replicationControllers": controllerStorage,
"services": service.NewStorage(m.serviceRegistry, m.nodeRegistry, m.endpointRegistry, serviceClusterIPAllocator, serviceNodePortAllocator, c.ClusterName),
"endpoints": endpointsStorage,
"minions": nodeStorage,
"minions/status": nodeStatusStorage,
"nodes": nodeStorage,
"nodes/status": nodeStatusStorage,
"events": event.NewStorage(eventRegistry),
@@ -762,9 +760,6 @@ func (m *Master) defaultAPIGroupVersion() *apiserver.APIGroupVersion {
func (m *Master) api_v1beta3() *apiserver.APIGroupVersion {
storage := make(map[string]rest.Storage)
for k, v := range m.storage {
if k == "minions" || k == "minions/status" {
continue
}
storage[strings.ToLower(k)] = v
}
version := m.defaultAPIGroupVersion()
@@ -778,9 +773,6 @@ func (m *Master) api_v1beta3() *apiserver.APIGroupVersion {
func (m *Master) api_v1() *apiserver.APIGroupVersion {
storage := make(map[string]rest.Storage)
for k, v := range m.storage {
if k == "minions" || k == "minions/status" {
continue
}
storage[strings.ToLower(k)] = v
}
version := m.defaultAPIGroupVersion()