github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

Auto commit by PR queue bot
pull/6/head
k8s-merge-robot 2015-10-01 00:28:38 -07:00
parent 00ab055fa1 4bf0ef8ce2
commit fb4882620f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/proxy/iptables/proxier.go
View File

@ -189,7 +189,7 @@ func NewProxier(ipt utiliptables.Interface, exec utilexec.Interface, syncPeriod
// care about.
exec.Command("modprobe", "br-netfilter").CombinedOutput()
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{