Skip to content

fix error when updating invalid gateway status #7415

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 4, 2025
Merged

fix error when updating invalid gateway status #7415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b7dfa72
fix error when updating invalid gateway status
zirain Nov 3, 2025
af75a21
update
zirain Nov 4, 2025
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
2 changes: 0 additions & 2 deletions internal/gatewayapi/contexts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,6 @@ func (g *GatewayContext) ResetListeners(resources *resource.Resources, epMap map
listenerStatusIdx: i,
}
}

g.attachEnvoyProxy(resources, epMap)
}

func (g *GatewayContext) attachEnvoyProxy(resources *resource.Resources, epMap map[types.NamespacedName]*egv1a1.EnvoyProxy) {
Expand Down
5 changes: 0 additions & 5 deletions internal/gatewayapi/testdata/envoyproxy-gateway-accesslog-with-bad-sinks.out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,5 @@ gateways:
reason: InvalidParameters
status: "False"
type: Accepted
listeners:
- attachedRoutes: 0
conditions: null
name: http
supportedKinds: null
Copy link
Member Author

@zirain zirain Nov 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this's a required field.

infraIR: {}
xdsIR: {}
4 changes: 3 additions & 1 deletion internal/gatewayapi/translator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,6 +386,7 @@ func (t *Translator) GetRelevantGateways(resources *resource.Resources) (
gCtx := &GatewayContext{
Gateway: gateway,
}
gCtx.attachEnvoyProxy(resources, envoyproxyMap)

// Gateways that are not accepted by the controller because they reference an invalid EnvoyProxy.
if status.GatewayNotAccepted(gCtx.Gateway) {
Expand All @@ -394,7 +395,6 @@ func (t *Translator) GetRelevantGateways(resources *resource.Resources) (
continue
}

gCtx.ResetListeners(resources, envoyproxyMap)
if ep := gCtx.envoyProxy; ep != nil {
key := utils.NamespacedName(ep)
if err, exits := envoyproxyValidationErrorMap[key]; exits {
Expand All @@ -406,6 +406,8 @@ func (t *Translator) GetRelevantGateways(resources *resource.Resources) (
}
}

// we cannot do this early, otherwise there's an error when updating status.
gCtx.ResetListeners(resources, envoyproxyMap)
Copy link
Contributor

@arkodg arkodg Nov 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

due to the logic change, can we delete

gateway/internal/gatewayapi/contexts.go

Line 48 in 9935819

g.attachEnvoyProxy(resources, epMap)
?

Copy link
Member Author

@zirain zirain Nov 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if required by L398 to make sure envoyproxy is not alway nil.

Copy link
Member Author

@zirain zirain Nov 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, I read wrong line, deleted.

acceptedGateways = append(acceptedGateways, gCtx)
}
return
Expand Down
2 changes: 1 addition & 1 deletion internal/infrastructure/runner/runner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ func (r *Runner) updateProxyInfraFromSubscription(ctx context.Context, sub <-cha
// Subscribe to resources
message.HandleSubscription(message.Metadata{Runner: r.Name(), Message: message.InfraIRMessageName}, sub,
func(update message.Update[string, *ir.Infra], errChan chan error) {
r.Logger.Info("received an update")
r.Logger.Info("received an update", "key", update.Key, "delete", update.Delete)
val := update.Value

if update.Delete {
Expand Down