Skip to content

[release-1.27] Move Alpha Gateway API Inference Extension support to master #57096

@istio-testing

Description

@istio-testing

Manual cherrypick required.

#56845 failed to apply on top of branch "release-1.27":

Applying: gateway-api-inference-extenstion support (#55436)
.git/rebase-apply/patch:2928: trailing whitespace.
    
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	pilot/pkg/bootstrap/configcontroller.go
M	pilot/pkg/config/kube/gateway/deploymentcontroller.go
M	pilot/pkg/config/kube/gateway/deploymentcontroller_test.go
M	pilot/pkg/features/experimental.go
M	pilot/pkg/model/service.go
M	pilot/pkg/networking/core/cluster.go
Falling back to patching base and 3-way merge...
Auto-merging pilot/pkg/networking/core/cluster.go
Auto-merging pilot/pkg/model/service.go
Auto-merging pilot/pkg/features/experimental.go
Auto-merging pilot/pkg/config/kube/gateway/deploymentcontroller_test.go
Auto-merging pilot/pkg/config/kube/gateway/deploymentcontroller.go
Auto-merging pilot/pkg/bootstrap/configcontroller.go
Auto-merging go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 gateway-api-inference-extenstion support (#55436)

Metadata

Metadata

Assignees

Labels

No labels
No labels

Type

No type

Projects

No projects

Milestone

No milestone

Relationships

None yet

Development

No branches or pull requests

Issue actions