Merge pull request #2478 from smarterclayton/refactor_minion_to_match_v1beta3

Move the internal minion representation to match v1beta3
2014-11-20 21:37:43 -05:00
parent 40b0b64f3f 156000ef6d
commit a4e7604266
16 changed files with 93 additions and 66 deletions
--- a/pkg/client/client_test.go
+++ b/pkg/client/client_test.go
@@ -592,8 +592,10 @@ func TestCreateMinion(t *testing.T) {
 		ObjectMeta: api.ObjectMeta{
 			Name: "minion-1",
 		},
-		HostIP: "123.321.456.654",
-		NodeResources: api.NodeResources{
+		Status: api.NodeStatus{
+			HostIP: "123.321.456.654",
+		},
+		Spec: api.NodeSpec{
 			Capacity: api.ResourceList{
 				resources.CPU:    util.NewIntOrStringFromInt(1000),
 				resources.Memory: util.NewIntOrStringFromInt(1024 * 1024),