Merge pull request #134 from CaoShuFeng/trival

Random-Liu · web-flow · commit c0bd1df74586 · 2017-08-23T11:01:25.000-07:00
return an error when error happens in SetConditions()
diff --git a/pkg/problemclient/problem_client.go b/pkg/problemclient/problem_client.go
@@ -93,7 +93,7 @@ func (c *nodeProblemClient) SetConditions(newConditions []api.NodeCondition) err
 	}
 	patch, err := generatePatch(newConditions)
 	if err != nil {
-		return nil
+		return err
 	}
 	return c.client.Patch(api.StrategicMergePatchType).Resource("nodes").Name(c.nodeName).SubResource("status").Body(patch).Do().Error()
 }

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ func (c *nodeProblemClient) SetConditions(newConditions []api.NodeCondition) err`
`93`	`93`	`}`
`94`	`94`	`patch, err := generatePatch(newConditions)`
`95`	`95`	`if err != nil {`
`96`		`- return nil`
	`96`	`+ return err`
`97`	`97`	`}`
`98`	`98`	`return c.client.Patch(api.StrategicMergePatchType).Resource("nodes").Name(c.nodeName).SubResource("status").Body(patch).Do().Error()`
`99`	`99`	`}`