Migrate egress IP tracking code to pkg/network/common #20155
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
openshift-ci-robot
added
size/XXL
danwinship
requested review from
pravisankar and
dcbw
and removed request for
smarterclayton
openshift-bot
added
the
needs-rebase
danwinship
force-pushed
the
auto-egress-ip-common
branch
from
01f9724
to
8b5fbbe
Compare
openshift-bot
removed
the
needs-rebase
danwinship
force-pushed
the
auto-egress-ip-common
branch
2 times, most recently
from
90f7d66
to
afd9049
Compare
danwinship
force-pushed
the
auto-egress-ip-common
branch
from
afd9049
to
7e850d2
Compare
|
/lgtm |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: danwinship, dcbw, pravisankar The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
/retest |
|
/test cross |
|
/retest |
1 similar comment
|
/retest |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Prelude to master-side egress IP tracking; the master will need to be doing the same egressIP-tracking that the node does, so move the code to pkg/network/common so they can share it.
pkg/network/common/egressip_test.go is mostly just a copy of pkg/network/node/egressip_test.go, with the "netlink" and "OVS" changes squished together into a single change stream, and the comments changed in a few places to reflect the fact that "local node" vs "remote node" doesn't matter to the common code.
The changes at the end of pkg/network/node/egressip_test.go are because if egressIPWatcher deletes OVS flows and then recreates them, the testing code requires that we call
assertOVSChangesrather thanassertNoOVSChangeseven if the new flows are identical to the old ones. The new code doesn't delete and recreate flows when nothing changed, so we don't need to do that now.