Fix antrea-agent crashing in networkPolicyOnly mode #795
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
|
Thanks for your PR. The following commands are available:
These commands can only be run by members of the vmware-tanzu organization. |
|
/test-all |
|
/test-all |
antoninbas
reviewed
Jun 4, 2020
| return ipNet | ||
| } | ||
|
|
||
| func TestAgentQuerierGetAgentInfo(t *testing.T) { |
There was a problem hiding this comment.
@tnqn is this test related to this PR?
There was a problem hiding this comment.
Yes, AgentQuerier.GetAgentInfo is the method panic. The test ensures it can get expected result without panic (networkPolicyOnly-mode non-partial case).
jianjuns
reviewed
Jun 4, 2020
pkg/agent/agent.go
Outdated
| @@ -503,7 +503,7 @@ func (i *Initializer) initNodeLocalConfig() error { | |||
| } | |||
|
|
|||
| if i.networkConfig.TrafficEncapMode.IsNetworkPolicyOnly() { | |||
| i.nodeConfig = &config.NodeConfig{Name: nodeName, NodeIPAddr: localAddr, BridgeName: i.ovsBridgeClient.GetBridgeName(), UplinkNetConfig: new(config.AdapterNetConfig)} | |||
| i.nodeConfig = &config.NodeConfig{Name: nodeName, NodeIPAddr: localAddr, UplinkNetConfig: new(config.AdapterNetConfig)} | |||
There was a problem hiding this comment.
Good catch! This must have caused some issues in networkPolicyOnly mode too.
The PodCIDR of NodeConfig could be nil for the networkPolicyOnly trafficEncapMode. The AgentQuerier should check nil before converting it to string. Besides, this patch removes the redundant field BridgeName and fixes a typo.
|
/test-all |
jianjuns
approved these changes
Jun 5, 2020
antoninbas
pushed a commit
to antoninbas/antrea
that referenced
this pull request
Jun 5, 2020
The PodCIDR of NodeConfig could be nil for the networkPolicyOnly trafficEncapMode. The AgentQuerier should check nil before converting it to string. Besides, this patch removes the redundant field BridgeName and fixes a typo.
antoninbas
pushed a commit
that referenced
this pull request
Jun 5, 2020
The PodCIDR of NodeConfig could be nil for the networkPolicyOnly trafficEncapMode. The AgentQuerier should check nil before converting it to string. Besides, this patch removes the redundant field BridgeName and fixes a typo.
GraysonWu
pushed a commit
to GraysonWu/antrea
that referenced
this pull request
Sep 22, 2020
The PodCIDR of NodeConfig could be nil for the networkPolicyOnly trafficEncapMode. The AgentQuerier should check nil before converting it to string. Besides, this patch removes the redundant field BridgeName and fixes a typo.
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.
The PodCIDR of NodeConfig could be nil for the networkPolicyOnly
trafficEncapMode. The AgentQuerier should check nil before converting it
to string.
Besides, this patch removes the redundant field BridgeName and fixes a
typo.
Fixes #793