Added iface-regex option #754
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
tomdee
suggested changes
Jun 21, 2017
main.go
Outdated
| @@ -324,6 +327,49 @@ func LookupExtIface(ifname string) (*backend.ExternalInterface, error) { | |||
| return nil, fmt.Errorf("error looking up interface %s: %s", ifname, err) | |||
| } | |||
| } | |||
| } else if len(ifregex) > 0 { | |||
| // Use the regex if nothing matches an explicit name or ip | |||
There was a problem hiding this comment.
This comment doesn't match the code
Documentation/configuration.md
Outdated
| @@ -54,6 +54,7 @@ The following configuration illustrates the use of most options with `udp` backe | |||
| --etcd-cafile="": SSL Certificate Authority file used to secure etcd communication. | |||
| --kube-subnet-mgr: Contact the Kubernetes API for subnet assignment instead of etcd. | |||
| --iface="": interface to use (IP or name) for inter-host communication. Defaults to the interface for the default route on the machine. | |||
| --iface-regex="": regex expression to match the first interface to use (IP or name) for inter-host communication. If unspecified, will default to the interface for the default route on the machine. | |||
There was a problem hiding this comment.
This doesn't mention that it's only used if --face isn't specified
tomdee
reviewed
Jun 22, 2017
main.go
Outdated
| @@ -89,6 +91,7 @@ func init() { | |||
| flag.StringVar(&opts.etcdUsername, "etcd-username", "", "Username for BasicAuth to etcd") | |||
| flag.StringVar(&opts.etcdPassword, "etcd-password", "", "Password for BasicAuth to etcd") | |||
| flag.StringVar(&opts.iface, "iface", "", "interface to use (IP or name) for inter-host communication") | |||
| flag.StringVar(&opts.ifaceRegex, "iface-regex", "", "regex expression to match the first interface to use (IP or name) for inter-host communication") | |||
There was a problem hiding this comment.
It's also worth saying that it's overridden by iface here too
|
One more small comment, otherwise LGTM. |
Allows for more flexibility when selecting the network interface that flannel should be using. Addresses flannel-io#620
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
Allows for more flexibility when selecting the network interface that
flannel should be using.
Addresses #620
Testing
Ran flannel locally and set the
iface-regexflag to various regex expressions to check if they match (or do not match) with any of the network interfaces on the machine.