From b5fd7971b6b2a125cf21ffb8944b2ab0b84fa6c6 Mon Sep 17 00:00:00 2001 From: Lubron Zhan Date: Wed, 24 Jul 2024 15:28:14 -0700 Subject: [PATCH] Resolve comments Signed-off-by: Lubron Zhan --- changelogs/CHANGELOG-v1.29.0.md | 2 +- changelogs/unreleased/6566-lubronzhan-minor.md | 2 +- internal/dag/gatewayapi_processor_test.go | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/changelogs/CHANGELOG-v1.29.0.md b/changelogs/CHANGELOG-v1.29.0.md index 09e9394a5b2..c40077fbb02 100644 --- a/changelogs/CHANGELOG-v1.29.0.md +++ b/changelogs/CHANGELOG-v1.29.0.md @@ -67,7 +67,7 @@ It's possible that multiple HTTPRoutes will define the same Match conditions. In - The oldest Route based on creation timestamp. For example, a Route with a creation timestamp of “2020-09-08 01:02:03” is given precedence over a Route with a creation timestamp of “2020-09-08 01:02:04”. - The Route appearing first in alphabetical order (namespace/name) for example, foo/bar is given precedence over foo/baz. -With above ordering, any HTTPRoute that ranks lower, will be marked with below conditions accordionly +With above ordering, any HTTPRoute that ranks lower, will be marked with below conditions accordingly 1. If only partial rules under this HTTPRoute are conflicted, it's marked with `Accepted: True` and `PartiallyInvalid: true` Conditions and Reason: `RuleMatchPartiallyConflict`. 2. If all the rules under this HTTPRoute are conflicted, it's marked with `Accepted: False` Condition and Reason `RuleMatchConflict`. diff --git a/changelogs/unreleased/6566-lubronzhan-minor.md b/changelogs/unreleased/6566-lubronzhan-minor.md index cda74b06ac1..b971accfbb9 100644 --- a/changelogs/unreleased/6566-lubronzhan-minor.md +++ b/changelogs/unreleased/6566-lubronzhan-minor.md @@ -5,6 +5,6 @@ It's possible that multiple GRPCRoutes will define the same Match conditions. In - The oldest Route based on creation timestamp. For example, a Route with a creation timestamp of “2020-09-08 01:02:03” is given precedence over a Route with a creation timestamp of “2020-09-08 01:02:04”. - The Route appearing first in alphabetical order (namespace/name) for example, foo/bar is given precedence over foo/baz. -With above ordering, any GRPCRoute that ranks lower, will be marked with below conditions accordionly +With above ordering, any GRPCRoute that ranks lower, will be marked with below conditions accordingly: 1. If only partial rules under this GRPCRoute are conflicted, it's marked with `Accepted: True` and `PartiallyInvalid: true` Conditions and Reason: `RuleMatchPartiallyConflict`. 2. If all the rules under this GRPCRoute are conflicted, it's marked with `Accepted: False` Condition and Reason `RuleMatchConflict`. diff --git a/internal/dag/gatewayapi_processor_test.go b/internal/dag/gatewayapi_processor_test.go index c4b0a3de608..55a656fa8c4 100644 --- a/internal/dag/gatewayapi_processor_test.go +++ b/internal/dag/gatewayapi_processor_test.go @@ -1149,7 +1149,7 @@ func TestSortGRPCRoutes(t *testing.T) { expected []*gatewayapi_v1.GRPCRoute }{ { - name: "3 httproutes, with different timestamp, earlier one should be first ", + name: "3 grpcroutes, with different timestamp, earlier one should be first ", m: map[types.NamespacedName]*gatewayapi_v1.GRPCRoute{ { Namespace: "ns", Name: "name1", @@ -1204,7 +1204,7 @@ func TestSortGRPCRoutes(t *testing.T) { }, }, { - name: "3 httproutes with same creation timestamps, same namespaces, smaller name comes first", + name: "3 grpcroutes with same creation timestamps, same namespaces, smaller name comes first", m: map[types.NamespacedName]*gatewayapi_v1.GRPCRoute{ { Namespace: "ns", Name: "name3", @@ -1259,7 +1259,7 @@ func TestSortGRPCRoutes(t *testing.T) { }, }, { - name: "3 httproutes with same creation timestamp, smaller namespaces comes first", + name: "3 grpcroutes with same creation timestamp, smaller namespaces comes first", m: map[types.NamespacedName]*gatewayapi_v1.GRPCRoute{ { Namespace: "ns3", Name: "name1",