Automatic merge from submit-queue (batch tested with PRs 62324, 61459, 62475, 62476, 61914). 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>.

Remove unnecessary code in ingress upgrade logic

Now that 1.1 is released, fix the TODO.

/assign @nicksardo 

**Release note**:

```release-note
None
```