fix node's annottaions overwrited incorrectly

fix #376
kubeovn · Jun 11, 2020 · 270c825 · 270c825
1 parent 92c1d91
commit 270c825
Showing 1 changed file with 8 additions and 10 deletions.
diff --git a/pkg/controller/node.go b/pkg/controller/node.go
@@ -233,20 +233,18 @@ func (c *Controller) handleAddNode(key string) error {
         "path": "/metadata/annotations",
         "value": %s
     }]`
-	payload := map[string]string{
-		util.IpAddressAnnotation:     ip,
-		util.MacAddressAnnotation:    mac,
-		util.CidrAnnotation:          subnet.Spec.CIDRBlock,
-		util.GatewayAnnotation:       subnet.Spec.Gateway,
-		util.LogicalSwitchAnnotation: c.config.NodeSwitch,
-		util.AllocatedAnnotation:     "true",
-		util.PortNameAnnotation:      fmt.Sprintf("node-%s", key),
-	}
-	raw, _ := json.Marshal(payload)
 	op := "replace"
 	if len(node.Annotations) == 0 {
 		op = "add"
 	}
+	node.Annotations[util.IpAddressAnnotation] = ip
+	node.Annotations[util.MacAddressAnnotation] = mac
+	node.Annotations[util.CidrAnnotation] = subnet.Spec.CIDRBlock
+	node.Annotations[util.GatewayAnnotation] = subnet.Spec.Gateway
+	node.Annotations[util.LogicalSwitchAnnotation] = c.config.NodeSwitch
+	node.Annotations[util.AllocatedAnnotation] = "true"
+	node.Annotations[util.PortNameAnnotation] = fmt.Sprintf("node-%s", key)
+	raw, _ := json.Marshal(node.Annotations)
 	patchPayload := fmt.Sprintf(patchPayloadTemplate, op, raw)
 	_, err = c.config.KubeClient.CoreV1().Nodes().Patch(key, types.JSONPatchType, []byte(patchPayload))
 	if err != nil {