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 "Avoid adding original_dst filter when not needed" #10365

Merged
merged 2 commits into from
Jun 8, 2021

Conversation

freddygv
Copy link
Contributor

@freddygv freddygv commented Jun 8, 2021

This reverts commit 19334e8.

The addition of the "original_dst" filter does not depend on the mesh config, only on whether the proxy is in transparent mode.

The PR to revert made it so that transparent proxying didn't work when Mesh.TransparentProxy.CatalogDestinationsOnly was set to true because Envoy couldn't recover the original IP address before iptables redirection.

@freddygv freddygv added this to the 1.10.0 milestone Jun 8, 2021
@freddygv freddygv requested a review from rboyer June 8, 2021 18:42
@github-actions github-actions bot added the theme/envoy/xds Related to Envoy support label Jun 8, 2021
Copy link
Member

@rboyer rboyer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@vercel vercel bot temporarily deployed to Preview – consul June 8, 2021 19:01 Inactive
@vercel vercel bot temporarily deployed to Preview – consul-ui-staging June 8, 2021 19:01 Inactive
@freddygv freddygv changed the title Revert "Avoid adding original_dst filter when not needed (#10302)" Revert "Avoid adding original_dst filter when not needed" Jun 8, 2021
@freddygv freddygv merged commit 7577f0e into master Jun 8, 2021
@freddygv freddygv deleted the revert-10302-fixup/conditional-original-dst branch June 8, 2021 19:18
@hc-github-team-consul-core
Copy link
Collaborator

🍒 If backport labels were added before merging, cherry-picking will start automatically.

To retroactively trigger a backport after merging, add backport labels and re-run https://circleci.com/gh/hashicorp/consul/382927.

@hc-github-team-consul-core
Copy link
Collaborator

🍒✅ Cherry pick of commit 7577f0e onto release/1.10.x succeeded!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
theme/envoy/xds Related to Envoy support
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants