conflict: feat: support custom gatewayproxy namespace for ingressclass (#2701) (b52c26c)

[github-actions]

⚠️ Backport With Conflicts

• Upstream commit: apache/apisix-ingress-controller@b52c26c
• Original title: feat: support custom gatewayproxy namespace for ingressclass (#2701)
• Original author: Ashing Zheng axingfly@gmail.com

This PR contains unresolved conflicts. Please resolve them before merging.

Suggested workflow

1. git fetch origin backport/b52c26c-to-master
2. git checkout backport/b52c26c-to-master
3. Resolve conflicts, commit, and push updates.

Created automatically by backport-bot.

[coderabbitai]

Important

Review skipped

Bot user detected.

To trigger a single review, invoke the @coderabbitai review command.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

---

_{Comment @coderabbitai help to get the list of available commands and usage tips.}