feat: Add ReferenceGrant support for HTTPRoute #149

dspo · 2025-05-21T08:31:22Z

Type of change:

What this PR does / why we need it:

feat: Add ReferenceGrant support for HTTPRoute

Pre-submission checklist:

Did you explain what problem does this PR solve? Or what new features have been added?
Have you added corresponding test cases?
Have you modified the corresponding document?
Is this PR backward compatible? If it is not backward compatible, please discuss on the mailing list first

This commit introduces functionality to handle the ReferenceGrant resource in the Gateway API. It updates the Gateway controller logic, adds necessary permissions in RBAC manifests, and integrates condition handling for cross-namespace references. Additionally, skipped conformance tests related to ReferenceGrants are reinstated.

This commit introduces support for Gateway API ReferenceGrant CRD, enabling cross-namespace references for HTTPRoutes. It refactors backend reference handling to validate Service references and check ReferenceGrants. Also includes minor code cleanups, added cluster role permissions for ReferenceGrants, and adjustments to e2e manifests.

…nce-grant-for-route

…reference-grant-for-route # Conflicts: # test/conformance/conformance_test.go

Reorganized and simplified the predicate logic for ReferenceGrant handling across gateway and HTTPRoute controllers. Consolidated duplicate code into reusable functions, reducing redundancy and improving maintainability. This centralization ensures consistent behavior and clearer code structure.

…nce-grant-for-route # Conflicts: # internal/controller/gateway_controller.go # internal/controller/utils.go # test/conformance/conformance_test.go

… cross-namespace checks

github-actions · 2025-05-21T08:46:55Z

conformance test report

apiVersion: gateway.networking.k8s.io/v1
date: "2025-05-21T10:49:13Z"
gatewayAPIChannel: standard
gatewayAPIVersion: v1.2.0
implementation:
  contact: null
  organization: APISIX
  project: apisix-ingress-controller
  url: https://github.com/apache/apisix-ingress-controller.git
  version: v2.0.0
kind: ConformanceReport
mode: default
profiles:
- core:
    result: partial
    skippedTests:
    - HTTPRouteHTTPSListener
    statistics:
      Failed: 0
      Passed: 32
      Skipped: 1
  name: GATEWAY-HTTP
  summary: Core tests partially succeeded with 1 test skips.

…handling

Copilot

Pull Request Overview

This PR adds a feature to detect and enable cross-namespace ReferenceGrant support, refactors reference grant checks and condition handling, and updates controllers to watch ReferenceGrant events.

Introduce a global enableReferenceGrant flag and detect the ReferenceGrant CRD in manager/run.go
Refactor utilities to unify reference grant logic (checkReferenceGrant, predicates) and simplify condition construction
Update both HTTPRoute and Gateway controllers to watch and reconcile based on ReferenceGrant changes
Remove skipped conformance tests for traditional routes, replacing the skip list with a TODO

Reviewed Changes

Copilot reviewed 9 out of 9 changed files in this pull request and generated no comments.

Show a summary per file

File	Description
test/conformance/conformance_test.go	Cleared out skipped tests list for traditional routes
internal/manager/run.go	Added ReferenceGrant CRD detection and `SetEnableReferenceGrant`
internal/controller/utils.go	Refactored `SetRouteConditionResolvedRefs`, added grant predicates
internal/controller/httproute_controller.go	Wired in cross-namespace grant checks and new predicates
internal/controller/gateway_controller.go	Replaced custom predicates with shared grant predicate logic

Comments suppressed due to low confidence (5)

test/conformance/conformance_test.go:27

With all traditional route skips removed, add or update test cases to cover the new cross-namespace ReferenceGrant behaviors or adjust the skip list to reflect expected conformance changes.

var skippedTestsForTraditionalRoutes []string // TODO: HTTPRoute hostname intersection and listener hostname matching

internal/controller/utils.go:16

The import "cmp" has no path and will fail to compile. Please replace it with the correct module path (e.g., "github.com/google/go-cmp/cmp" or appropriate Go 1.21 import).

"cmp"

internal/controller/utils.go:961

The code uses slices.Contains but the slices package is not imported. Add import "slices" (Go 1.21) or the appropriate module path.

return slices.Contains(reasons, Reason(re.Reason))

internal/controller/utils.go:273

When err is not a ReasonError, the condition’s Reason remains the default ResolvedRefs, which may misrepresent the actual failure. Consider setting a generic reason or mapping other error types to an appropriate Reason.

if errors.As(err, &re) {

internal/manager/run.go:187

[nitpick] Mixing setupLog and logger for logging here may be confusing. Use setupLog.Error consistently for controller startup logs.

logger.Error(err, "CRD ReferenceGrants is not installed")

ronething · 2025-05-21T10:04:52Z

test/conformance/conformance_test.go

-
-	// TODO: HTTPRoute hostname intersection and listener hostname matching
-}
+var skippedTestsForTraditionalRoutes []string // TODO: HTTPRoute hostname intersection and listener hostname matching


we can remove this line?

ronething · 2025-05-21T10:08:24Z

internal/manager/run.go

+		Resource: "referencegrants",
+	})
+	if err != nil {
+		logger.Error(err, "CRD ReferenceGrants is not installed")


Not need to print logs, or should it not be error-level logs?

ronething

others lgtm.

AlinsRan · 2025-05-21T10:19:49Z

internal/controller/httproute_controller.go

@@ -101,6 +102,10 @@ func (r *HTTPRouteReconciler) SetupWithManager(mgr ctrl.Manager) error {
 		Watches(&v1alpha1.GatewayProxy{},
 			handler.EnqueueRequestsFromMapFunc(r.listHTTPRoutesForGatewayProxy),
 		).
+		Watches(&v1beta1.ReferenceGrant{},


Do we allow not installing RefereGrant?
If not installed, an error will occur here.

Yes, it is allowed to not install ReferenceGrant and an error will occur here if not installed ReferenceGrant.
Let me fix it.

dspo added 11 commits May 20, 2025 22:43

refactor: Improve condition handling in gateway controller

87bb31e

fix:

37f5511

Merge remote-tracking branch 'origin/release-v2-dev' into feat/refere…

dfc5272

…nce-grant-for-route

Merge remote-tracking branch 'origin/feat/reference-grant' into feat/…

b18866a

…reference-grant-for-route # Conflicts: # test/conformance/conformance_test.go

Merge remote-tracking branch 'origin/release-v2-dev' into feat/refere…

7e362e4

…nce-grant-for-route # Conflicts: # internal/controller/gateway_controller.go # internal/controller/utils.go # test/conformance/conformance_test.go

refactor: Simplify permission checking in ReferenceGrant validation

de81779

refactor: Update ReferenceGrant validation to use ObjectReference for…

7c9925b

… cross-namespace checks

feat: Enable ReferenceGrant checks and streamline validation logic

b8d9450

dspo changed the title ~~feat: enable reference grant~~ feat: check enable reference grant May 21, 2025

fix: Correct function name for listing HTTP routes in ReferenceGrant …

c5062fb

…handling

dspo requested a review from Copilot May 21, 2025 09:53

Copilot AI reviewed May 21, 2025

View reviewed changes

dspo mentioned this pull request May 21, 2025

feat: Add ReferenceGrant support for HTTPRoute #147

Closed

12 tasks

dspo changed the title ~~feat: check enable reference grant~~ feat: Add ReferenceGrant support for HTTPRoute May 21, 2025

ronething reviewed May 21, 2025

View reviewed changes

ronething approved these changes May 21, 2025

View reviewed changes

AlinsRan reviewed May 21, 2025

View reviewed changes

resolve comments

bdb2058

AlinsRan approved these changes May 21, 2025

View reviewed changes

resolve comments

e8da0ca

dspo merged commit bf07565 into release-v2-dev May 21, 2025
9 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

feat: Add ReferenceGrant support for HTTPRoute #149

feat: Add ReferenceGrant support for HTTPRoute #149

Uh oh!

dspo commented May 21, 2025 •

edited

Loading

Uh oh!

github-actions bot commented May 21, 2025 •

edited

Loading

Uh oh!

Copilot AI left a comment

Uh oh!

ronething May 21, 2025

Uh oh!

dspo May 21, 2025

Uh oh!

ronething May 21, 2025

Uh oh!

dspo May 21, 2025

Uh oh!

ronething left a comment

Uh oh!

AlinsRan May 21, 2025

Uh oh!

dspo May 21, 2025

Uh oh!

Uh oh!

Uh oh!

feat: Add ReferenceGrant support for HTTPRoute #149

feat: Add ReferenceGrant support for HTTPRoute #149

Uh oh!

Conversation

dspo commented May 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Type of change:

What this PR does / why we need it:

Pre-submission checklist:

Uh oh!

github-actions bot commented May 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

conformance test report

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

ronething May 21, 2025

Choose a reason for hiding this comment

Uh oh!

dspo May 21, 2025

Choose a reason for hiding this comment

Uh oh!

ronething May 21, 2025

Choose a reason for hiding this comment

Uh oh!

dspo May 21, 2025

Choose a reason for hiding this comment

Uh oh!

ronething left a comment

Choose a reason for hiding this comment

Uh oh!

AlinsRan May 21, 2025

Choose a reason for hiding this comment

Uh oh!

dspo May 21, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

dspo commented May 21, 2025 •

edited

Loading

github-actions bot commented May 21, 2025 •

edited

Loading