Skip to content

Commit

Permalink
fix: rule level filters and backend level filters
Browse files Browse the repository at this point in the history 
Signed-off-by: Lin Yang <[email protected]>
  • Loading branch information
@reaver-flomesh
reaver-flomesh committed Sep 13, 2023
1 parent d77f3d6 commit 15cdcc8
Show file tree
Hide file tree
Showing 4 changed files with 119 additions and 76 deletions.
130 changes: 65 additions & 65 deletions pkg/gateway/cache/cache.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -564,8 +564,8 @@ func (c *GatewayCache) routeRules(gw *gwv1beta1.Gateway, validListeners []gwtype

httpRoute := route.(*gwv1beta1.HTTPRoute)
log.Debug().Msgf("Processing HTTPRoute %v", httpRoute)
processHTTPRoute(gw, validListeners, httpRoute, rules)
processHTTPRouteBackendFilters(httpRoute, services)
processHTTPRoute(gw, validListeners, httpRoute, rules, services)
//processHTTPRouteBackendFilters(httpRoute, services)
}

log.Debug().Msgf("Processing %d GRPCRoutes", len(c.grpcroutes))
Expand All @@ -582,8 +582,8 @@ func (c *GatewayCache) routeRules(gw *gwv1beta1.Gateway, validListeners []gwtype
}

grpcRoute := route.(*gwv1alpha2.GRPCRoute)
processGRPCRoute(gw, validListeners, grpcRoute, rules)
processGRPCRouteBackendFilters(grpcRoute, services)
processGRPCRoute(gw, validListeners, grpcRoute, rules, services)
//processGRPCRouteBackendFilters(grpcRoute, services)
}

log.Debug().Msgf("Processing %d TLSRoutes", len(c.tlsroutes))
Expand Down Expand Up @@ -625,7 +625,7 @@ func (c *GatewayCache) routeRules(gw *gwv1beta1.Gateway, validListeners []gwtype
return rules, services
}

func processHTTPRoute(gw *gwv1beta1.Gateway, validListeners []gwtypes.Listener, httpRoute *gwv1beta1.HTTPRoute, rules map[int32]routecfg.RouteRule) {
func processHTTPRoute(gw *gwv1beta1.Gateway, validListeners []gwtypes.Listener, httpRoute *gwv1beta1.HTTPRoute, rules map[int32]routecfg.RouteRule, services map[string]serviceInfo) {
for _, ref := range httpRoute.Spec.ParentRefs {
if !gwutils.IsRefToGateway(ref, gwutils.ObjectKey(gw)) {
continue
Expand All @@ -648,7 +648,7 @@ func processHTTPRoute(gw *gwv1beta1.Gateway, validListeners []gwtypes.Listener,

httpRule := routecfg.L7RouteRule{}
for _, hostname := range hostnames {
httpRule[hostname] = generateHTTPRouteConfig(httpRoute)
httpRule[hostname] = generateHTTPRouteConfig(httpRoute, services)
}

port := int32(listener.Port)
Expand All @@ -663,7 +663,7 @@ func processHTTPRoute(gw *gwv1beta1.Gateway, validListeners []gwtypes.Listener,
}
}

func processGRPCRoute(gw *gwv1beta1.Gateway, validListeners []gwtypes.Listener, grpcRoute *gwv1alpha2.GRPCRoute, rules map[int32]routecfg.RouteRule) {
func processGRPCRoute(gw *gwv1beta1.Gateway, validListeners []gwtypes.Listener, grpcRoute *gwv1alpha2.GRPCRoute, rules map[int32]routecfg.RouteRule, services map[string]serviceInfo) {
for _, ref := range grpcRoute.Spec.ParentRefs {
if !gwutils.IsRefToGateway(ref, gwutils.ObjectKey(gw)) {
continue
Expand All @@ -684,7 +684,7 @@ func processGRPCRoute(gw *gwv1beta1.Gateway, validListeners []gwtypes.Listener,

grpcRule := routecfg.L7RouteRule{}
for _, hostname := range hostnames {
grpcRule[hostname] = generateGRPCRouteCfg(grpcRoute)
grpcRule[hostname] = generateGRPCRouteCfg(grpcRoute, services)
}

port := int32(listener.Port)
Expand Down Expand Up @@ -792,63 +792,63 @@ func processTCPRoute(gw *gwv1beta1.Gateway, validListeners []gwtypes.Listener, t
}
}

func processHTTPRouteBackendFilters(httpRoute *gwv1beta1.HTTPRoute, services map[string]serviceInfo) {
// For now, ONLY supports unique filter types, cannot specify one type filter multiple times
for _, rule := range httpRoute.Spec.Rules {
ruleLevelFilters := make(map[gwv1beta1.HTTPRouteFilterType]routecfg.Filter)

for _, ruleFilter := range rule.Filters {
ruleLevelFilters[ruleFilter.Type] = ruleFilter
}

for _, backend := range rule.BackendRefs {
if svcPort := backendRefToServicePortName(backend.BackendRef, httpRoute.Namespace); svcPort != nil {
svcFilters := copyMap(ruleLevelFilters)
for _, svcFilter := range backend.Filters {
svcFilters[svcFilter.Type] = svcFilter
}

svcInfo := serviceInfo{
svcPortName: *svcPort,
filters: make([]routecfg.Filter, 0),
}
for _, f := range svcFilters {
svcInfo.filters = append(svcInfo.filters, f)
}
services[svcPort.String()] = svcInfo
}
}
}
}

func processGRPCRouteBackendFilters(grpcRoute *gwv1alpha2.GRPCRoute, services map[string]serviceInfo) {
// For now, ONLY supports unique filter types, cannot specify one type filter multiple times
for _, rule := range grpcRoute.Spec.Rules {
ruleLevelFilters := make(map[gwv1alpha2.GRPCRouteFilterType]routecfg.Filter)

for _, ruleFilter := range rule.Filters {
ruleLevelFilters[ruleFilter.Type] = ruleFilter
}

for _, backend := range rule.BackendRefs {
if svcPort := backendRefToServicePortName(backend.BackendRef, grpcRoute.Namespace); svcPort != nil {
svcFilters := copyMap(ruleLevelFilters)
for _, svcFilter := range backend.Filters {
svcFilters[svcFilter.Type] = svcFilter
}
//func processHTTPRouteBackendFilters(httpRoute *gwv1beta1.HTTPRoute, services map[string]serviceInfo) {
// // For now, ONLY supports unique filter types, cannot specify one type filter multiple times
// for _, rule := range httpRoute.Spec.Rules {
// ruleLevelFilters := make(map[gwv1beta1.HTTPRouteFilterType]routecfg.Filter)
//
// for _, ruleFilter := range rule.Filters {
// ruleLevelFilters[ruleFilter.Type] = ruleFilter
// }
//
// for _, backend := range rule.BackendRefs {
// if svcPort := backendRefToServicePortName(backend.BackendRef, httpRoute.Namespace); svcPort != nil {
// svcFilters := copyMap(ruleLevelFilters)
// for _, svcFilter := range backend.Filters {
// svcFilters[svcFilter.Type] = svcFilter
// }
//
// svcInfo := serviceInfo{
// svcPortName: *svcPort,
// filters: make([]routecfg.Filter, 0),
// }
// for _, f := range svcFilters {
// svcInfo.filters = append(svcInfo.filters, f)
// }
// services[svcPort.String()] = svcInfo
// }
// }
// }
//}

svcInfo := serviceInfo{
svcPortName: *svcPort,
filters: make([]routecfg.Filter, 0),
}
for _, f := range svcFilters {
svcInfo.filters = append(svcInfo.filters, f)
}
services[svcPort.String()] = svcInfo
}
}
}
}
//func processGRPCRouteBackendFilters(grpcRoute *gwv1alpha2.GRPCRoute, services map[string]serviceInfo) {
// // For now, ONLY supports unique filter types, cannot specify one type filter multiple times
// for _, rule := range grpcRoute.Spec.Rules {
// ruleLevelFilters := make(map[gwv1alpha2.GRPCRouteFilterType]routecfg.Filter)
//
// for _, ruleFilter := range rule.Filters {
// ruleLevelFilters[ruleFilter.Type] = ruleFilter
// }
//
// for _, backend := range rule.BackendRefs {
// if svcPort := backendRefToServicePortName(backend.BackendRef, grpcRoute.Namespace); svcPort != nil {
// svcFilters := copyMap(ruleLevelFilters)
// for _, svcFilter := range backend.Filters {
// svcFilters[svcFilter.Type] = svcFilter
// }
//
// svcInfo := serviceInfo{
// svcPortName: *svcPort,
// filters: make([]routecfg.Filter, 0),
// }
// for _, f := range svcFilters {
// svcInfo.filters = append(svcInfo.filters, f)
// }
// services[svcPort.String()] = svcInfo
// }
// }
// }
//}

func processTLSBackends(_ *gwv1alpha2.TLSRoute, _ map[string]serviceInfo) {
// DO nothing for now
Expand Down Expand Up @@ -931,7 +931,7 @@ func (c *GatewayCache) serviceConfigs(services map[string]serviceInfo) map[strin
}

svcCfg := routecfg.ServiceConfig{
Filters: svcInfo.filters,
//Filters: svcInfo.filters,
Endpoints: make(map[string]routecfg.Endpoint),
}

Expand Down
48 changes: 42 additions & 6 deletions pkg/gateway/cache/cacheutils.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,24 +26,42 @@ func getSecretRefNamespace(gw *gwv1beta1.Gateway, secretRef gwv1beta1.SecretObje
return string(*secretRef.Namespace)
}

func generateHTTPRouteConfig(httpRoute *gwv1beta1.HTTPRoute) routecfg.HTTPRouteRuleSpec {
func generateHTTPRouteConfig(httpRoute *gwv1beta1.HTTPRoute, services map[string]serviceInfo) routecfg.HTTPRouteRuleSpec {
httpSpec := routecfg.HTTPRouteRuleSpec{
RouteType: routecfg.L7RouteTypeHTTP,
Matches: make([]routecfg.HTTPTrafficMatch, 0),
}

for _, rule := range httpRoute.Spec.Rules {
backends := map[string]int32{}
backends := map[string]routecfg.BackendServiceConfig{}

for _, bk := range rule.BackendRefs {
if svcPort := backendRefToServicePortName(bk.BackendRef, httpRoute.Namespace); svcPort != nil {
backends[svcPort.String()] = backendWeight(bk.BackendRef)
svcLevelFilters := make([]routecfg.Filter, 0)
for _, filter := range bk.Filters {
svcLevelFilters = append(svcLevelFilters, filter)
}

backends[svcPort.String()] = routecfg.BackendServiceConfig{
Weight: backendWeight(bk.BackendRef),
Filters: svcLevelFilters,
}

services[svcPort.String()] = serviceInfo{
svcPortName: *svcPort,
}
}
}

ruleLevelFilters := make([]routecfg.Filter, 0)
for _, ruleFilter := range rule.Filters {
ruleLevelFilters = append(ruleLevelFilters, ruleFilter)
}

for _, m := range rule.Matches {
match := routecfg.HTTPTrafficMatch{
BackendService: backends,
Filters: ruleLevelFilters,
}

if m.Path != nil {
Expand Down Expand Up @@ -157,24 +175,42 @@ func httpMatchQueryParams(m gwv1beta1.HTTPRouteMatch) map[routecfg.MatchType]map
return params
}

func generateGRPCRouteCfg(grpcRoute *gwv1alpha2.GRPCRoute) routecfg.GRPCRouteRuleSpec {
func generateGRPCRouteCfg(grpcRoute *gwv1alpha2.GRPCRoute, services map[string]serviceInfo) routecfg.GRPCRouteRuleSpec {
grpcSpec := routecfg.GRPCRouteRuleSpec{
RouteType: routecfg.L7RouteTypeGRPC,
Matches: make([]routecfg.GRPCTrafficMatch, 0),
}

for _, rule := range grpcRoute.Spec.Rules {
backends := map[string]int32{}
backends := map[string]routecfg.BackendServiceConfig{}

for _, bk := range rule.BackendRefs {
if svcPort := backendRefToServicePortName(bk.BackendRef, grpcRoute.Namespace); svcPort != nil {
backends[svcPort.String()] = backendWeight(bk.BackendRef)
svcLevelFilters := make([]routecfg.Filter, 0)
for _, filter := range bk.Filters {
svcLevelFilters = append(svcLevelFilters, filter)
}

backends[svcPort.String()] = routecfg.BackendServiceConfig{
Weight: backendWeight(bk.BackendRef),
Filters: svcLevelFilters,
}

services[svcPort.String()] = serviceInfo{
svcPortName: *svcPort,
}
}
}

ruleLevelFilters := make([]routecfg.Filter, 0)
for _, ruleFilter := range rule.Filters {
ruleLevelFilters = append(ruleLevelFilters, ruleFilter)
}

for _, m := range rule.Matches {
match := routecfg.GRPCTrafficMatch{
BackendService: backends,
Filters: ruleLevelFilters,
}

if m.Method != nil {
Expand Down
2 changes: 1 addition & 1 deletion pkg/gateway/cache/types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ type Cache interface {

type serviceInfo struct {
svcPortName routecfg.ServicePortName
filters []routecfg.Filter
//filters []routecfg.Filter
}

type endpointInfo struct {
Expand Down
15 changes: 11 additions & 4 deletions pkg/gateway/routecfg/types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,21 +152,28 @@ type UDPRouteRule map[string]int32

var _ RouteRule = &UDPRouteRule{}

type BackendServiceConfig struct {
Weight int32 `json:"Weight"`
Filters []Filter `json:"Filters,omitempty" hash:"set"`
}

// HTTPTrafficMatch is the HTTP traffic match configuration
type HTTPTrafficMatch struct {
Path *Path `json:"Path,omitempty"`
Headers map[MatchType]map[string]string `json:"Headers,omitempty"`
RequestParams map[MatchType]map[string]string `json:"RequestParams,omitempty"`
Methods []string `json:"Methods,omitempty" hash:"set"`
BackendService map[string]int32 `json:"BackendService"`
BackendService map[string]BackendServiceConfig `json:"BackendService"`
RateLimit *RateLimit `json:"RateLimit,omitempty"`
Filters []Filter `json:"Filters,omitempty" hash:"set"`
}

// GRPCTrafficMatch is the GRPC traffic match configuration
type GRPCTrafficMatch struct {
Headers map[MatchType]map[string]string `json:"Headers,omitempty"`
Method *GRPCMethod `json:"Method,omitempty"`
BackendService map[string]int32 `json:"BackendService"`
BackendService map[string]BackendServiceConfig `json:"BackendService"`
Filters []Filter `json:"Filters,omitempty" hash:"set"`
}

// Path is the path configuration
Expand Down Expand Up @@ -197,8 +204,8 @@ type PassthroughRouteMapping map[string]string

// ServiceConfig is the service configuration
type ServiceConfig struct {
Endpoints map[string]Endpoint `json:"Endpoints"`
Filters []Filter `json:"Filters,omitempty" hash:"set"`
Endpoints map[string]Endpoint `json:"Endpoints"`
//Filters []Filter `json:"Filters,omitempty" hash:"set"`
ConnectionSettings *ConnectionSettings `json:"ConnectionSettings,omitempty"`
RetryPolicy *RetryPolicy `json:"RetryPolicy,omitempty"`
MTLS bool `json:"mTLS,omitempty"`
Expand Down

0 comments on commit 15cdcc8

Please sign in to comment.