Automatic merge from submit-queue (batch tested with PRs 64122, 64936, 65288, 65383). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Consume watch event for all versions of CRD The new test code to fix flaky test were considered CRD version but failed to consume watch cache event in all versions. Fixes #64571 @sttts @liggitt