Rename ConditionFull->ConditionTrue, ConditionNone->ConditionFalse

This commit is contained in:
Deyuan Deng
2015-03-23 14:33:55 -04:00
parent 064b7dec42
commit ca68f4a9d1
17 changed files with 152 additions and 98 deletions

View File

@@ -198,7 +198,7 @@ func (p *PodCache) computePodStatus(pod *api.Pod) (api.PodStatus, error) {
// Assigned to an unhealthy node.
for _, condition := range nodeStatus.Conditions {
if (condition.Type == api.NodeReady || condition.Type == api.NodeReachable) && condition.Status == api.ConditionNone {
if (condition.Type == api.NodeReady || condition.Type == api.NodeReachable) && condition.Status == api.ConditionFalse {
glog.V(5).Infof("node status: %v, setting pod %q status to unknown", condition, pod.Name)
newStatus.Phase = api.PodUnknown
newStatus.Conditions = append(newStatus.Conditions, pod.Status.Conditions...)

View File

@@ -228,7 +228,7 @@ func makeHealthyNode(name string, ip string) *api.Node {
{Type: api.NodeLegacyHostIP, Address: ip},
},
Conditions: []api.NodeCondition{
{Type: api.NodeReady, Status: api.ConditionFull},
{Type: api.NodeReady, Status: api.ConditionTrue},
},
},
}
@@ -238,7 +238,7 @@ func makeUnhealthyNode(name string) *api.Node {
return &api.Node{
ObjectMeta: api.ObjectMeta{Name: name},
Status: api.NodeStatus{Conditions: []api.NodeCondition{
{Type: api.NodeReady, Status: api.ConditionNone},
{Type: api.NodeReady, Status: api.ConditionFalse},
}},
}
}