Skip to content

OCPBUGS-49738: fix handling of host conflict #736

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

Open
jcmoraisjr wants to merge 1 commit into
base: master
Choose a base branch
from
+20 −27
Open

OCPBUGS-49738: fix handling of host conflict #736

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
47 changes: 20 additions & 27 deletions pkg/router/controller/host_admitter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package controller

import (
"fmt"
"slices"

kapi "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/util/sets"
Expand All @@ -20,29 +21,25 @@ type RouteMap map[string][]*routev1.Route

// RemoveRoute removes any existing routes that match the given route's namespace and name for a key
func (srm RouteMap) RemoveRoute(key string, route *routev1.Route) bool {
k := 0
removed := false
source := srm[key]
removed := slices.DeleteFunc(source, func(r *routev1.Route) bool {
return r.Namespace == route.Namespace && r.Name == route.Name
})

m := srm[key]
for i, v := range m {
if m[i].Namespace == route.Namespace && m[i].Name == route.Name {
removed = true
} else {
m[k] = v
k++
}
}

// set the slice length to the final size.
m = m[:k]

if len(m) > 0 {
srm[key] = m
if len(removed) > 0 {
srm[key] = removed
} else {
delete(srm, key)
}

return removed
return len(source) > len(removed)
}

// RemoveRouteFromAllKeys removes a route from all keys in the map based on namespace and name
func (srm RouteMap) RemoveRouteFromAllKeys(route *routev1.Route) {
for key := range srm {
srm.RemoveRoute(key, route)
}
}

func (srm RouteMap) InsertRoute(key string, route *routev1.Route) {
Expand Down Expand Up @@ -207,6 +204,11 @@ func (p *HostAdmitter) addRoute(route *routev1.Route) error {
p.plugin.HandleRoute(watch.Deleted, displacedRoute)
}

// Remove old entries for this route from all hosts, this handles the change of the host value
p.claimedHosts.RemoveRouteFromAllKeys(route)
p.blockedWildcards.RemoveRouteFromAllKeys(route)
p.claimedWildcards.RemoveRouteFromAllKeys(route)

if len(route.Spec.WildcardPolicy) == 0 {
route.Spec.WildcardPolicy = routev1.WildcardPolicyNone
}
Expand All @@ -219,19 +221,10 @@ func (p *HostAdmitter) addRoute(route *routev1.Route) error {
// claim the host, block wildcards that would conflict with this host
p.claimedHosts.InsertRoute(route.Spec.Host, route)
p.blockedWildcards.InsertRoute(wildcardKey, route)
// ensure the route doesn't exist as a claimed wildcard (in case it previously was)
p.claimedWildcards.RemoveRoute(wildcardKey, route)

case routev1.WildcardPolicySubdomain:
// claim the wildcard
p.claimedWildcards.InsertRoute(wildcardKey, route)
// ensure the route doesn't exist as a claimed host or blocked wildcard
p.claimedHosts.RemoveRoute(route.Spec.Host, route)
p.blockedWildcards.RemoveRoute(wildcardKey, route)
default:
p.claimedHosts.RemoveRoute(route.Spec.Host, route)
p.claimedWildcards.RemoveRoute(wildcardKey, route)
p.blockedWildcards.RemoveRoute(wildcardKey, route)
err := fmt.Errorf("unsupported wildcard policy %s", route.Spec.WildcardPolicy)
p.recorder.RecordRouteRejection(route, "RouteNotAdmitted", err.Error())
return err
Expand Down