Automatic merge from submit-queue (batch tested with PRs 40906, 40924, 40938, 40902, 40911) federation: Updating deletion helper to add both finalizers in a single update Fixes https://github.com/kubernetes/kubernetes/issues/40837 cc @mwielgus @csbell