Skip to content

K
k3s
Commit fb488262 authored by k8s-merge-robot's avatar k8s-merge-robot
Browse files
Options

Merge pull request #14611 from MikaelCluseau/wip-optional-sysctl

Auto commit by PR queue bot
parents 00ab055f 4bf0ef8c
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
pkg/proxy/iptables/proxier.go
View file @ fb488262
...@@ -189,7 +189,7 @@ func NewProxier(ipt utiliptables.Interface, exec utilexec.Interface, syncPeriod ...@@ -189,7 +189,7 @@ func NewProxier(ipt utiliptables.Interface, exec utilexec.Interface, syncPeriod
// care about. // care about.
exec.Command("modprobe", "br-netfilter").CombinedOutput() exec.Command("modprobe", "br-netfilter").CombinedOutput()
if err := setSysctl(sysctlBridgeCallIptables, 1); err != nil { if err := setSysctl(sysctlBridgeCallIptables, 1); err != nil {
return nil, fmt.Errorf("can't set sysctl %s: %v", sysctlBridgeCallIptables, err) glog.Warningf("can't set sysctl %s: %v", sysctlBridgeCallIptables, err)
} }
return &Proxier{ return &Proxier{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment