network: move ipmasq management into platform-specific files #854
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
jroggeman
force-pushed
the
jroggeman/ipmasq
branch
from
a732ab4 to
2c96da7
Compare
|
The tests are failing. I restarted it as it looks like a google connectivity problem. |
tomdee
reviewed
Oct 28, 2017
network/ipmasq.go
Outdated
| @@ -1,3 +1,5 @@ | |||
| // +build linux | |||
There was a problem hiding this comment.
What about just naming the file _linux.go?
jroggeman
force-pushed
the
jroggeman/ipmasq
branch
from
a237d66 to
9704cbc
Compare
|
Since there is no actual Windows specific code in here, why not use this PR to just move iptables stuff out of main.go but not do any file renaming? |
|
@tomdee updated review to only be the minor refactoring, can you take a look? |
|
Looks good. If you squash the commits I can merge. |
jroggeman
force-pushed
the
jroggeman/ipmasq
branch
from
6b10625 to
a2f9510
Compare
|
Squashed changes are pushed :) |
|
Looks good, merging. |
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.
Description
As requested in #832 , we're breaking up the changes into smaller commits. This PR moves the Setup, monitoring, and teardown of IPMasq settings into platform-specific files. This is one of the requirements to get Flannel to build on Windows.
From the original PR (#832):