Skip to content

Commit

Permalink
Return an error when bridging mode is enabled without AntreaIPAM enab…
Browse files Browse the repository at this point in the history
…led (#3653)

Signed-off-by: Jianjun Shen <[email protected]>
  • Loading branch information
jianjuns authored Apr 24, 2022
1 parent 590d036 commit 79414ec
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions cmd/antrea-agent/options.go
Original file line number Diff line number Diff line change
Expand Up @@ -356,8 +356,7 @@ func (o *Options) validateAntreaIPAMConfig() error {
return nil
}
if !features.DefaultFeatureGate.Enabled(features.AntreaIPAM) {
klog.InfoS("The enableBridgingMode option is set to true, but it will be ignored because the AntreaIPAM feature gate is disabled")
return nil
return fmt.Errorf("AntreaIPAM feature gate must be enabled to configure bridging mode")
}
// Bridging mode will connect uplink to OVS bridge, which is not compatible with OVSDatapathSystem 'netdev'.
if o.config.OVSDatapathType != string(ovsconfig.OVSDatapathSystem) {
Expand Down

0 comments on commit 79414ec

Please sign in to comment.