Merge pull request #7969 from smarterclayton/rest_fixes

Fixes to apiserver for subresources and naming
This commit is contained in:
Derek Carr
2015-05-12 10:57:34 -04:00
5 changed files with 186 additions and 9 deletions

View File

@@ -719,7 +719,7 @@ func (m *Master) api_v1beta2() *apiserver.APIGroupVersion {
func (m *Master) api_v1beta3() *apiserver.APIGroupVersion {
storage := make(map[string]rest.Storage)
for k, v := range m.storage {
if k == "minions" {
if k == "minions" || k == "minions/status" {
continue
}
storage[strings.ToLower(k)] = v
@@ -735,7 +735,7 @@ 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" {
if k == "minions" || k == "minions/status" {
continue
}
storage[strings.ToLower(k)] = v