Skip to content

Commit

Permalink
fix(ZoneIngress): subset routing when tag is present on all subsets (#…
Browse files Browse the repository at this point in the history 
…8443)

Signed-off-by: Mike Beaumont <[email protected]>
  • Loading branch information
@michaelbeaumont
michaelbeaumont authored Nov 28, 2023
1 parent 31e186b commit 1e81dcb
Show file tree
Hide file tree
Showing 7 changed files with 242 additions and 83 deletions.
6 changes: 2 additions & 4 deletions pkg/xds/generator/egress/internal_services_generator.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import (
mesh_proto "github.com/kumahq/kuma/api/mesh/v1alpha1"
"github.com/kumahq/kuma/pkg/core/resources/apis/mesh"
core_xds "github.com/kumahq/kuma/pkg/core/xds"
util_maps "github.com/kumahq/kuma/pkg/util/maps"
xds_context "github.com/kumahq/kuma/pkg/xds/context"
envoy_listeners "github.com/kumahq/kuma/pkg/xds/envoy/listeners"
"github.com/kumahq/kuma/pkg/xds/envoy/tags"
Expand All @@ -27,7 +26,6 @@ func (g *InternalServicesGenerator) Generate(
meshName := meshResources.Mesh.GetMeta().GetName()

servicesMap := g.buildServices(meshResources.EndpointMap, meshResources.Mesh.ZoneEgressEnabled(), xdsCtx.ControlPlane.Zone)
services := util_maps.SortedKeys(servicesMap)

availableServices := g.distinctAvailableServices(proxy.ZoneEgressProxy.ZoneIngresses, meshName, servicesMap)

Expand All @@ -36,9 +34,9 @@ func (g *InternalServicesGenerator) Generate(
xds_context.Resources{MeshLocalResources: meshResources.Resources},
)

zoneproxy.AddFilterChains(availableServices, proxy.APIVersion, listenerBuilder, destinations, meshResources.EndpointMap)
services := zoneproxy.AddFilterChains(availableServices, proxy.APIVersion, listenerBuilder, destinations, meshResources.EndpointMap)

cds, err := zoneproxy.GenerateCDS(services, destinations, proxy.APIVersion, meshName, OriginEgress)
cds, err := zoneproxy.GenerateCDS(destinations, services, proxy.APIVersion, meshName, OriginEgress)
if err != nil {
return nil, err
}
Expand Down
62 changes: 0 additions & 62 deletions pkg/xds/generator/egress/testdata/04.mixed-services-custom-trafficroute.golden.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,68 +85,6 @@ resources:
'@type': type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions
explicitHttpConfig:
http2ProtocolOptions: {}
- name: mesh-1:service-1-zone-2
resource:
'@type': type.googleapis.com/envoy.config.cluster.v3.Cluster
altStatName: mesh-1_service-1-zone-2
connectTimeout: 10s
edsClusterConfig:
edsConfig:
ads: {}
resourceApiVersion: V3
name: mesh-1:service-1-zone-2
type: EDS
- name: mesh-1:service-2-zone-2
resource:
'@type': type.googleapis.com/envoy.config.cluster.v3.Cluster
altStatName: mesh-1_service-2-zone-2
connectTimeout: 10s
edsClusterConfig:
edsConfig:
ads: {}
resourceApiVersion: V3
name: mesh-1:service-2-zone-2
type: EDS
- name: mesh-1:service-1-zone-2
resource:
'@type': type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment
clusterName: mesh-1:service-1-zone-2
endpoints:
- lbEndpoints:
- endpoint:
address:
socketAddress:
address: 10.0.0.254
portValue: 10001
loadBalancingWeight: 3
metadata:
filterMetadata:
envoy.lb:
kuma.io/protocol: http
mesh: mesh-1
envoy.transport_socket_match:
kuma.io/protocol: http
mesh: mesh-1
- name: mesh-1:service-2-zone-2
resource:
'@type': type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment
clusterName: mesh-1:service-2-zone-2
endpoints:
- lbEndpoints:
- endpoint:
address:
socketAddress:
address: 10.0.0.254
portValue: 10001
loadBalancingWeight: 30
metadata:
filterMetadata:
envoy.lb:
kuma.io/protocol: http2
mesh: mesh-1
envoy.transport_socket_match:
kuma.io/protocol: http2
mesh: mesh-1
- name: inbound:192.168.0.1:10002
resource:
'@type': type.googleapis.com/envoy.config.listener.v3.Listener
Expand Down
10 changes: 5 additions & 5 deletions pkg/xds/generator/ingress_generator.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,16 @@ func (i IngressGenerator) Generate(

for _, mr := range proxy.ZoneIngressProxy.MeshResourceList {
meshName := mr.Mesh.GetMeta().GetName()
services := maps.Keys(mr.EndpointMap)
sort.Strings(services)
serviceList := maps.Keys(mr.EndpointMap)
sort.Strings(serviceList)
dest := zoneproxy.BuildMeshDestinations(
availableSvcsByMesh[meshName],
xds_context.Resources{MeshLocalResources: mr.Resources},
)

cdsResources, err := zoneproxy.GenerateCDS(services, dest, proxy.APIVersion, meshName, OriginIngress)
services := zoneproxy.AddFilterChains(availableSvcsByMesh[meshName], proxy.APIVersion, listenerBuilder, dest, mr.EndpointMap)

cdsResources, err := zoneproxy.GenerateCDS(dest, services, proxy.APIVersion, meshName, OriginIngress)
if err != nil {
return nil, err
}
Expand All @@ -61,8 +63,6 @@ func (i IngressGenerator) Generate(
return nil, err
}
resources.Add(edsResources...)

zoneproxy.AddFilterChains(availableSvcsByMesh[meshName], proxy.APIVersion, listenerBuilder, dest, mr.EndpointMap)
}

listener, err := listenerBuilder.Build()
Expand Down
95 changes: 95 additions & 0 deletions pkg/xds/generator/ingress_generator_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -715,6 +715,101 @@ var _ = Describe("IngressGenerator", func() {
},
},
}),
Entry("with MeshHTTPRoute and subsets", testCase{
ingress: `
networking:
address: 10.0.0.1
port: 10001
availableServices:
- mesh: mesh1
tags:
kuma.io/service: backend
version: v1
region: eu
kuma.io/zone: zone
- mesh: mesh1
tags:
kuma.io/service: backend
version: v2
region: us
kuma.io/zone: zone
`,
expected: "with-meshhttproute-subset.envoy.golden.yaml",
meshResourceList: []*core_xds.MeshIngressResources{
{
Mesh: builders.Mesh().WithName("mesh1").Build(),
EndpointMap: map[core_xds.ServiceName][]core_xds.Endpoint{
"backend": {
{
Target: "192.168.0.1",
Port: 2521,
Tags: map[string]string{
"kuma.io/service": "backend",
"version": "v1",
"region": "eu",
"mesh": "mesh1",
"kuma.io/zone": "zone",
},
Weight: 1,
},
{
Target: "192.168.0.2",
Port: 2521,
Tags: map[string]string{
"kuma.io/service": "backend",
"version": "v2",
"region": "us",
"mesh": "mesh1",
"kuma.io/zone": "zone",
},
Weight: 1,
},
},
},
Resources: map[core_model.ResourceType]core_model.ResourceList{
v1alpha1.MeshHTTPRouteType: &v1alpha1.MeshHTTPRouteResourceList{
Items: []*v1alpha1.MeshHTTPRouteResource{
{
Spec: &v1alpha1.MeshHTTPRoute{
TargetRef: common_api.TargetRef{
Kind: common_api.MeshService,
Name: "frontend",
},
To: []v1alpha1.To{{
TargetRef: common_api.TargetRef{
Kind: common_api.MeshService,
Name: "backend",
},
Rules: []v1alpha1.Rule{{
Matches: []v1alpha1.Match{{
Path: &v1alpha1.PathMatch{
Type: v1alpha1.PathPrefix,
Value: "/v1",
},
}},
Default: v1alpha1.RuleConf{
BackendRefs: &[]common_api.BackendRef{{
TargetRef: common_api.TargetRef{
Kind: common_api.MeshServiceSubset,
Name: "backend",
Tags: map[string]string{
"version": "v1",
"region": "eu",
"kuma.io/zone": "zone",
},
},
}},
},
}},
}},
},
},
},
},
},
},
},
}),
Entry("with VirtualOutbound", testCase{
ingress: `
networking:
Expand Down
101 changes: 101 additions & 0 deletions pkg/xds/generator/testdata/ingress/with-meshhttproute-subset.envoy.golden.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
resources:
- name: mesh1:backend
resource:
'@type': type.googleapis.com/envoy.config.cluster.v3.Cluster
altStatName: mesh1_backend
connectTimeout: 10s
edsClusterConfig:
edsConfig:
ads: {}
resourceApiVersion: V3
lbSubsetConfig:
fallbackPolicy: ANY_ENDPOINT
subsetSelectors:
- fallbackPolicy: NO_FALLBACK
keys:
- region
- version
name: mesh1:backend
type: EDS
- name: mesh1:backend
resource:
'@type': type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment
clusterName: mesh1:backend
endpoints:
- lbEndpoints:
- endpoint:
address:
socketAddress:
address: 192.168.0.1
portValue: 2521
loadBalancingWeight: 1
metadata:
filterMetadata:
envoy.lb:
kuma.io/zone: zone
mesh: mesh1
region: eu
version: v1
envoy.transport_socket_match:
kuma.io/zone: zone
mesh: mesh1
region: eu
version: v1
- endpoint:
address:
socketAddress:
address: 192.168.0.2
portValue: 2521
loadBalancingWeight: 1
metadata:
filterMetadata:
envoy.lb:
kuma.io/zone: zone
mesh: mesh1
region: us
version: v2
envoy.transport_socket_match:
kuma.io/zone: zone
mesh: mesh1
region: us
version: v2
- name: inbound:10.0.0.1:10001
resource:
'@type': type.googleapis.com/envoy.config.listener.v3.Listener
address:
socketAddress:
address: 10.0.0.1
portValue: 10001
enableReusePort: false
filterChains:
- filterChainMatch:
serverNames:
- backend{kuma.io/zone=zone,mesh=mesh1,region=eu,version=v1}
transportProtocol: tls
filters:
- name: envoy.filters.network.tcp_proxy
typedConfig:
'@type': type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy
cluster: mesh1:backend
metadataMatch:
filterMetadata:
envoy.lb:
region: eu
version: v1
statPrefix: mesh1_backend
- filterChainMatch:
serverNames:
- backend{mesh=mesh1}
transportProtocol: tls
filters:
- name: envoy.filters.network.tcp_proxy
typedConfig:
'@type': type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy
cluster: mesh1:backend
statPrefix: mesh1_backend
listenerFilters:
- name: envoy.filters.listener.tls_inspector
typedConfig:
'@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector
name: inbound:10.0.0.1:10001
trafficDirection: INBOUND
Loading

0 comments on commit 1e81dcb

Please sign in to comment.