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

revert(kuma-cp): do not use additional addresses (backport of #11601) #11611

Merged
merged 2 commits into from
Oct 1, 2024

Conversation

kumahq[bot]
Copy link
Contributor

@kumahq kumahq bot commented Oct 1, 2024

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

Generated by action

cherry-picked commit 2059970
⚠️ ⚠️ ⚠️ 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 205997054.
  (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/envoy/listeners/listener_configurers.go
	deleted:    pkg/xds/envoy/listeners/v3/additional_address_configuer.go
	deleted:    pkg/xds/envoy/listeners/v3/additional_address_configurer_test.go
	modified:   pkg/xds/generator/testdata/outbound-proxy/08.envoy.golden.yaml
	modified:   pkg/xds/generator/testdata/outbound-proxy/10.envoy.golden.yaml

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

@kumahq kumahq bot requested a review from a team as a code owner October 1, 2024 11:30
@kumahq kumahq bot requested review from Automaat and bartsmykla and removed request for a team October 1, 2024 11:30
Signed-off-by: Lukasz Dziedziak <[email protected]>
@lukidzi lukidzi removed the conflict label Oct 1, 2024
@lukidzi lukidzi merged commit dbf6081 into release-2.6 Oct 1, 2024
12 checks passed
@lukidzi lukidzi deleted the chore/backport-release-2.6-11601 branch October 1, 2024 12:02
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