Merge pull request #1994 from sawsa307/change-duplicate-endpoints

Update duplicate endpoint handling
kubernetes · Mar 14, 2023 · 8e12b93 · 8e12b93
2 parents 20d21e9 + d3403af
commit 8e12b93
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/pkg/neg/syncers/utils.go b/pkg/neg/syncers/utils.go
@@ -272,9 +272,12 @@ func toZoneNetworkEndpointMap(eds []negtypes.EndpointsData, zoneGetter negtypes.
 				}
 				zoneNetworkEndpointMap[zone].Insert(networkEndpoint)
 
-				// increment the count for duplicated endpoint
-				if _, contains := networkEndpointPodMap[networkEndpoint]; contains {
+				// increment the count for duplicate endpoint
+				if existingPod, contains := networkEndpointPodMap[networkEndpoint]; contains {
 					dupCount += 1
+					if existingPod.Name < endpointAddress.TargetRef.Name {
+						continue // if existing name is alphabetically lower than current one, continue and don't replace
+					}
 				}
 				networkEndpointPodMap[networkEndpoint] = types.NamespacedName{Namespace: endpointAddress.TargetRef.Namespace, Name: endpointAddress.TargetRef.Name}
 			}