Cherry-pick 6658

[Behnam-Shobiri]

Description

Cherry-pick https://github.com/projectcalico/calico/pull/6658

Related issues/PRs

Todos

• [ ] Tests
• [ ] Documentation
• [ ] Release note

Release Note

Build with golang 1.18.5

Reminder for the reviewer

Make sure that this PR has the correct labels and milestone set.

Every PR needs one docs-* label.

• docs-pr-required: This change requires a change to the documentation that has not been completed yet.
• docs-completed: This change has all necessary documentation completed.
• docs-not-required: This change has no user-facing impact and requires no docs.

Every PR needs one release-note-* label.

• release-note-required: This PR has user-facing changes. Most PRs should have this label.
• release-note-not-required: This PR has no user-facing changes.

Other optional labels:

• cherry-pick-candidate: This PR should be cherry-picked to an earlier release. For bug fixes only.
• needs-operator-pr: This PR is related to install and requires a corresponding change to the operator.

[netlify[bot]]

✅ Deploy Preview for calico-tigera ready!

Name	Link
🔨 Latest commit	60672aeaad2096f229c4dadef7d87678ab40ebf4
🔍 Latest deploy log	https://app.netlify.com/sites/calico-tigera/deploys/631285f6c90e7c00087baea3
😎 Deploy Preview	https://deploy-preview-6660--calico-tigera.netlify.app
📱 Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.

---

To edit notification comments on pull requests, go to your Netlify site settings.

[netlify[bot]]

✅ Deploy Preview for calico-v3-23 canceled.

Name	Link
🔨 Latest commit	60672aeaad2096f229c4dadef7d87678ab40ebf4
🔍 Latest deploy log	https://app.netlify.com/sites/calico-v3-23/deploys/631285f6541da000084dd1f2

[caseydavenport]

Closing this one since it's out of date and introduces a number of test failures.