mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 04:06:03 +00:00
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 <!-- Reviewable:start --> --- 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) <!-- Reviewable:end -->
This commit is contained in:
commit
be6a9fbb4e
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user