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

api: rename conditionkind -> conditiontype

Browse Source
This commit is contained in:
Mike Danese
2015-02-23 21:21:14 -08:00
parent 754a2a8305
commit 5267127af1
17 changed files with 324 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/kubectl/resource_printer_test.go
View File

@@ -524,7 +524,7 @@ func TestPrintMinionStatus(t *testing.T) {
{
minion: api.Node{
ObjectMeta: api.ObjectMeta{Name: "foo1"},
Status: api.NodeStatus{Conditions: []api.NodeCondition{{Kind: api.NodeReady, Status: api.ConditionFull}}},
Status: api.NodeStatus{Conditions: []api.NodeCondition{{Type: api.NodeReady, Status: api.ConditionFull}}},
},
status: "Ready",
},
@@ -532,8 +532,8 @@ func TestPrintMinionStatus(t *testing.T) {
minion: api.Node{
ObjectMeta: api.ObjectMeta{Name: "foo2"},
Status: api.NodeStatus{Conditions: []api.NodeCondition{
{Kind: api.NodeReady, Status: api.ConditionFull},
{Kind: api.NodeReachable, Status: api.ConditionFull}}},
{Type: api.NodeReady, Status: api.ConditionFull},
{Type: api.NodeReachable, Status: api.ConditionFull}}},
},
status: "Ready,Reachable",
},
@@ -541,22 +541,22 @@ func TestPrintMinionStatus(t *testing.T) {
minion: api.Node{
ObjectMeta: api.ObjectMeta{Name: "foo3"},
Status: api.NodeStatus{Conditions: []api.NodeCondition{
{Kind: api.NodeReady, Status: api.ConditionFull},
{Kind: api.NodeReady, Status: api.ConditionFull}}},
{Type: api.NodeReady, Status: api.ConditionFull},
{Type: api.NodeReady, Status: api.ConditionFull}}},
},
status: "Ready",
},
{
minion: api.Node{
ObjectMeta: api.ObjectMeta{Name: "foo4"},
Status: api.NodeStatus{Conditions: []api.NodeCondition{{Kind: api.NodeReady, Status: api.ConditionNone}}},
Status: api.NodeStatus{Conditions: []api.NodeCondition{{Type: api.NodeReady, Status: api.ConditionNone}}},
},
status: "NotReady",
},
{
minion: api.Node{
ObjectMeta: api.ObjectMeta{Name: "foo5"},
Status: api.NodeStatus{Conditions: []api.NodeCondition{{Kind: "InvalidValue", Status: api.ConditionFull}}},
Status: api.NodeStatus{Conditions: []api.NodeCondition{{Type: "InvalidValue", Status: api.ConditionFull}}},
},
status: "Unknown",
},