Skip to content

Commit b9c7232

Browse files
committed
Don't check for remote node subnet BGP routes
In ovn-kubernetes/ovn-kubernetes#5140 we are removing receiving the remote node pod subnet routes for advertised networks. In the e2e setup, we seem to be checking for these routes which won't be there. See sample failure: https://prow.ci.openshift.org/view/gs/test-platform-results/pr-logs/pull/openshift_ovn-kubernetes/2651/pull-ci-openshift-ovn-kubernetes-master-e2e-metal-ipi-ovn-dualstack-bgp-local-gw/1950264479669293056 https://prow.ci.openshift.org/view/gs/test-platform-results/pr-logs/pull/openshift_ovn-kubernetes/2693/pull-ci-openshift-ovn-kubernetes-master-e2e-metal-ipi-ovn-dualstack-bgp-local-gw/1948808636629258240 We need this change before we bring in 5140 downstream. Signed-off-by: Surya Seetharaman <[email protected]>
1 parent 82cfbea commit b9c7232

File tree

1 file changed

+0
-30
lines changed

1 file changed

+0
-30
lines changed

test/extended/networking/route_advertisements.go

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1159,8 +1159,6 @@ spec:
11591159
// verifyLearnedBgpRoutesForNode encapsulates the verification of learned BGP routes for a node.
11601160
func verifyLearnedBgpRoutesForNode(oc *exutil.CLI, nodeName string, network string) {
11611161
var lastErr error
1162-
nodeSubnets, err := getNodeSubnets(oc, network)
1163-
o.Expect(err).NotTo(o.HaveOccurred())
11641162

11651163
g.By(fmt.Sprintf("Checking routes for node %s in network %s", nodeName, network))
11661164
o.Eventually(func() bool {
@@ -1174,12 +1172,6 @@ func verifyLearnedBgpRoutesForNode(oc *exutil.CLI, nodeName string, network stri
11741172
lastErr = fmt.Errorf("missing external routes")
11751173
return false
11761174
}
1177-
1178-
if !verifyNodeSubnetRoutes(nodeName, nodeSubnets, bgpV4Routes, bgpV6Routes) {
1179-
lastErr = fmt.Errorf("missing node subnet routes")
1180-
return false
1181-
}
1182-
11831175
return true
11841176
}, 3*timeOut, interval).Should(o.BeTrue(), func() string {
11851177
return fmt.Sprintf("Route verification failed for node %s: %v", nodeName, lastErr)
@@ -1198,28 +1190,6 @@ func verifyExternalRoutes(v4Routes, v6Routes map[string]string) bool {
11981190
return true
11991191
}
12001192

1201-
func verifyNodeSubnetRoutes(nodeName string, nodeSubnets map[string][]net.IPNet, v4Routes, v6Routes map[string]string) bool {
1202-
for node, subnets := range nodeSubnets {
1203-
if node == nodeName {
1204-
continue
1205-
}
1206-
for _, subnet := range subnets {
1207-
if subnet.IP.To4() != nil {
1208-
if _, ok := v4Routes[subnet.String()]; !ok {
1209-
framework.Logf("Missing v4 route for node %s subnet %s", node, subnet.String())
1210-
return false
1211-
}
1212-
} else {
1213-
if _, ok := v6Routes[subnet.String()]; !ok {
1214-
framework.Logf("Missing v6 route for node %s subnet %s", node, subnet.String())
1215-
return false
1216-
}
1217-
}
1218-
}
1219-
}
1220-
return true
1221-
}
1222-
12231193
func checkExternalResponse(oc *exutil.CLI, proberPod *corev1.Pod, podIP, ExternalIP string, serverPort int, packetSnifferDaemonSet *v1.DaemonSet, targetProtocol string) {
12241194
g.By("Sending request from the external host to the PodIPs")
12251195
request := fmt.Sprintf("dial?protocol=http&host=%s&port=%d&request=clientip", podIP, serverPort)

0 commit comments

Comments
 (0)