fix invalid subnet not sync route (#4262)

Signed-off-by: clyi <[email protected]> Conflicts: pkg/daemon/controller_linux.go
kubeovn · Jul 8, 2024 · c12c572 · c12c572
1 parent 7743d66
commit c12c572
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/pkg/controller/subnet.go b/pkg/controller/subnet.go
@@ -514,7 +514,11 @@ func (c *Controller) handleSubnetFinalizer(subnet *kubeovnv1.Subnet) (bool, erro
 func (c Controller) patchSubnetStatus(subnet *kubeovnv1.Subnet, reason, errStr string) {
 	if errStr != "" {
 		subnet.Status.SetError(reason, errStr)
-		subnet.Status.NotValidated(reason, errStr)
+		if reason == "ValidateLogicalSwitchFailed" {
+			subnet.Status.NotValidated(reason, errStr)
+		} else {
+			subnet.Status.Validated(reason, "")
+		}
 		subnet.Status.NotReady(reason, errStr)
 		c.recorder.Eventf(subnet, v1.EventTypeWarning, reason, errStr)
 	} else {

diff --git a/pkg/daemon/controller_linux.go b/pkg/daemon/controller_linux.go
@@ -279,7 +279,7 @@ func (c *Controller) reconcileRouters(event *subnetEvent) error {
 	for _, subnet := range subnets {
 		// The route for overlay subnet cidr via ovn0 should not be deleted even though subnet.Status has changed to not ready
 		if (subnet.Spec.Vlan != "" && !subnet.Spec.LogicalGateway) || subnet.Spec.Vpc != c.config.ClusterRouter ||
-			(subnet.Name != c.config.NodeSwitch && !subnet.Status.IsReady()) {
+			!subnet.Status.IsValidated() {
 			continue
 		}
 

diff --git a/pkg/daemon/controller_windows.go b/pkg/daemon/controller_windows.go
@@ -56,7 +56,7 @@ func (c *Controller) reconcileRouters(_ *subnetEvent) error {
 		// The route for overlay subnet cidr via ovn0 should not be deleted even though subnet.Status has changed to not ready
 		if (subnet.Spec.Vlan != "" && !subnet.Spec.LogicalGateway) ||
 			subnet.Spec.Vpc != c.config.ClusterRouter ||
-			(subnet.Name != c.config.NodeSwitch && !subnet.Status.IsReady()) {
+			!subnet.Status.IsValidated() {
 			continue
 		}