From 04d60ddab05b866b227ef128205adb936d1e1944 Mon Sep 17 00:00:00 2001
From: Tim Hockin <thockin@google.com>
Date: Sun, 3 Jul 2016 09:54:26 -0700
Subject: [PATCH] Remove br_netfilter warning in kube-proxy

Many distros have this module linked in, generating a spurious error.
---
 pkg/proxy/iptables/proxier.go | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/pkg/proxy/iptables/proxier.go b/pkg/proxy/iptables/proxier.go
index 38a4226ee45..7ef1c0ce4cb 100644
--- a/pkg/proxy/iptables/proxier.go
+++ b/pkg/proxy/iptables/proxier.go
@@ -26,7 +26,6 @@ import (
 	"encoding/base32"
 	"fmt"
 	"net"
-	"os"
 	"reflect"
 	"strconv"
 	"strings"
@@ -198,15 +197,8 @@ func NewProxier(ipt utiliptables.Interface, exec utilexec.Interface, syncPeriod
 	// Proxy needs br_netfilter and bridge-nf-call-iptables=1 when containers
 	// are connected to a Linux bridge (but not SDN bridges).  Until most
 	// plugins handle this, log when config is missing
-	warnBrNetfilter := false
-	if _, err := os.Stat("/sys/module/br_netfilter"); os.IsNotExist(err) {
-		warnBrNetfilter = true
-	}
 	if val, err := utilsysctl.GetSysctl(sysctlBridgeCallIptables); err == nil && val != 1 {
-		warnBrNetfilter = true
-	}
-	if warnBrNetfilter {
-		glog.Infof("missing br-netfilter module or unset br-nf-call-iptables; proxy may not work as intended")
+		glog.Infof("missing br-netfilter module or unset sysctl br-nf-call-iptables; proxy may not work as intended")
 	}
 
 	// Generate the masquerade mark to use for SNAT rules.