Resolving merge conflict in gwapi_builders.go

KillianGolds · KillianGolds · commit d3edb8f9aed7 · 2025-10-02T19:23:19.000+01:00
Signed-off-by: Killian Golds &lt;kgolds@redhat.com&gt;

rh-pre-commit.version: 2.3.2
rh-pre-commit.check-secrets: ENABLED
diff --git a/pkg/controller/llmisvc/fixture/gwapi_builders.go b/pkg/controller/llmisvc/fixture/gwapi_builders.go
@@ -283,6 +283,12 @@ func WithBackendRefs(refs ...gatewayapi.HTTPBackendRef) HTTPRouteRuleOption {
 	}
 }
 
+func WithHTTPRouteGatewayRef(references ...gatewayapi.ParentReference) HTTPRouteOption {
+	return func(route *gatewayapi.HTTPRoute) {
+		route.Spec.ParentRefs = append(route.Spec.ParentRefs, references...)
+	}
+}
+
 // BackendRefInferencePool creates a v1alpha2 InferencePool backend ref
 func BackendRefInferencePool(name string) gatewayapi.HTTPBackendRef {
 	return gatewayapi.HTTPBackendRef{

Original file line number	Diff line number	Diff line change
`@@ -283,6 +283,12 @@ func WithBackendRefs(refs ...gatewayapi.HTTPBackendRef) HTTPRouteRuleOption {`
`283`	`283`	`}`
`284`	`284`	`}`
`285`	`285`
	`286`	`+func WithHTTPRouteGatewayRef(references ...gatewayapi.ParentReference) HTTPRouteOption {`
	`287`	`+ return func(route *gatewayapi.HTTPRoute) {`
	`288`	`+ route.Spec.ParentRefs = append(route.Spec.ParentRefs, references...)`
	`289`	`+ }`
	`290`	`+}`
	`291`	`+`
`286`	`292`	`// BackendRefInferencePool creates a v1alpha2 InferencePool backend ref`
`287`	`293`	`func BackendRefInferencePool(name string) gatewayapi.HTTPBackendRef {`
`288`	`294`	`return gatewayapi.HTTPBackendRef{`