fix: reset ovn0 addr

Users may clean up kube-ovn but without cleanup the node annotations and reinstall kube-ovn. As node number is unlikely to a great amount, so we reset the ovn0 port every time the controller restart to prevent some weird incident

(cherry picked from commit c755ef2)

pkg/controller/node.go

@@ -201,8 +201,9 @@ func (c *Controller) handleAddNode(key string) error {
 
 	var v4IP, v6IP, mac string
 	portName := fmt.Sprintf("node-%s", key)
-	if node.Annotations[util.AllocatedAnnotation] == "true" {
-		return nil
+	if node.Annotations[util.IpAddressAnnotation] != "" && node.Annotations[util.MacAddressAnnotation] != "" {
+		v4IP, v6IP = util.SplitStringIP(node.Annotations[util.IpAddressAnnotation])
+		mac = node.Annotations[util.MacAddressAnnotation]
 	} else {
 		v4IP, v6IP, mac, err = c.ipam.GetRandomAddress(portName, c.config.NodeSwitch)
 		if err != nil {

test/e2e/ip/static_ip.go

@@ -16,6 +16,10 @@ import (
 	"k8s.io/apimachinery/pkg/labels"
 )
 
+const (
+	TestImage = "kubeovn/pause:3.2"
+)
+
 var _ = Describe("[IP Allocation]", func() {
 	namespace := "static-ip"
 	f := framework.NewFramework("ip allocation", fmt.Sprintf("%s/.kube/config", os.Getenv("HOME")))
@@ -37,7 +41,7 @@ var _ = Describe("[IP Allocation]", func() {
 					Containers: []corev1.Container{
 						{
 							Name:            name,
-							Image:           "nginx:alpine",
+							Image:           TestImage,
 							ImagePullPolicy: corev1.PullIfNotPresent,
 						},
 					},
@@ -87,7 +91,7 @@ var _ = Describe("[IP Allocation]", func() {
 							Containers: []corev1.Container{
 								{
 									Name:            name,
-									Image:           "nginx:alpine",
+									Image:           TestImage,
 									ImagePullPolicy: corev1.PullIfNotPresent,
 								},
 							},
@@ -159,7 +163,7 @@ var _ = Describe("[IP Allocation]", func() {
 							Containers: []corev1.Container{
 								{
 									Name:            name,
-									Image:           "nginx:alpine",
+									Image:           TestImage,
 									ImagePullPolicy: corev1.PullIfNotPresent,
 								},
 							},
@@ -203,7 +207,7 @@ var _ = Describe("[IP Allocation]", func() {
 							Containers: []corev1.Container{
 								{
 									Name:            name,
-									Image:           "nginx:alpine",
+									Image:           TestImage,
 									ImagePullPolicy: corev1.PullIfNotPresent,
 								},
 							},