b00b504f57
Automatic merge from submit-queue (batch tested with PRs 66190, 66871, 66617, 66293, 66891). 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>. Change the expected error message in webhook e2e test Fix #66776. The timeout error message sent by the apiserver was changed by #66616, which affects 1.12+ apiservers. The expected error message in e2e test in 1.11 and 1.12 should only contain the common part of the pre-1.12 error message and post-1.12 message, because the upgrade&downgrade tests will run the 1.11 e2e test against 1.12 apiserver, and vice versa. /sig api-machinery /release-note-none