Skip to content

Fix broken update handling of path-based routes #21877

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
openshift-merge-robot merged 1 commit into from
Jan 29, 2019
Merged

Fix broken update handling of path-based routes #21877

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion pkg/router/controller/hostindex/hostindex.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,10 @@ func (hi *hostIndex) add(route *routev1.Route, changes *routeChanges) bool {
hi.remove(existing, false, changes)
// uid changed, which means this is
case existing.Spec.Path != route.Spec.Path:
// path changed, must check to see if we displace / are displaced by another route
// path changed, must check to see if we displace / are displaced by
// another route. Remove the existing state to avoid maintaining a
// duplicate claim in the index.
hi.remove(existing, false, changes)
default:
// if no changes have been made, we don't need to note a change
if existing.ResourceVersion == route.ResourceVersion {
Expand Down
58 changes: 58 additions & 0 deletions pkg/router/controller/hostindex/hostindex_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,64 @@ func Test_hostIndex(t *testing.T) {
},
active: map[string][]string{"test.com": {"001"}},
},
{
name: "multiple changes to same path-based route",
activateFn: SameNamespace,
steps: []step{
{route: newRoute("test", "1", 1, 1, routev1.RouteSpec{Host: "test.com", Path: "/foo"})},
{route: newRoute("test", "1", 1, 2, routev1.RouteSpec{Host: "test.com", Path: "/bar"})},
{route: newRoute("test", "1", 1, 3, routev1.RouteSpec{Host: "test.com", Path: "/foo"})},
{route: newRoute("test", "1", 1, 4, routev1.RouteSpec{Host: "test.com", Path: "/bar"})},
{route: newRoute("test", "1", 1, 5, routev1.RouteSpec{Host: "test.com", Path: "/foo"})},
},
active: map[string][]string{"test.com": {"001"}},
activates: map[string]struct{}{"001": {}},
},
{
name: "remove unchanged path-based route",
activateFn: SameNamespace,
steps: []step{
{route: newRoute("test", "1", 1, 1, routev1.RouteSpec{Host: "test.com", Path: "/foo"})},
{remove: true, route: newRoute("test", "1", 0, 1, routev1.RouteSpec{Host: "test.com", Path: "/foo"})},
},
},
{
name: "remove updated path-based route",
activateFn: SameNamespace,
steps: []step{
{route: newRoute("test", "1", 1, 1, routev1.RouteSpec{Host: "test.com", Path: "/foo"})},
{route: newRoute("test", "1", 1, 2, routev1.RouteSpec{Host: "test.com", Path: "/bar"})},
{route: newRoute("test", "1", 1, 3, routev1.RouteSpec{Host: "test.com", Path: "/foo"})},
{route: newRoute("test", "1", 1, 4, routev1.RouteSpec{Host: "test.com", Path: "/bar"})},
{remove: true, route: newRoute("test", "1", 1, 4, routev1.RouteSpec{Host: "test.com", Path: "/bar"})},
},
},
{
name: "missed delete of path-based route",
activateFn: SameNamespace,
steps: []step{
{route: newRoute("test", "1", 2, 1, routev1.RouteSpec{Host: "test.com", Path: "/foo"})},
{route: newRoute("test", "2", 1, 1, routev1.RouteSpec{Host: "test.com", Path: "/foo"})},
},
newRoute: true,
active: map[string][]string{"test.com": {"001"}},
activates: map[string]struct{}{"001": {}},
displaces: map[string]struct{}{"002": {}},
inactive: map[string][]string{"test.com": {"002"}},
},
{
name: "path-based route rejection",
activateFn: SameNamespace,
steps: []step{
{route: newRoute("test", "1", 1, 1, routev1.RouteSpec{Host: "test.com", Path: "/x/y/z"})},
{route: newRoute("test", "2", 2, 1, routev1.RouteSpec{Host: "test.com", Path: "/foo"})},
{route: newRoute("test", "2", 2, 2, routev1.RouteSpec{Host: "test.com", Path: "/bar"})},
{route: newRoute("test", "2", 2, 3, routev1.RouteSpec{Host: "test.com", Path: "/x/y/z"})},
},
active: map[string][]string{"test.com": {"001"}},
displaces: map[string]struct{}{"002": {}},
inactive: map[string][]string{"test.com": {"002"}},
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
Expand Down