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

EndpointSlice to IR Route Destinations #1494

Merged
merged 13 commits into from
Sep 26, 2023
Merged

EndpointSlice to IR Route Destinations #1494

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
f901043
EndpointSlice to IR Route Destinations
arkodg Jun 6, 2023
64edb53
fix tests
arkodg Jun 7, 2023
96ca31d
lint
arkodg Jun 8, 2023
71ca13c
fix build
arkodg Sep 15, 2023
7c0a54d
add serviceimport back
arkodg Sep 15, 2023
9859363
more fixes
arkodg Sep 19, 2023
0c1b18c
lint
arkodg Sep 19, 2023
4c30511
fix test errors
arkodg Sep 19, 2023
f8c204c
link using svc and endpoint name
arkodg Sep 19, 2023
c9ea365
assign backend weight to locality weight
arkodg Sep 21, 2023
eeec1ea
fix tests
arkodg Sep 25, 2023
a6a50ad
lint
arkodg Sep 26, 2023
fc2c67b
fix panic
arkodg Sep 26, 2023
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
6 changes: 4 additions & 2 deletions api/config/v1alpha1/validation/testdata/valid-user-bootstrap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,10 @@ staticResources:
loadAssignment:
clusterName: xds_cluster
endpoints:
- lbEndpoints:
- endpoint:
- loadBalancingWeight: 1
lbEndpoints:
- loadBalancingWeight: 1
endpoint:
address:
socketAddress:
address: envoy-gateway
Expand Down
9 changes: 6 additions & 3 deletions internal/cmd/egctl/testdata/translate/out/authn-single-route-single-match-to-xds.all.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,11 @@
"portValue": 18000
}
}
}
},
"loadBalancingWeight": 1
}
]
],
"loadBalancingWeight": 1
}
]
},
Expand Down Expand Up @@ -261,7 +263,8 @@
"portValue": 443
}
}
}
},
"loadBalancingWeight": 1
}
],
"loadBalancingWeight": 1,
Expand Down
3 changes: 3 additions & 0 deletions internal/cmd/egctl/testdata/translate/out/authn-single-route-single-match-to-xds.all.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ xds:
socketAddress:
address: envoy-gateway
portValue: 18000
loadBalancingWeight: 1
loadBalancingWeight: 1
name: xds_cluster
transportSocket:
name: envoy.transport_sockets.tls
Expand Down Expand Up @@ -153,6 +155,7 @@ xds:
socketAddress:
address: raw.githubusercontent.com
portValue: 443
loadBalancingWeight: 1
loadBalancingWeight: 1
locality: {}
name: raw_githubusercontent_com_443
Expand Down
2 changes: 2 additions & 0 deletions ...al/cmd/egctl/testdata/translate/out/authn-single-route-single-match-to-xds.bootstrap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ xds:
socketAddress:
address: envoy-gateway
portValue: 18000
loadBalancingWeight: 1
loadBalancingWeight: 1
name: xds_cluster
transportSocket:
name: envoy.transport_sockets.tls
Expand Down
1 change: 1 addition & 0 deletions ...rnal/cmd/egctl/testdata/translate/out/authn-single-route-single-match-to-xds.cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ xds:
socketAddress:
address: raw.githubusercontent.com
portValue: 443
loadBalancingWeight: 1
loadBalancingWeight: 1
locality: {}
name: raw_githubusercontent_com_443
Expand Down
10 changes: 8 additions & 2 deletions internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,10 @@ envoyProxy:
load_assignment:
cluster_name: xds_cluster
endpoints:
- lb_endpoints:
- endpoint:
- load_balancing_weight: 1
lb_endpoints:
- load_balancing_weight: 1
endpoint:
address:
socket_address:
address: envoy-gateway
Expand Down Expand Up @@ -479,6 +481,8 @@ xds:
socketAddress:
address: envoy-gateway
portValue: 18000
loadBalancingWeight: 1
loadBalancingWeight: 1
name: xds_cluster
transportSocket:
name: envoy.transport_sockets.tls
Expand Down Expand Up @@ -582,6 +586,7 @@ xds:
socketAddress:
address: 127.0.0.1
portValue: 3000
loadBalancingWeight: 1
loadBalancingWeight: 1
locality: {}
- endpointConfig:
Expand All @@ -594,6 +599,7 @@ xds:
socketAddress:
address: 127.0.0.1
portValue: 3000
loadBalancingWeight: 1
loadBalancingWeight: 1
locality: {}
- '@type': type.googleapis.com/envoy.admin.v3.ClustersConfigDump
Expand Down
2 changes: 2 additions & 0 deletions internal/cmd/egctl/testdata/translate/out/envoy-patch-policy.all.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ xds:
socketAddress:
address: envoy-gateway
portValue: 18000
loadBalancingWeight: 1
loadBalancingWeight: 1
name: xds_cluster
transportSocket:
name: envoy.transport_sockets.tls
Expand Down
12 changes: 8 additions & 4 deletions internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,11 @@
"portValue": 18000
}
}
}
},
"loadBalancingWeight": 1
}
]
],
"loadBalancingWeight": 1
}
]
},
Expand Down Expand Up @@ -276,7 +278,8 @@
"portValue": 3000
}
}
}
},
"loadBalancingWeight": 1
}
],
"loadBalancingWeight": 1,
Expand All @@ -300,7 +303,8 @@
"portValue": 3000
}
}
}
},
"loadBalancingWeight": 1
}
],
"loadBalancingWeight": 1,
Expand Down
4 changes: 4 additions & 0 deletions internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ xds:
socketAddress:
address: envoy-gateway
portValue: 18000
loadBalancingWeight: 1
loadBalancingWeight: 1
name: xds_cluster
transportSocket:
name: envoy.transport_sockets.tls
Expand Down Expand Up @@ -154,6 +156,7 @@ xds:
socketAddress:
address: 1.1.1.1
portValue: 3000
loadBalancingWeight: 1
loadBalancingWeight: 1
locality: {}
- endpointConfig:
Expand All @@ -166,6 +169,7 @@ xds:
socketAddress:
address: 1.1.1.1
portValue: 3000
loadBalancingWeight: 1
loadBalancingWeight: 1
locality: {}
- '@type': type.googleapis.com/envoy.admin.v3.ClustersConfigDump
Expand Down
2 changes: 2 additions & 0 deletions internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.bootstrap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ xds:
socketAddress:
address: envoy-gateway
portValue: 18000
loadBalancingWeight: 1
loadBalancingWeight: 1
name: xds_cluster
transportSocket:
name: envoy.transport_sockets.tls
Expand Down
2 changes: 2 additions & 0 deletions internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.endpoint.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ xds:
socketAddress:
address: 1.1.1.1
portValue: 3000
loadBalancingWeight: 1
loadBalancingWeight: 1
locality: {}
- endpointConfig:
Expand All @@ -63,5 +64,6 @@ xds:
socketAddress:
address: 1.1.1.1
portValue: 3000
loadBalancingWeight: 1
loadBalancingWeight: 1
locality: {}
9 changes: 6 additions & 3 deletions .../egctl/testdata/translate/out/rate-limit-filter-single-route-single-match-to-xds.all.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,11 @@
"portValue": 18000
}
}
}
},
"loadBalancingWeight": 1
}
]
],
"loadBalancingWeight": 1
}
]
},
Expand Down Expand Up @@ -261,7 +263,8 @@
"portValue": 8081
}
}
}
},
"loadBalancingWeight": 1
}
],
"loadBalancingWeight": 1,
Expand Down
3 changes: 3 additions & 0 deletions .../egctl/testdata/translate/out/rate-limit-filter-single-route-single-match-to-xds.all.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ xds:
socketAddress:
address: envoy-gateway
portValue: 18000
loadBalancingWeight: 1
loadBalancingWeight: 1
name: xds_cluster
transportSocket:
name: envoy.transport_sockets.tls
Expand Down Expand Up @@ -153,6 +155,7 @@ xds:
socketAddress:
address: envoy-ratelimit.envoy-gateway.svc.cluster.local
portValue: 8081
loadBalancingWeight: 1
loadBalancingWeight: 1
locality: {}
name: ratelimit_cluster
Expand Down
2 changes: 2 additions & 0 deletions .../testdata/translate/out/rate-limit-filter-single-route-single-match-to-xds.bootstrap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ xds:
socketAddress:
address: envoy-gateway
portValue: 18000
loadBalancingWeight: 1
loadBalancingWeight: 1
name: xds_cluster
transportSocket:
name: envoy.transport_sockets.tls
Expand Down
1 change: 1 addition & 0 deletions ...tl/testdata/translate/out/rate-limit-filter-single-route-single-match-to-xds.cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ xds:
socketAddress:
address: envoy-ratelimit.envoy-gateway.svc.cluster.local
portValue: 8081
loadBalancingWeight: 1
loadBalancingWeight: 1
locality: {}
name: ratelimit_cluster
Expand Down
14 changes: 8 additions & 6 deletions internal/cmd/egctl/translate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,9 +262,10 @@ func translateGatewayAPIToGatewayAPI(resources *gatewayapi.Resources) (gatewayap

// Translate from Gateway API to Xds IR
gTranslator := &gatewayapi.Translator{
GatewayControllerName: egv1alpha1.GatewayControllerName,
GatewayClassName: v1beta1.ObjectName(resources.GatewayClass.Name),
GlobalRateLimitEnabled: true,
GatewayControllerName: egv1alpha1.GatewayControllerName,
GatewayClassName: v1beta1.ObjectName(resources.GatewayClass.Name),
GlobalRateLimitEnabled: true,
EndpointRoutingDisabled: true,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I understand that we want the routing behavior to be backward compatible, but I think using endpoints as default to route traffic allows EG to bypass kube-proxy's overhead and fully leverage Envoy's advanced capabilities: more LB algorithms, session sticky, etc.

Copy link
Contributor Author

@arkodg arkodg Sep 20, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have disabled this in egctl x translate, because if we enable it, it will be mandatory, and all translations will fail if EndpointSlice is not provided by the user, this config is usually generated by k8s and is not part of user config, I was planning on raising a separate GH issue on dealing with this convenience / correctness dilemma

}
gRes := gTranslator.Translate(resources)
// Update the status of the GatewayClass based on EnvoyProxy validation
Expand Down Expand Up @@ -292,9 +293,10 @@ func translateGatewayAPIToXds(dnsDomain string, resourceType string, resources *

// Translate from Gateway API to Xds IR
gTranslator := &gatewayapi.Translator{
GatewayControllerName: egv1alpha1.GatewayControllerName,
GatewayClassName: v1beta1.ObjectName(resources.GatewayClass.Name),
GlobalRateLimitEnabled: true,
GatewayControllerName: egv1alpha1.GatewayControllerName,
GatewayClassName: v1beta1.ObjectName(resources.GatewayClass.Name),
GlobalRateLimitEnabled: true,
EndpointRoutingDisabled: true,
}
gRes := gTranslator.Translate(resources)

Expand Down
6 changes: 3 additions & 3 deletions internal/gatewayapi/filters.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -833,11 +833,11 @@ func (t *Translator) processRequestMirrorFilter(
return
}

mirrorEndpoints, _ := t.processDestEndpoints(mirrorBackendRef, filterContext.ParentRef, filterContext.Route, resources)
ds, _ := t.processDestination(mirrorBackendRef, filterContext.ParentRef, filterContext.Route, resources)

newMirror := &ir.RouteDestination{
Name: fmt.Sprintf("%s-mirror-%d", irRouteDestinationName(filterContext.Route, filterContext.RuleIdx), filterIdx),
Endpoints: mirrorEndpoints,
Name: fmt.Sprintf("%s-mirror-%d", irRouteDestinationName(filterContext.Route, filterContext.RuleIdx), filterIdx),
Settings: []*ir.DestinationSetting{ds},
}
filterContext.Mirrors = append(filterContext.Mirrors, newMirror)
}
Expand Down
20 changes: 0 additions & 20 deletions internal/gatewayapi/helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,18 +57,6 @@ func SectionNamePtr(name string) *v1beta1.SectionName {
return &sectionName
}

func TLSModeTypePtr(mode v1beta1.TLSModeType) *v1beta1.TLSModeType {
return &mode
}

func StringPtr(val string) *string {
return &val
}

func Int32Ptr(val int32) *int32 {
return &val
}

func PortNumPtr(val int32) *v1beta1.PortNumber {
portNum := v1beta1.PortNumber(val)
return &portNum
Expand All @@ -79,14 +67,6 @@ func ObjectNamePtr(val string) *v1alpha2.ObjectName {
return &objectName
}

func PathMatchTypePtr(pType v1beta1.PathMatchType) *v1beta1.PathMatchType {
return &pType
}

func GatewayAddressTypePtr(addr v1beta1.AddressType) *v1beta1.AddressType {
return &addr
}

func PathMatchTypeDerefOr(matchType *v1beta1.PathMatchType, defaultType v1beta1.PathMatchType) v1beta1.PathMatchType {
if matchType != nil {
return *matchType
Expand Down
11 changes: 11 additions & 0 deletions internal/gatewayapi/resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,3 +104,14 @@ func (r *Resources) GetSecret(namespace, name string) *v1.Secret {

return nil
}

func (r *Resources) GetEndpointSlicesForService(svcNamespace, svcName string) []*discoveryv1.EndpointSlice {
endpointSlices := []*discoveryv1.EndpointSlice{}
for _, endpointSlice := range r.EndpointSlices {
if svcNamespace == endpointSlice.Namespace &&
endpointSlice.GetLabels()[discoveryv1.LabelServiceName] == svcName {
endpointSlices = append(endpointSlices, endpointSlice)
}
}
return endpointSlices
}
Loading
Loading