Skip to content

Commit 5d46d82

Browse files
Merge pull request #30407 from weliang1/Fix-empty-operator-name
OCPBUGS-63383: Fix empty operator name
2 parents 20578e7 + 665de6c commit 5d46d82

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

pkg/monitortests/network/legacynetworkmonitortests/networking.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -197,8 +197,8 @@ func testPodSandboxCreation(events monitorapi.Intervals, clientConfig *rest.Conf
197197
event.Locator.OldLocator(), progressingOperatorName, event.Message.OldMessage()))
198198
} else {
199199
failures = append(failures, fmt.Sprintf(
200-
"%v - never deleted - operator:%s was progressing which may cause pod sandbox creation errors - %v",
201-
event.Locator.OldLocator(), progressingOperatorName, event.Message.OldMessage()))
200+
"%v - never deleted - %v",
201+
event.Locator.OldLocator(), event.Message.OldMessage()))
202202
}
203203
} else {
204204
timeBetweenDeleteAndFailure := event.From.Sub(*deletionTime)
@@ -209,10 +209,10 @@ func testPodSandboxCreation(events monitorapi.Intervals, clientConfig *rest.Conf
209209
// withing five seconds, it ought to be long enough to know, but it's close enough to flake and not fail
210210
flakes = append(flakes, fmt.Sprintf("%v - %0.2f seconds after deletion - %v", event.Locator.OldLocator(), timeBetweenDeleteAndFailure.Seconds(), event.Message.OldMessage()))
211211
case deletionTime.Before(event.From):
212-
// something went wrong. More than five seconds after the pod ws deleted, the CNI is trying to set up pod sandboxes and can't
212+
// something went wrong. More than five seconds after the pod was deleted, the CNI is trying to set up pod sandboxes and can't
213213
failures = append(failures, fmt.Sprintf("%v - %0.2f seconds after deletion - %v", event.Locator.OldLocator(), timeBetweenDeleteAndFailure.Seconds(), event.Message.OldMessage()))
214214
default:
215-
// something went wrong. deletion happend after we had a failure to create the pod sandbox
215+
// something went wrong. deletion happened after we had a failure to create the pod sandbox
216216
failures = append(failures, fmt.Sprintf("%v - deletion came AFTER sandbox failure - %v", event.Locator.OldLocator(), event.Message.OldMessage()))
217217
}
218218
}

0 commit comments

Comments
 (0)