Skip to content
Merged
Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions controllers/common.go
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ func merge(a, b any) any {
// - Values from GatewayClassBlueprint
// - Values from GatewayClassConfig in controller namespace (aka. global policies)
// - Values from GatewayClassConfig in Gateway/HTTPRoute local namespace targeting namespace
// - Values from GatewayClassConfig in Gateway/HTTPRoute local namespace targeting Gateway/HTTPRoute
// - Values from GatewayClassConfig in Gateway/HTTPRoute local namespace targeting GatewayClass
// - Values from GatewayConfig in Gateway/HTTPRoute local namespace, targeting namespace
// - Values from GatewayConfig in Gateway/HTTPRoute local namespace, targeting Gateway/HTTPRoute resource
// Note, defaults are processed top-to-bottom (i.e. later defaults overwrites earlier defaults), while overrides are bottom-to-top (see GEP-713)
Expand Down Expand Up @@ -198,7 +198,7 @@ func lookupValues(ctx context.Context, r ControllerClient, gatewayClassName stri
gwccFiltered = append(gwccFiltered, gwcc) // gwcc targets namespace
}
}
// Namespace GatewayClassConfig targeting Gateway/HTTPRoute third
// Namespace GatewayClassConfig targeting GatewayClass third
for idx := range gwccLocal.Items {
gwcc := &gwccLocal.Items[idx]
if gwcc.Spec.TargetRef.Kind == "GatewayClass" &&
Expand Down
2 changes: 1 addition & 1 deletion doc/extended-configuration-w-policy-attachments.md
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ precedence for override's as defined by GEP-713:
- Values from `GatewayClassBlueprint`
- Values from `GatewayClassConfig` in controller namespace (aka. global policies)
- Values from `GatewayClassConfig` in `Gateway`/`HTTPRoute` local namespace targeting namespace
- Values from `GatewayClassConfig` in `Gateway`/`HTTPRoute` local namespace targeting Gateway/HTTPRoute
- Values from `GatewayClassConfig` in `Gateway`/`HTTPRoute` local namespace targeting GatewayClass
- Values from `GatewayConfig` in `Gateway`/`HTTPRoute` local namespace, targeting namespace
- Values from `GatewayConfig` in `Gateway`/`HTTPRoute` local namespace, targeting `Gateway`/`HTTPRoute` resource

Expand Down