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.

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

fix(egress): same external service tag in multiple meshes (backport of #11667) #11669

Merged
merged 1 commit into from
Oct 6, 2024

Conversation

kumahq[bot]
Copy link
Contributor

@kumahq kumahq bot commented Oct 5, 2024

Automatic cherry-pick of #11667 for branch release-2.6

Generated by action

cherry-picked commit 4e5e814
⚠️ ⚠️ ⚠️ Conflicts happened when cherry-picking! ⚠️ ⚠️ ⚠️

On branch release-2.6
Your branch is up to date with 'origin/release-2.6'.

You are currently cherry-picking commit 4e5e814f7.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   pkg/xds/generator/egress/generator_test.go
	modified:   pkg/xds/generator/egress/testdata/01.externalservice-only.golden.yaml
	modified:   pkg/xds/generator/egress/testdata/03.mixed-services.golden.yaml
	modified:   pkg/xds/generator/egress/testdata/04.mixed-services-custom-trafficroute.golden.yaml
	modified:   pkg/xds/generator/egress/testdata/05.mixed-services-with-custom-trafficpermissions.golden.yaml
	modified:   pkg/xds/generator/egress/testdata/06.mixed-services-with-external-in-other-zone.golden.yaml
	new file:   pkg/xds/generator/egress/testdata/input/same-kuma-io-service.yaml
	new file:   pkg/xds/generator/egress/testdata/same-kuma-io-service.golden.yaml
	modified:   pkg/xds/generator/egress/testdata/subsets-with-external-meshhttproute.golden.yaml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   pkg/xds/generator/egress/external_services_generator.go

@kumahq kumahq bot requested a review from a team as a code owner October 5, 2024 19:18
@kumahq kumahq bot requested review from bartsmykla and lobkovilya and removed request for a team October 5, 2024 19:18
@jakubdyszkiewicz jakubdyszkiewicz enabled auto-merge (squash) October 6, 2024 08:24
@jakubdyszkiewicz jakubdyszkiewicz merged commit 2ead9c2 into release-2.6 Oct 6, 2024
12 checks passed
@jakubdyszkiewicz jakubdyszkiewicz deleted the chore/backport-release-2.6-11667 branch October 6, 2024 08:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant