Commit 81ad8f2

committed

add fixmes

1 parent 9677843 commit 81ad8f2Copy full SHA for 81ad8f2

File tree

2 files changed

-2

lines changed

internal/controller/state/graph
- policies.go
- route_common.go

2 files changed

-2

lines changed

`‎internal/controller/state/graph/policies.go‎`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -457,6 +457,9 @@ func checkForRouteOverlap(route L7Route, hostPortPaths map[string]string) cond`
`457`	`457`	`for _, parentRef := range route.ParentRefs {`
`458`	`458`	`if parentRef.Attachment != nil {`
`459`	`459`	`port := parentRef.Attachment.ListenerPort`
	`460`	`+ // FIXME(sarthyparty): https://github.com/nginx/nginx-gateway-fabric/issues/3812`
	`461`	`+ // Need to merge listener hostnames with route hostnames so wildcards are handled correctly`
	`462`	`+ // Also the AcceptedHostnames is a map of slices of strings, so we need to flatten it`
`460`	`463`	`for _, hostname := range parentRef.Attachment.AcceptedHostnames {`
`461`	`464`	`for _, rule := range route.Spec.Rules {`
`462`	`465`	`for _, match := range rule.Matches {`

`‎internal/controller/state/graph/route_common.go‎`

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,8 @@ type ParentRefAttachmentStatus struct {`
`46`	`46`	`// still attach. The backendRef condition would be displayed here.`
`47`	`47`	`FailedConditions []conditions.Condition`
`48`	`48`	`// ListenerPort is the port on the Listener that the Route is attached to.`
	`49`	`+ // FIXME(sarthyparty): https://github.com/nginx/nginx-gateway-fabric/issues/3813`
	`50`	`+ // Needs to be a map of <gatewayNamespacedName/listenerName> to port number`
`49`	`51`	`ListenerPort v1.PortNumber`
`50`	`52`	`// Attached indicates if the ParentRef is attached to the Gateway.`
`51`	`53`	`Attached bool`
`@@ -308,7 +310,8 @@ func buildSectionNameRefs(`
`308`	`310`	`}`
`309`	`311`
`310`	`312`	`// If there is no section name, handle based on whether port is specified`
`311`		`- // FIXME(sarthyparty): this logic seems to be duplicated in findAttachableListeners so we should refactor this,`
	`313`	`+ // FIXME(sarthyparty): https://github.com/nginx/nginx-gateway-fabric/issues/3811`
	`314`	`+ // this logic seems to be duplicated in findAttachableListeners so we should refactor this,`
`312`	`315`	`// either here or in findAttachableListeners`
`313`	`316`	`if p.SectionName == nil {`
`314`	`317`	`// If port is specified, preserve the port-only nature for proper validation`
`@@ -335,7 +338,6 @@ func buildSectionNameRefs(`
`335`	`338`	`Idx: i,`
`336`	`339`	`Gateway: CreateParentRefGateway(gw),`
`337`	`340`	`SectionName: &l.Source.Name,`
`338`		`- Port: nil,`
`339`	`341`	`})`
`340`	`342`	`}`
`341`	`343`	`}`
`@@ -884,9 +886,11 @@ func findAttachableListeners(ref ParentRef, listeners []Listener) ([]*Listener`
`884`	`886`	`if l.Attachable && (ref.Port == nil \|\| l.Source.Port == *ref.Port) {`
`885`	`887`	`return []*Listener{l}, true`
`886`	`888`	`}`
	`889`	`+ // We return false because we didn't find a listener that matches the port`
`887`	`890`	`if ref.Port != nil && l.Source.Port != *ref.Port {`
`888`	`891`	`return nil, false`
`889`	`892`	`}`
	`893`	`+ // Return true because we found a listener that matches the sectionName and port but is not attachable`
`890`	`894`	`return nil, true`
`891`	`895`	`}`
`892`	`896`	`}`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 81ad8f2

File tree

2 files changed

2 files changed

`‎internal/controller/state/graph/policies.go‎`

`‎internal/controller/state/graph/route_common.go‎`

0 commit comments