Support OVS bridge creation for secondary network #5279
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
jianjuns
added
area/component/cni
jianjuns
force-pushed
the
sec-bridge
branch
4 times, most recently
from
df05751 to
4fd4c8b
Compare
jianjuns
added
area/ovs/ovsdb
jianjuns
force-pushed
the
sec-bridge
branch
2 times, most recently
from
48a365d to
0876de0
Compare
tnqn
reviewed
Jul 26, 2023
jianjuns
force-pushed
the
sec-bridge
branch
3 times, most recently
from
3b202b7 to
3033f4d
Compare
antoninbas
reviewed
Aug 1, 2023
cmd/antrea-agent/options.go
Outdated
| @@ -597,7 +597,7 @@ func (o *Options) validateK8sNodeOptions() error { | |||
| o.dnsServerOverride = hostPort | |||
| } | |||
|
|
|||
| return nil | |||
| return o.validateSecondaryNetworkConfig() | |||
There was a problem hiding this comment.
this should follow the same convention as above, and wrap the error:
if err := o.validateAntreaProxyConfig(encapMode); err != nil {
return fmt.Errorf("proxy config is invalid: %w", err)
}
if err := o.validateFlowExporterConfig(); err != nil {
return fmt.Errorf("failed to validate flow exporter config: %v", err)
}
if err := o.validateMulticastConfig(); err != nil {
return fmt.Errorf("failed to validate multicast config: %v", err)
}
if err := o.validateEgressConfig(encapMode); err != nil {
return fmt.Errorf("failed to validate egress config: %v", err)
}
Comment on lines
129
to
130
| defer mockNewOVSBridge(mockOVSBridgeClient)() | ||
| defer mockInterfaceByName()() |
There was a problem hiding this comment.
You can use the new t.Cleanup functionality here, to simplify calling the functions and ensure that cleanup always happens correctly. For example:
func mockInterfaceByName(t *testing.T) func() {
prevFunc := interfaceByNameFn
interfaceByNameFn = func(name string) (*net.Interface, error) {
if name == nonExistingInterface {
return nil, errors.New("interface not found")
}
return nil, nil
}
t.Cleanup(func() { interfaceByNameFn = prevFunc })
}
// in caller
mockInterfaceByName(t)
Add OVS bridge configuration to the secondary network configuration in antrea-agent.conf, which specifies the OVS bridges for Pod secondary networks and also physical interfaces of the bridges. At the moment, only a single bridge is supported and at most one physical interface can be configured on the bridge. antrea-agent will automatically create the OVS bridge and connects the physical interface (if specified) to the bridge, when the bridge is specified in the secondary network configuration and does not exist on the host. Signed-off-by: Jianjun Shen <shenj@vmware.com>
|
Rebased on top of #5341. |
|
/test-all |
|
/test-conformance |
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.
Add OVS bridge configuration to the secondary network configuration in antrea-agent.conf, which specifies the OVS bridges for Pod secondary networks and also physical interfaces of the bridges. At the moment, only a single bridge is supported and at most one physical interface can be configured on the bridge. antrea-agent will automatically create the OVS bridge and connects the physical interface (if specified) to the bridge, when the bridge is specified in the secondary network configuration and does not exist on the host.
Issue: #5278