Don't verify nf_conntrack for br_netfilter

We need to make sure that the br_netfilter kernel module
has been loaded, when using non-Docker container runtimes.

But the code was verifying the nf_conntrack kernel module
instead, so it could still cause the "not loaded" error.

[ERROR FileContent--proc-sys-net-bridge-bridge-nf-call-iptables]
pull/8598/head
Anders F Björklund 2020-06-29 22:27:18 +02:00
parent 4485c5c3d2
commit a9273beec7
1 changed files with 1 additions and 1 deletions

View File

@ -208,7 +208,7 @@ func disableOthers(me Manager, cr CommandRunner) error {
// enableIPForwarding configures IP forwarding, which is handled normally by Docker
// Context: https://github.com/kubernetes/kubeadm/issues/1062
func enableIPForwarding(cr CommandRunner) error {
c := exec.Command("sudo", "sysctl", "net.netfilter.nf_conntrack_count")
c := exec.Command("sudo", "sysctl", "net.bridge.bridge-nf-call-iptables")
if rr, err := cr.RunCmd(c); err != nil {
glog.Infof("couldn't verify netfilter by %q which might be okay. error: %v", rr.Command(), err)
c = exec.Command("sudo", "modprobe", "br_netfilter")