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 "Perform reverse NAT at Host Interface" #17319

Merged
merged 1 commit into from Sep 7, 2021

Conversation

nbusseneau
Copy link
Member

This reverts commit dc4b06e.

Rationale:

This reverts commit dc4b06e.

Rationale:

- PR cilium#15354 introduced a new test that is frequently failing:
  `K8sServicesTest Checks service across nodes Tests NodePort BPF Tests with vxlan Test NodePort with netfilterCompatMode=true`
- This flake is tracked in issue cilium#17060.
- We are reverting the original PR so as to remove the flake from the
  CI until we have a fix and are confident the new test is not flaky.

Signed-off-by: Nicolas Busseneau <nicolas@isovalent.com>
@nbusseneau nbusseneau added sig/datapath Impacts bpf/ or low-level forwarding details, including map management and monitor messages. release-note/misc This PR makes changes that have no direct user impact. labels Sep 6, 2021
@nbusseneau nbusseneau requested review from a team September 6, 2021 12:31
@nbusseneau nbusseneau requested review from a team as code owners September 6, 2021 12:31
@nbusseneau nbusseneau requested review from a team September 6, 2021 12:31
@nbusseneau nbusseneau requested a review from a team as a code owner September 6, 2021 12:31
@nbusseneau
Copy link
Member Author

test-me-please

Copy link
Member

@pchaigno pchaigno left a comment

Choose a reason for hiding this comment

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

No conflicts while reverting, right?

@nbusseneau
Copy link
Member Author

nbusseneau commented Sep 6, 2021

No conflicts while reverting, right?

Got one with 0bb3eed#diff-8a383aefc352ba8854dbab293a563fecf7f8916983d013ab36f677293996ca3c because they both added new entries at the end of the const section around lines 950-960 in pkg/option/config.go, but that's not a real conflict right? 😁

@nbusseneau
Copy link
Member Author

All CI passed, now we're just waiting for approval! /cc @joestringer because we discussed that backport earlier.

@pchaigno
Copy link
Member

pchaigno commented Sep 7, 2021

Marking ready to merge considering tests are passing and this is just a revert of a complete feature, so probably no need for all reviews.

@pchaigno pchaigno added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Sep 7, 2021
@borkmann borkmann merged commit 9e2d217 into cilium:master Sep 7, 2021
@brb
Copy link
Member

brb commented Sep 8, 2021

cc @krishgobinath

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready-to-merge This PR has passed all tests and received consensus from code owners to merge. release-note/misc This PR makes changes that have no direct user impact. sig/datapath Impacts bpf/ or low-level forwarding details, including map management and monitor messages.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

9 participants