Merge pull request #30234 from intelsdi-x/create_annotation_map_if_doesnt_exist

Automatic merge from submit-queue In AddOrUpdateTaintOnNode create annotation map if its nil If node didn't have annotations both SchedulerPredicates taints-toleration tests were failing. @gmarek PTAL  --- This change is [<img src="https://reviewable.kubernetes.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.kubernetes.io/reviews/kubernetes/kubernetes/30234)

Merge pull request #30234 from intelsdi-x/create_annotation_map_if_doesnt_exist
be6a9fbb · Kubernetes Submit Queue · GitHub · b0ea89c2 · 292cea1a · be6a9fbb
Commit be6a9fbb authored Aug 08, 2016 by Kubernetes Submit Queue Committed by GitHub Aug 08, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

util.go test/e2e/framework/util.go +4 -0

No files found.
--- a/test/e2e/framework/util.go
+++ b/test/e2e/framework/util.go
@@ -2914,6 +2914,10 @@ func AddOrUpdateTaintOnNode(c *client.Client, nodeName string, taint api.Taint) 

 	taintsData, err := json.Marshal(newTaints)
 	ExpectNoError(err)
+
+	if node.Annotations == nil {
+		node.Annotations = make(map[string]string)
+	}
 	node.Annotations[api.TaintsAnnotationKey] = string(taintsData)
 	_, err = c.Nodes().Update(node)
 	ExpectNoError(err)