utils(iptables): Factor out a common function for executing commands #1277
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
aauren
requested changes
Apr 5, 2022
There was a problem hiding this comment.
Thanks for the submission @vadorovsky.
It looks like it needs a small tweak in order to work. When I tested it in my cluster it threw an error:
2022-04-05T22:04:36.594653566Z E0405 22:04:36.594568 14423 network_policy_controller.go:253] Aborting sync. Failed to run iptables-save: %!v(MISSING)failed to call iptables-save [-t filter]: exit status 1, (ERROR: No valid subcommand given.
2022-04-05T22:04:36.594671003Z Valid subcommands:
2022-04-05T22:04:36.594674132Z * iptables
2022-04-05T22:04:36.594676686Z * main4
2022-04-05T22:04:36.594679175Z * iptables-save
2022-04-05T22:04:36.594681693Z * save4
2022-04-05T22:04:36.594684203Z * iptables-restore
2022-04-05T22:04:36.594686723Z * restore4
2022-04-05T22:04:36.594694755Z * iptables-legacy
2022-04-05T22:04:36.594697534Z * iptables-legacy-save
2022-04-05T22:04:36.594700027Z * iptables-legacy-restore
2022-04-05T22:04:36.594702516Z * iptables-xml
2022-04-05T22:04:36.594705010Z * xml
2022-04-05T22:04:36.594707616Z * ip6tables
2022-04-05T22:04:36.594710110Z * main6
2022-04-05T22:04:36.594712637Z * ip6tables-save
2022-04-05T22:04:36.594715142Z * save6
2022-04-05T22:04:36.594717642Z * ip6tables-restore
2022-04-05T22:04:36.594720150Z * restore6
2022-04-05T22:04:36.594722634Z * ip6tables-legacy
2022-04-05T22:04:36.594725121Z * ip6tables-legacy-save
2022-04-05T22:04:36.594727598Z * ip6tables-legacy-restore
2022-04-05T22:04:36.594730080Z )
Other than that, I'm always in favor of consolidation.
| cmd := exec.Cmd{ | ||
| Path: path, | ||
| Args: args, | ||
| Stdout: buffer, |
There was a problem hiding this comment.
The args here needs to contain the command name here as well.
So you'll need to do some work like the following in order for it to work:
trueArgs := append([]string{cmdName}, args...)
There was a problem hiding this comment.
Whoops, sorry for that!. Should be fixed now.
SaveInto and Restore were almost the same aside from what was executed. Signed-off-by: Michal Rostecki <[email protected]>
vadorovsky
force-pushed
the
iptables-save-restore
branch
from
53fae19 to
d912e6b
Compare
|
Actually it's irrelevant now, #1280 completely changes the iptables code. |
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.
SaveInto and Restore were almost the same aside from what was executed.
Signed-off-by: Michal Rostecki [email protected]