Merge pull request #16876 from hongchaodeng/fix-16721

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-11-07 07:31:15 -08:00
3 changed files with 4 additions and 6 deletions

View File

@@ -88,7 +88,7 @@ func testData() (*api.PodList, *api.ServiceList, *api.ReplicationControllerList)
func testComponentStatusData() *api.ComponentStatusList {
good := api.ComponentStatus{
Conditions: []api.ComponentCondition{
{Type: api.ComponentHealthy, Status: api.ConditionTrue, Message: "ok", Error: "nil"},
{Type: api.ComponentHealthy, Status: api.ConditionTrue, Message: "ok"},
},
ObjectMeta: api.ObjectMeta{Name: "servergood"},
}