jiazhizhong/higress
1
0
Fork 0
mirror of https://github.com/alibaba/higress.git synced 2026-06-09 20:57:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: routing priorities are not working properly (#472)

Browse Source 
Signed-off-by: charlie <qianglin98@qq.com>
This commit is contained in:
Qianglin Li
2023-08-11 09:55:33 +08:00
committed by GitHub
parent 35d5669b51
commit 49269b4303
5 changed files with 69 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/ingress/kube/common/tool.go
View File

@@ -170,7 +170,14 @@ func SortHTTPRoutes(routes []*WrapperHTTPRoute) {
isAllCatch := func(route *WrapperHTTPRoute) bool {
if route.OriginPathType == Prefix && route.OriginPath == "/" {
return true
if route.HTTPRoute.Match == nil {
return true
}
match := route.HTTPRoute.Match[0]
if len(match.Headers) == 0 && len(match.QueryParams) == 0 && match.Method == nil {
return true
}
}
return false
}

5
pkg/ingress/kube/ingressv1/controller.go
View File

@@ -599,11 +599,6 @@ func (c *controller) ConvertHTTPRoute(convertOptions *common.ConvertOptions, wra
} else {
convertOptions.HTTPRoutes[rule.Host] = wrapperHttpRoutes
}
// Sort, exact -> prefix -> regex
routes := convertOptions.HTTPRoutes[rule.Host]
IngressLog.Debugf("routes of host %s is %v", rule.Host, routes)
common.SortHTTPRoutes(routes)
}
return nil