Add ignored interfaces names when getting interface by IP #3219
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
wenyingd
force-pushed
the
issue_3217
branch
2 times, most recently
from
7eabe74
to
aeed963
Compare
Codecov Report
@@ Coverage Diff @@
## main #3219 +/- ##
==========================================
- Coverage 60.09% 52.23% -7.87%
==========================================
Files 331 303 -28
Lines 28420 36323 +7903
==========================================
+ Hits 17080 18973 +1893
- Misses 9476 15552 +6076
+ Partials 1864 1798 -66
Flags with carried forward coverage won't be shown. Click here to find out more.
|
xliuxu
reviewed
Jan 21, 2022
pkg/agent/util/net.go
Outdated
| @@ -111,8 +111,11 @@ func dialUnix(address string) (net.Conn, error) { | |||
| return net.Dial("unix", address) | |||
| } | |||
|
|
|||
| // GetIPNetDeviceFromIP returns local IPs/masks and associated device from IP. | |||
| func GetIPNetDeviceFromIP(localIPs *ip.DualStackIPs) (v4IPNet *net.IPNet, v6IPNet *net.IPNet, iface *net.Interface, err error) { | |||
| // GetIPNetDeviceFromIP returns local IPs/masks and associated device from IP, and ignore the interfaces which has a | |||
xliuxu
reviewed
Jan 21, 2022
wenyingd
changed the title
|
/test-all |
wenyingd
changed the title
|
/test-e2e |
tnqn
reviewed
Jan 25, 2022
pkg/agent/agent.go
Outdated
| @@ -1114,3 +1115,7 @@ func (i *Initializer) patchNodeAnnotations(nodeName, key string, value interface | |||
| } | |||
| return nil | |||
| } | |||
|
|
|||
| func (i *Initializer) getIgnoredHostInterfaces() sets.String { | |||
There was a problem hiding this comment.
hard to tell what's the method used for from the method name when looking at it without knowing its callers, but I cannot think of a more understandable name either.
How about creating a method and use it in the 3 callers, then comment why we need to exclude the device in single place:
func (i *Initializer) getNodeInterfaceFromIP(ips *ip.DualStackIPs) sets.String {
// Exclude i.hostGateway to resolve an issue that two interfaces are configured with the same IPs in NetworkPolicyOnly mode.
return getIPNetDeviceFromIP(ips, sets.NewString(i.hostGateway))
}
pkg/agent/util/net.go
Outdated
| func GetIPNetDeviceFromIP(localIPs *ip.DualStackIPs) (v4IPNet *net.IPNet, v6IPNet *net.IPNet, iface *net.Interface, err error) { | ||
| // GetIPNetDeviceFromIP returns local IPs/masks and associated device from IP, and ignores the interfaces which have | ||
| // names in the ignoredInterfaces. | ||
| // Use ignoredInterfaces to resolve an issue that two interfaces are configured with the same IPs in NetworkPolicyOnly |
There was a problem hiding this comment.
This comment should be on caller side as the util is generic, having no idea why some interfaces should be ignored.
There was a problem hiding this comment.
Move it to caller.
|
/test-e2e |
|
/test-windows-all |
|
/test-conformance |
tnqn
reviewed
Jan 26, 2022
pkg/agent/agent.go
Outdated
| @@ -1114,3 +1115,7 @@ func (i *Initializer) patchNodeAnnotations(nodeName, key string, value interface | |||
| } | |||
| return nil | |||
| } | |||
|
|
|||
| func (i *Initializer) getIgnoredHostInterfaces() sets.String { | |||
This is to resolve an issue that caused by two interfaces configured with the same IP address (different masks) on the host. The issue occurred in AKE setup with NetworkPolicyOnly mode, and antrea-gw0 is configured with Node's IP with 32bit mask. The changes include, 1. Provide a set of ignored interface names (e.g., antrea-gw0) when getting the Node's transport interface with Node's IP in agentInitializer. 2. Use Node's transport interface name to get the accurate interface in Egress feature instead of Node's IP. Signed-off-by: wenyingd <[email protected]>
|
/test-all |
|
/test-e2e |
|
/test-e2e |
tnqn
added
the
action/release-note
bangqipropel
pushed a commit
to bangqipropel/antrea
that referenced
this pull request
Mar 2, 2022
…3219) This is to resolve an issue that caused by two interfaces configured with the same IP address (different masks) on the host. The issue occurred in AKE setup with NetworkPolicyOnly mode, and antrea-gw0 is configured with Node's IP with 32bit mask. The changes include, 1. Provide a set of ignored interface names (e.g., antrea-gw0) when getting the Node's transport interface with Node's IP in agentInitializer. 2. Use Node's transport interface name to get the accurate interface in Egress feature instead of Node's IP. Signed-off-by: wenyingd <[email protected]>
Merged
This was referenced Mar 18, 2022
Merged
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.
This is to resolve an issue that caused by two interfaces configured
with the same IP address (different masks) on the host. The issue
occurred in AKE setup with NetworkPolicyOnly mode, and antrea-gw0 is
configured with Node's IP with 32bit mask.
The changes include,
getting the Node's transport interface with Node's IP in
agentInitializer.
Egress feature instead of Node's IP.
Fixes #3217
Signed-off-by: wenyingd [email protected]