Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions pkg/gateway/model_build_lattice_service.go
Original file line number Diff line number Diff line change
Expand Up @@ -195,10 +195,29 @@ func (t *latticeServiceModelBuildTask) buildLatticeService(ctx context.Context)
}
spec.AllowTakeoverFrom = allowTakeoverFrom

// Check for service name override on route first (highest precedence)
serviceNameOverride, err := k8s.GetServiceNameOverrideWithValidation(t.route.K8sObject())
if err != nil {
return nil, err
}

// If not set on route, check the Gateway's service-name-override annotation (fallback)
if serviceNameOverride == "" {
gw, gwErr := t.findGateway(ctx)
if gwErr == nil && gw != nil {
// Use the same validation function as HTTPRoute for consistency
gwServiceNameOverride, gwErr := k8s.GetServiceNameOverrideWithValidation(gw)
if gwErr != nil {
return nil, gwErr
}
if gwServiceNameOverride != "" {
serviceNameOverride = gwServiceNameOverride
t.log.Debugf(ctx, "Using service-name-override from Gateway %s/%s: %s",
gw.GetNamespace(), gw.GetName(), serviceNameOverride)
}
}
}

spec.ServiceNameOverride = serviceNameOverride

svc, err := model.NewLatticeService(t.stack, spec)
Expand Down