fixup! Fall back to only include default if nodeTopology CR isn't ready.

pkg/utils/zonegetter/zone_getter.go

@@ -118,10 +118,10 @@ func (z *ZoneGetter) ZoneAndSubnetForNode(name string, logger klog.Logger) (stri
 		return "", "", err
 	}
 
-	if z.onlyIncludeDefaultSubnetNodes || !z.nodeTopologyHasSynced() {
-		if !z.nodeTopologyHasSynced() {
-			logger.Info("Falling back to only using default subnet when getting subnet for node", "z.onlyIncludeDefaultSubnetNodes", z.onlyIncludeDefaultSubnetNodes)
-		}
+	nodeTopologySynced := z.nodeTopologyHasSynced()
+	if z.onlyIncludeDefaultSubnetNodes || !nodeTopologySynced {
+		logger.Info("Falling back to only using default subnet when getting subnet for node", "z.onlyIncludeDefaultSubnetNodes", z.onlyIncludeDefaultSubnetNodes, "nodeTopologySynced", nodeTopologySynced)
+
 		defaultSubnet, err := utils.KeyName(z.defaultSubnetURL)
 		if err != nil {
 			nodeLogger.Error(err, "Failed to extract default subnet information from URL", "defaultSubnetURL", z.defaultSubnetURL)
@@ -195,11 +195,9 @@ func (z *ZoneGetter) ListZones(filter Filter, logger klog.Logger) ([]string, err
 // default subnet.
 func (z *ZoneGetter) ListSubnets(logger klog.Logger) ([]nodetopologyv1.SubnetConfig, error) {
 	nodeTopologyCRName := flags.F.NodeTopologyCRName
-
-	if z.onlyIncludeDefaultSubnetNodes || !z.nodeTopologyHasSynced() {
-		if !z.nodeTopologyHasSynced() {
-			logger.Info("Falling back to only using default subnet when listing subnets", "z.onlyIncludeDefaultSubnetNodes", z.onlyIncludeDefaultSubnetNodes)
-		}
+	nodeTopologySynced := z.nodeTopologyHasSynced()
+	if z.onlyIncludeDefaultSubnetNodes || !nodeTopologySynced {
+		logger.Info("Falling back to only using default subnet when listing subnets", "z.onlyIncludeDefaultSubnetNodes", z.onlyIncludeDefaultSubnetNodes, "nodeTopologySynced", nodeTopologySynced)
 
 		// Parse from https://compute.googleapis.com/v1/projects/... to projects/... format.
 		resourceID, err := cloud.ParseResourceURL(z.defaultSubnetURL)
@@ -244,10 +242,10 @@ func (z *ZoneGetter) IsNodeSelectedByFilter(node *api_v1.Node, filter Filter, fi
 
 // allNodesPredicate selects all nodes.
 func (z *ZoneGetter) allNodesPredicate(node *api_v1.Node, nodeLogger klog.Logger) bool {
-	if z.onlyIncludeDefaultSubnetNodes || !z.nodeTopologyHasSynced() {
-		if !z.nodeTopologyHasSynced() {
-			nodeLogger.Info("Falling back to only using default subnet when listing all nodes", "z.onlyIncludeDefaultSubnetNodes", z.onlyIncludeDefaultSubnetNodes)
-		}
+	nodeTopologySynced := z.nodeTopologyHasSynced()
+	if z.onlyIncludeDefaultSubnetNodes || !nodeTopologySynced {
+		nodeLogger.Info("Falling back to only using default subnet when listing all nodes", "z.onlyIncludeDefaultSubnetNodes", z.onlyIncludeDefaultSubnetNodes, "nodeTopologySynced", nodeTopologySynced)
+
 		isInDefaultSubnet, err := isNodeInDefaultSubnet(node, z.defaultSubnetURL, nodeLogger)
 		if err != nil {
 			nodeLogger.Error(err, "Failed to verify if the node is in default subnet")
@@ -275,10 +273,10 @@ func (z *ZoneGetter) candidateNodesPredicateIncludeUnreadyExcludeUpgradingNodes(
 }
 
 func (z *ZoneGetter) nodePredicateInternal(node *api_v1.Node, includeUnreadyNodes, excludeUpgradingNodes bool, nodeAndFilterLogger klog.Logger) bool {
-	if z.onlyIncludeDefaultSubnetNodes || !z.nodeTopologyHasSynced() {
-		if !z.nodeTopologyHasSynced() {
-			nodeAndFilterLogger.Info("Falling back to only using default subnet when listing nodes", "z.onlyIncludeDefaultSubnetNodes", z.onlyIncludeDefaultSubnetNodes)
-		}
+	nodeTopologySynced := z.nodeTopologyHasSynced()
+	if z.onlyIncludeDefaultSubnetNodes || !nodeTopologySynced {
+		nodeAndFilterLogger.Info("Falling back to only using default subnet when listing nodes", "z.onlyIncludeDefaultSubnetNodes", z.onlyIncludeDefaultSubnetNodes, "nodeTopologySynced", nodeTopologySynced)
+
 		isInDefaultSubnet, err := isNodeInDefaultSubnet(node, z.defaultSubnetURL, nodeAndFilterLogger)
 		if err != nil {
 			nodeAndFilterLogger.Error(err, "Failed to verify if the node is in default subnet")