add back the removed OCP hack from d/s merge

one OCP hack was removed in the last d/s merge process [0]

the current d/s merge is using 'git merge -X theirs' to
ensure we get exactly what is upstream and will have to
be re-worked to prevent this in the future.

the change that was made upstream that caused this was
a refactor for gw init and DPU host handling [1] that came
in recently.

this commit adds the OCP hack back as well as keeping
the changes introduced upstream with [1]

[0] https://github.com/openshift/ovn-kubernetes/pull/2693/files#diff-d09b4698b05e3cc5ad6d020187ffb80247f0ed6f784d61a93ee4e28742e3f827
[1] ovn-kubernetes/ovn-kubernetes@5b5bc06#diff-d09b4698b05e3cc5ad6d020187ffb80247f0ed6f784d61a93ee4e28742e3f827
Signed-off-by: Jamo Luhrsen <[email protected]>

Author: jluhrsen

go-controller/pkg/ovn/controller/services/lb_config.go

@@ -105,6 +105,21 @@ func makeNodeRouterTargetIPs(service *corev1.Service, node *nodeInfo, c *lbConfi
 		targetIPsV6 = localIPsV6
 	}
 
+	// OCP HACK BEGIN
+	if _, set := service.Annotations[localWithFallbackAnnotation]; set && c.externalTrafficLocal {
+		// if service is annotated and is ETP=local, fallback to ETP=cluster on nodes with no local endpoints:
+		// include endpoints from other nodes
+		if len(targetIPsV4) == 0 {
+			zeroRouterLocalEndpointsV4 = true
+			targetIPsV4 = c.clusterEndpoints.V4IPs
+		}
+		if len(targetIPsV6) == 0 {
+			zeroRouterLocalEndpointsV6 = true
+			targetIPsV6 = c.clusterEndpoints.V6IPs
+		}
+	}
+	// OCP HACK END
+
 	// TODO: For all scenarios the lbAddress should be set to hostAddressesStr but this is breaking CI needs more investigation
 	lbAddresses := node.hostAddressesStr()
 	if config.OvnKubeNode.Mode == types.NodeModeFull {