Skip to content

Commit

Permalink
agent: move the iptables bridge forwarding disable to agent register
Browse files Browse the repository at this point in the history
The DisableBridgeNF() placed in init() would cause phantom error
message while restart/kill the network-manager pod. Move it to
agent register to prevent the unexpected invoke.

Fixes: 6521629 ("Disable iptables bridge forwarding on initializatio")
(cherry picked from commit bced981)
  • Loading branch information
mingshuoqiu authored and starbops committed Oct 17, 2024
1 parent bf961d7 commit 38aee8b
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 6 deletions.
11 changes: 11 additions & 0 deletions pkg/controller/agent/vlanconfig/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,10 @@ func Register(ctx context.Context, management *config.Management) error {
cnCache: cns.Cache(),
}

if err := handler.initialize(); err != nil {
return fmt.Errorf("initialize error: %w", err)
}

vcs.OnChange(ctx, ControllerName, handler.OnChange)
vcs.OnRemove(ctx, ControllerName, handler.OnRemove)

Expand Down Expand Up @@ -121,6 +125,13 @@ func (h Handler) OnRemove(_ string, vc *networkv1.VlanConfig) (*networkv1.VlanCo
return vc, nil
}

func (h Handler) initialize() error {
if err := iface.DisableBridgeNF(); err != nil {
return fmt.Errorf("disable net.bridge.bridge-nf-call-iptables failed, error: %v", err)
}
return nil
}

// MatchNode will also return the executed vlanconfig with the same clusterNetwork on this node if existing
func (h Handler) MatchNode(vc *networkv1.VlanConfig) (bool, error) {
if vc.Annotations == nil || vc.Annotations[utils.KeyMatchedNodes] == "" {
Expand Down
6 changes: 0 additions & 6 deletions pkg/network/vlan/vlan.go
Original file line number Diff line number Diff line change
Expand Up @@ -142,9 +142,3 @@ func (v *Vlan) Bridge() *iface.Bridge {
func (v *Vlan) Uplink() *iface.Link {
return v.uplink
}

func init() {
if err := iface.DisableBridgeNF(); err != nil {
klog.Fatalf("disable net.bridge.bridge-nf-call-iptables failed, error: %v", err)
}
}

0 comments on commit 38aee8b

Please sign in to comment.