Merge pull request #28397 from dulek/remove-kuryr

openshift-merge-bot[bot] · web-flow · commit 639414f8034b · 2023-11-29T10:22:06.000Z
OSASINFRA-3291: Remove Kuryr bits
diff --git a/pkg/monitortests/network/legacynetworkmonitortests/networking.go b/pkg/monitortests/network/legacynetworkmonitortests/networking.go
@@ -165,12 +165,6 @@ func testPodSandboxCreation(events monitorapi.Intervals, clientConfig *rest.Conf
 				continue
 			}
 		}
-		if strings.Contains(event.Message, "kuryr") && strings.Contains(event.Message, "deleted while processing the CNI ADD request") {
-			// This happens from time to time with Kuryr. Creating ports in Neutron for pod can take long and a controller might delete the pod before,
-			// effectively cancelling Kuryr CNI ADD request.
-			flakes = append(flakes, fmt.Sprintf("%v - pod got deleted while kuryr was still processing its creation - %v", event.Locator, event.Message))
-			continue
-		}
 
 		partialLocator := monitorapi.NonUniquePodLocatorFrom(event.Locator)
 		if deletionTime := getPodDeletionTime(eventsForPods[partialLocator], event.Locator); deletionTime == nil {

Original file line number	Diff line number	Diff line change
`@@ -165,12 +165,6 @@ func testPodSandboxCreation(events monitorapi.Intervals, clientConfig *rest.Conf`
`165`	`165`	`continue`
`166`	`166`	`}`
`167`	`167`	`}`
`168`		`- if strings.Contains(event.Message, "kuryr") && strings.Contains(event.Message, "deleted while processing the CNI ADD request") {`
`169`		`- // This happens from time to time with Kuryr. Creating ports in Neutron for pod can take long and a controller might delete the pod before,`
`170`		`- // effectively cancelling Kuryr CNI ADD request.`
`171`		`- flakes = append(flakes, fmt.Sprintf("%v - pod got deleted while kuryr was still processing its creation - %v", event.Locator, event.Message))`
`172`		`- continue`
`173`		`- }`
`174`	`168`
`175`	`169`	`partialLocator := monitorapi.NonUniquePodLocatorFrom(event.Locator)`
`176`	`170`	`if deletionTime := getPodDeletionTime(eventsForPods[partialLocator], event.Locator); deletionTime == nil {`