when update subnet's execpt ip,we should filter repeat ip

kubeovn · Dec 16, 2021 · 51365b4 · 51365b4
1 parent 5aacec5
commit 51365b4
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/pkg/controller/subnet.go b/pkg/controller/subnet.go
@@ -358,7 +358,7 @@ func checkAndUpdateExcludeIps(subnet *kubeovnv1.Subnet) bool {
 		subnet.Spec.ExcludeIps = excludeIps
 		changed = true
 	} else {
-		checkAndFormatsExcludeIps(subnet)
+		changed = checkAndFormatsExcludeIps(subnet)
 		for _, gw := range excludeIps {
 			gwExists := false
 			for _, excludeIP := range subnet.Spec.ExcludeIps {
@@ -1196,7 +1196,7 @@ func isOvnSubnet(subnet *kubeovnv1.Subnet) bool {
 	return false
 }
 
-func checkAndFormatsExcludeIps(subnet *kubeovnv1.Subnet) {
+func checkAndFormatsExcludeIps(subnet *kubeovnv1.Subnet) bool {
 	var excludeIps []string
 	mapIps := make(map[string]ipam.IPRange, len(subnet.Spec.ExcludeIps))
 
@@ -1223,7 +1223,11 @@ func checkAndFormatsExcludeIps(subnet *kubeovnv1.Subnet) {
 		}
 	}
 	klog.V(3).Infof("excludeips before format is %v, after format is %v", subnet.Spec.ExcludeIps, excludeIps)
-	subnet.Spec.ExcludeIps = excludeIps
+	if !reflect.DeepEqual(subnet.Spec.ExcludeIps, excludeIps) {
+		subnet.Spec.ExcludeIps = excludeIps
+		return true
+	}
+	return false
 }
 
 func filterRepeatIPRange(mapIps map[string]ipam.IPRange) map[string]ipam.IPRange {