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(kuma-cp): don't fail when 2 headless services pointing to the same service (backport of #7282) #7291

Merged
merged 3 commits into from
Jul 19, 2023

Conversation

kumahq[bot]
Copy link
Contributor

@kumahq kumahq bot commented Jul 19, 2023

Automatic cherry-pick of #7282 for branch release-2.2

Generated by action

cherry-picked commit 7f5680d
⚠️ ⚠️ ⚠️ Conflicts happened when cherry-picking! ⚠️ ⚠️ ⚠️

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

You are currently cherry-picking commit 7f5680d92.
  (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/dns/vips/virtual_outbound_view.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   pkg/dns/vips_allocator_test.go

Signed-off-by: Lukasz Dziedziak <[email protected]>
Signed-off-by: Lukasz Dziedziak <[email protected]>
@lukidzi lukidzi merged commit fd7bb16 into release-2.2 Jul 19, 2023
@lukidzi lukidzi deleted the chore/backport-release-2.2-7282 branch July 19, 2023 20:24
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