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

Jump to bottom

fix(kuma-cp): zone ingress mixes services with the same name in different meshes #6364

Merged
merged 12 commits into from
Apr 3, 2023
Merged

fix(kuma-cp): zone ingress mixes services with the same name in different meshes #6364

merged 12 commits into from
Apr 3, 2023

Conversation

lobkovilya
Copy link
Contributor

@lobkovilya lobkovilya commented Mar 28, 2023 •
edited
Loading

This PR fixes 2 issues:

  • zone ingress generates 1 cluster for services with the same name but in different meshes
  • fillExternalServicesOutboundsThroughEgress always sets locality priority to priorityRemote (should depend on localityAwareLoadBalancing flag)

Checklist prior to review

  • Link to relevant issue as well as docs and UI issues --
  • This will not break child repos: it doesn't hardcode values (.e.g "kumahq" as a image registry) and it will work on Windows, system specific functions like syscall.Mkfifo have equivalent implementation on the other OS --
  • Tests (Unit test, E2E tests, manual test on universal and k8s) --
  • Do you need to update UPGRADE.md? --
  • Does it need to be backported according to the backporting policy? --
  • Do you need to explicitly set a > Changelog: entry here or add a ci/ label to run fewer/more tests?

@lobkovilya
fix(kuma-cp): zone ingress mixes services with the same name in diffe…
3fd33a8 
…rent meshes

Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>
@lobkovilya
fix(kuma-cp): golden files
a9f9031 
Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>
@lobkovilya
fix(kuma-cp): e2e test fix ingress stats
fea825d 
Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>
@lobkovilya
Merge branch 'master' into fix/same-service-different-mesh
0c6346f
@lobkovilya lobkovilya marked this pull request as ready for review March 28, 2023 17:49
@lobkovilya lobkovilya requested review from a team, michaelbeaumont and lukidzi and removed request for a team March 28, 2023 17:49
michaelbeaumont
michaelbeaumont reviewed Mar 29, 2023
View reviewed changes
pkg/xds/generator/testdata/ingress/meshgateway.envoy.golden.yaml Show resolved Hide resolved
pkg/core/xds/types.go Show resolved Hide resolved
pkg/xds/ingress/router.go Outdated Show resolved Hide resolved
pkg/xds/topology/outbound.go Outdated Show resolved Hide resolved
lobkovilya and others added 6 commits March 29, 2023 13:09
@lobkovilya @michaelbeaumont
Update pkg/xds/ingress/router.go
f396017 
Co-authored-by: Mike Beaumont <mjboamail@gmail.com>
Signed-off-by: Ilya Lobkov <lobkovilya@yandex.ru>
@lobkovilya
review comment
076e460 
Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>
@lobkovilya
fix unit tests
0cc4954 
Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>
@lobkovilya
rename "thisZone" to "localZone"
26a1c11 
Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>
@lahabana
Merge branch 'master' into fix/same-service-different-mesh
04d5e41
@lahabana
Merge branch 'master' into fix/same-service-different-mesh
594b968
@lahabana lahabana merged commit d54b226 into kumahq:master Apr 3, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@michaelbeaumont michaelbeaumont michaelbeaumont left review comments

@lahabana lahabana lahabana left review comments

@lukidzi lukidzi lukidzi approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@lobkovilya @lahabana @michaelbeaumont @lukidzi