Skip to content
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

perf: optimize the modification of rollout to httproute header #137

Merged
merged 1 commit into from
Jun 28, 2023
Merged

perf: optimize the modification of rollout to httproute header #137

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
14 changes: 10 additions & 4 deletions pkg/trafficrouting/network/gateway/gateway.go
View file
Open in desktop
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 @@ -159,10 +159,16 @@ func (r *gatewayController) buildCanaryHeaderHttpRoutes(rules []gatewayv1alpha2.
canaryRef.Name = gatewayv1alpha2.ObjectName(r.conf.CanaryService)
canaryRule.BackendRefs = []gatewayv1alpha2.HTTPBackendRef{*canaryRef}
// set canary headers in httpRoute
var newMatches []gatewayv1alpha2.HTTPRouteMatch
for j := range canaryRule.Matches {
match := &canaryRule.Matches[j]
match.Headers = append(match.Headers, headers...)
canaryRuleMatch := &canaryRule.Matches[j]
for k := range matchs {
canaryRuleMatchBase := *canaryRuleMatch
canaryRuleMatchBase.Headers = append(canaryRuleMatchBase.Headers, matchs[k].Headers...)
newMatches = append(newMatches, canaryRuleMatchBase)
}
}
canaryRule.Matches = newMatches
canarys = append(canarys, *canaryRule)
}
desired = append(desired, canarys...)
Expand Down
64 changes: 64 additions & 0 deletions pkg/trafficrouting/network/gateway/gateway_test.go
View file
Open in desktop
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 Expand Up @@ -183,6 +195,26 @@ func TestBuildDesiredHTTPRoute(t *testing.T) {
},
},
},
{
Path: &gatewayv1alpha2.HTTPPathMatch{
Value: utilpointer.String("/store"),
},
Headers: []gatewayv1alpha2.HTTPHeaderMatch{
{
Name: "version",
Value: "v2",
},
{
Name: "user_id",
Value: "234*",
Type: &iType,
},
{
Name: "canary",
Value: "true",
},
},
},
{
Path: &gatewayv1alpha2.HTTPPathMatch{
Value: utilpointer.String("/v2/store"),
Expand All @@ -199,6 +231,22 @@ func TestBuildDesiredHTTPRoute(t *testing.T) {
},
},
},
{
Path: &gatewayv1alpha2.HTTPPathMatch{
Value: utilpointer.String("/v2/store"),
},
Headers: []gatewayv1alpha2.HTTPHeaderMatch{
{
Name: "user_id",
Value: "234*",
Type: &iType,
},
{
Name: "canary",
Value: "true",
},
},
},
},
BackendRefs: []gatewayv1alpha2.HTTPBackendRef{
{
Expand Down Expand Up @@ -230,6 +278,22 @@ func TestBuildDesiredHTTPRoute(t *testing.T) {
},
},
},
{
Path: &gatewayv1alpha2.HTTPPathMatch{
Value: utilpointer.String("/storage"),
},
Headers: []gatewayv1alpha2.HTTPHeaderMatch{
{
Name: "user_id",
Value: "234*",
Type: &iType,
},
{
Name: "canary",
Value: "true",
},
},
},
},
BackendRefs: []gatewayv1alpha2.HTTPBackendRef{
{
Expand Down