3.6.x: UPSTREAM: 49992: Correctly handle empty watch event cache

[liggitt]

pick of #15614

[openshift-merge-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: liggitt

No associated issue. Update pull-request body to add a reference to an issue, or get approval with /approve no-issue

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these OWNERS Files:

• vendor/k8s.io/kubernetes/staging/src/k8s.io/apiserver/pkg/storage/OWNERS [liggitt]

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

[liggitt]

weird router build failure
/retest

[liggitt]

make: *** No rule to make target `build-router-e2e-test'.  Stop.

@stevekuznetsov - why are the 3.6 jobs trying to run things only found in the makefile on master?

[stevekuznetsov]

@deads2k you need to backport your changes to 3.6

[liggitt]

@deads2k you need to backport your changes to 3.6

that's not right... we should have a 3.6 job that is not affected by changes made to master CI

[stevekuznetsov]

@liggitt yes, that would be a perfect world. We don't live in that world today

[liggitt]

/retest

[liggitt]

parent is merged

[openshift-merge-robot]

/test all [submit-queue is verifying that this PR is safe to merge]

[openshift-ci-robot]

@liggitt: The following test failed, say /retest to rerun them all:

Test name	Commit	Details	Rerun command
ci/openshift-jenkins/extended_conformance_gce	773e73f	link	/test extended_conformance_gce

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

[openshift-merge-robot]

Automatic merge from submit-queue