Ensure NEG Readiness Reflector commits endpoints from non-default

subnets.
kubernetes · Nov 4, 2024 · 1943588 · 1943588
1 parent 1f68588
commit 1943588
Show file tree

Hide file tree

Showing 2 changed files with 294 additions and 125 deletions.
diff --git a/pkg/neg/syncers/transaction.go b/pkg/neg/syncers/transaction.go
@@ -746,9 +746,22 @@ func (s *transactionSyncer) commitPods(endpointMap map[negtypes.EndpointGroupInf
 			}
 			zoneEndpointMap[endpoint] = podName
 		}
-		// TODO(sawsa307): Make sure commitPods is called for non-default subnet NEGs.
+		negName := s.NegSyncerKey.NegName
+		syncerKey := s.NegSyncerKey
+		if flags.F.EnableMultiSubnetClusterPhase1 {
+			defaultSubnet, err := utils.KeyName(s.networkInfo.SubnetworkURL)
+			if err != nil {
+				s.logger.Error(err, "Errored getting default subnet from NetworkInfo when commiting pods")
+				continue
+			}
+
+			if endpointGroupInfo.Subnet != defaultSubnet {
+				negName = s.namer.NonDefaultSubnetNEG(s.NegSyncerKey.Namespace, s.NegSyncerKey.Name, endpointGroupInfo.Subnet, s.NegSyncerKey.PortTuple.Port)
+			}
+			syncerKey.NegName = negName
+		}
 		// Only zone is needed because NEGs from non-default subnet have different names.
-		s.reflector.CommitPods(s.NegSyncerKey, s.NegSyncerKey.NegName, endpointGroupInfo.Zone, zoneEndpointMap)
+		s.reflector.CommitPods(syncerKey, negName, endpointGroupInfo.Zone, zoneEndpointMap)
 	}
 }