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

Merge pull request #13958 from feihujiang/removeUselessCodeAboutMinion

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-09-16 17:59:00 -07:00
parent 4c46bc3243 ba38a8764b
commit de233d35da
5 changed files with 1 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
pkg/api/v1/conversion_test.go
View File

@@ -23,29 +23,6 @@ import (
versioned "k8s.io/kubernetes/pkg/api/v1"
)
func TestNodeConversion(t *testing.T) {
obj, err := versioned.Codec.Decode([]byte(`{"kind":"Minion","apiVersion":"v1"}`))
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
if _, ok := obj.(*api.Node); !ok {
t.Errorf("unexpected type: %#v", obj)
}
obj, err = versioned.Codec.Decode([]byte(`{"kind":"MinionList","apiVersion":"v1"}`))
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
if _, ok := obj.(*api.NodeList); !ok {
t.Errorf("unexpected type: %#v", obj)
}
obj = &api.Node{}
if err := versioned.Codec.DecodeInto([]byte(`{"kind":"Minion","apiVersion":"v1"}`), obj); err != nil {
t.Fatalf("unexpected error: %v", err)
}
}
// TestPodSpecConversion tests that ServiceAccount is an alias for
// ServiceAccountName.
func TestPodSpecConversion(t *testing.T) {

3
pkg/api/v1/register.go
View File

@@ -86,9 +86,6 @@ func addKnownTypes() {
&ThirdPartyResourceList{},
&ThirdPartyResourceData{},
)
// Legacy names are supported
api.Scheme.AddKnownTypeWithName("v1", "Minion", &Node{})
api.Scheme.AddKnownTypeWithName("v1", "MinionList", &NodeList{})
}
func (*Pod) IsAnAPIObject() {}