main.go: add the "net-config-path" flag #1136
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
neolit123
commented
May 15, 2019
| @@ -349,7 +351,7 @@ func recycleIPTables(nw ip.IP4Net, lease *subnet.Lease) error { | |||
| prevNetwork := ReadCIDRFromSubnetFile(opts.subnetFile, "FLANNEL_NETWORK") | |||
| prevSubnet := ReadCIDRFromSubnetFile(opts.subnetFile, "FLANNEL_SUBNET") | |||
| // recycle iptables rules only when network configured or subnet leased is not equal to current one. | |||
| if prevNetwork != nw && prevSubnet != lease.Subnet{ | |||
| if prevNetwork != nw && prevSubnet != lease.Subnet { | |||
There was a problem hiding this comment.
go-fmt amended this line.
|
LGTM |
Add the flag "net-config-path" that holds the path for the network configuration. Set the default value to "/etc/kube-flannel/net-conf.json". Signed-off-by: Lubomir I. Ivanov <[email protected]>
neolit123
force-pushed
the
add-net-conf-path
branch
from
ae16a6c to
aac870e
Compare
17 tasks
rajatchopra
approved these changes
May 28, 2019
Closed
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
Add the flag "net-config-path" that holds the path
for the network configuration.
Set the default value to "/etc/kube-flannel/net-conf.json".
Todos
Release Note
/assign @ksubrmnn
/area configuration
/kind enhancement