Skip to content

Commit

Permalink
perf: optimize the modification of rollout to httproute header
Browse files Browse the repository at this point in the history
Signed-off-by: zhangsetsail <zqh15131121078@126.com>
  • Loading branch information
ZhangSetSail committed May 6, 2023
1 parent 5807b5b commit d05af05
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 4 deletions.
10 changes: 6 additions & 4 deletions pkg/trafficrouting/network/gateway/gateway.go
Original file line number Diff line number Diff line change
Expand Up @@ -135,13 +135,13 @@ func (r *gatewayController) buildDesiredHTTPRoute(rules []gatewayv1alpha2.HTTPRo
// according to the Gateway API definition, weight and headers cannot be supported at the same time.
// A/B Testing, according to headers. current only support one match
} else if len(matches) > 0 {
return r.buildCanaryHeaderHttpRoutes(rules, matches[0].Headers)
return r.buildCanaryHeaderHttpRoutes(rules, matches)
}
// canary release, according to percentage of traffic routing
return r.buildCanaryWeightHttpRoutes(rules, weight)
}

func (r *gatewayController) buildCanaryHeaderHttpRoutes(rules []gatewayv1alpha2.HTTPRouteRule, headers []gatewayv1alpha2.HTTPHeaderMatch) []gatewayv1alpha2.HTTPRouteRule {
func (r *gatewayController) buildCanaryHeaderHttpRoutes(rules []gatewayv1alpha2.HTTPRouteRule, matchs []rolloutv1alpha1.HttpRouteMatch) []gatewayv1alpha2.HTTPRouteRule {
var desired []gatewayv1alpha2.HTTPRouteRule
var canarys []gatewayv1alpha2.HTTPRouteRule
for i := range rules {
Expand All @@ -160,8 +160,10 @@ func (r *gatewayController) buildCanaryHeaderHttpRoutes(rules []gatewayv1alpha2.
canaryRule.BackendRefs = []gatewayv1alpha2.HTTPBackendRef{*canaryRef}
// set canary headers in httpRoute
for j := range canaryRule.Matches {
match := &canaryRule.Matches[j]
match.Headers = append(match.Headers, headers...)
for k := range matchs {
match := &canaryRule.Matches[j]
match.Headers = append(match.Headers, matchs[k].Headers...)
}
}
canarys = append(canarys, *canaryRule)
}
Expand Down
12 changes: 12 additions & 0 deletions pkg/trafficrouting/network/gateway/gateway_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,18 @@ func TestBuildDesiredHTTPRoute(t *testing.T) {
Value: "true",
},
},
}, {
Headers: []gatewayv1alpha2.HTTPHeaderMatch{
{
Name: "user_id",
Value: "234*",
Type: &iType,
},
{
Name: "canary",
Value: "true",
},
},
},
}
},
Expand Down

0 comments on commit d05af05

Please sign in to comment.