controller: check condition NodeNetworkUnavailable when determining whether node is ready (kubeovn#4917)

zhangzujian · zhangzujian · commit 3518f6b804ad · 2025-01-11T10:03:07.000Z
Signed-off-by: zhangzujian &lt;zhangzujian.7@gmail.com&gt;
diff --git a/pkg/controller/node.go b/pkg/controller/node.go
@@ -45,12 +45,16 @@ func (c *Controller) enqueueAddNode(obj interface{}) {
 }
 
 func nodeReady(node *v1.Node) bool {
-	for _, con := range node.Status.Conditions {
-		if con.Type == v1.NodeReady && con.Status == v1.ConditionTrue {
-			return true
+	var ready, networkUnavailable bool
+	for _, c := range node.Status.Conditions {
+		switch c.Type {
+		case v1.NodeReady:
+			ready = c.Status == v1.ConditionTrue
+		case v1.NodeNetworkUnavailable:
+			networkUnavailable = c.Status == v1.ConditionTrue
 		}
 	}
-	return false
+	return ready && !networkUnavailable
 }
 
 func (c *Controller) enqueueUpdateNode(oldObj, newObj interface{}) {

Original file line number	Diff line number	Diff line change
`@@ -45,12 +45,16 @@ func (c *Controller) enqueueAddNode(obj interface{}) {`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`func nodeReady(node *v1.Node) bool {`
`48`		`- for _, con := range node.Status.Conditions {`
`49`		`- if con.Type == v1.NodeReady && con.Status == v1.ConditionTrue {`
`50`		`- return true`
	`48`	`+ var ready, networkUnavailable bool`
	`49`	`+ for _, c := range node.Status.Conditions {`
	`50`	`+ switch c.Type {`
	`51`	`+ case v1.NodeReady:`
	`52`	`+ ready = c.Status == v1.ConditionTrue`
	`53`	`+ case v1.NodeNetworkUnavailable:`
	`54`	`+ networkUnavailable = c.Status == v1.ConditionTrue`
`51`	`55`	`}`
`52`	`56`	`}`
`53`		`- return false`
	`57`	`+ return ready && !networkUnavailable`
`54`	`58`	`}`
`55`	`59`
`56`	`60`	`func (c *Controller) enqueueUpdateNode(oldObj, newObj interface{}) {`