Merge pull request #555 from l1b0k/main

fix: node condition will be overridden
AliyunContainerService · Jan 22, 2024 · 3a329ef · 3a329ef
2 parents f10a2a8 + 409ecec
commit 3a329ef
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/pkg/k8s/k8s.go b/pkg/k8s/k8s.go
@@ -243,7 +243,7 @@ func (k *k8s) PatchNodeIPResCondition(status corev1.ConditionStatus, reason, mes
 	}
 
 	patch := []byte(fmt.Sprintf(`{"status":{"conditions":%s}}`, raw))
-	return k.client.Status().Patch(context.Background(), node, client.RawPatch(k8stypes.MergePatchType, patch))
+	return k.client.Status().Patch(context.Background(), node, client.RawPatch(k8stypes.StrategicMergePatchType, patch))
 }
 
 func (k *k8s) PatchNodeAnnotations(anno map[string]string) error {