-
Kubernetes Submit Queue authored
Automatic merge from submit-queue (batch tested with PRs 64140, 64898, 65022, 65037, 65027). 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>. Update Calico addon yamls to make it work for both 2.x and 3.x. versions. **What this PR does / why we need it**: Without this PR, one could not run Calico 3.0+. **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes #65045 **Special notes for your reviewer**: **Release note**: ```release-note NONE ```