fix: subnet CIDRConflict

kubeovn · Nov 4, 2020 · 67076d6 · 67076d6
1 parent d5b819b
commit 67076d6
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/pkg/controller/subnet.go b/pkg/controller/subnet.go
@@ -461,7 +461,7 @@ func (c *Controller) handleAddOrUpdateSubnet(key string) error {
 	}
 
 	for _, sub := range subnetList {
-		if sub.Name != subnet.Name && sub.Spec.Vpc == sub.Spec.Vpc && util.CIDRConflict(sub.Spec.CIDRBlock, subnet.Spec.CIDRBlock) {
+		if sub.Spec.Vpc == subnet.Spec.Vpc && sub.Name != subnet.Name && util.CIDRConflict(sub.Spec.CIDRBlock, subnet.Spec.CIDRBlock) {
 			err = fmt.Errorf("subnet %s cidr %s conflict with subnet %s cidr %s", subnet.Name, subnet.Spec.CIDRBlock, sub.Name, sub.Spec.CIDRBlock)
 			klog.Error(err)
 			c.patchSubnetStatus(subnet, "ValidateLogicalSwitchFailed", err.Error())