github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #120851 from dhruvmehtaaa/remove-code

Browse Source 
Remove an old compatibility check/warning
This commit is contained in:
Kubernetes Prow Robot
2023-09-24 12:28:57 -07:00
committed by GitHub
parent c5cf0ac188 7c5219438d
commit ba0505319e
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/proxy/ipvs/proxier.go
View File

@@ -201,7 +201,6 @@ var ipsetWithIptablesChain = []struct {
// In IPVS proxy mode, the following flags need to be set // In IPVS proxy mode, the following flags need to be set
const ( const (
sysctlBridgeCallIPTables = "net/bridge/bridge-nf-call-iptables"
sysctlVSConnTrack = "net/ipv4/vs/conntrack" sysctlVSConnTrack = "net/ipv4/vs/conntrack"
sysctlConnReuse = "net/ipv4/vs/conn_reuse_mode" sysctlConnReuse = "net/ipv4/vs/conn_reuse_mode"
sysctlExpireNoDestConn = "net/ipv4/vs/expire_nodest_conn" sysctlExpireNoDestConn = "net/ipv4/vs/expire_nodest_conn"
@@ -330,13 +329,6 @@ func NewProxier(ipFamily v1.IPFamily,
nodePortAddressStrings []string, nodePortAddressStrings []string,
kernelHandler KernelHandler, kernelHandler KernelHandler,
) (*Proxier, error) { ) (*Proxier, error) {
// 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
if val, err := sysctl.GetSysctl(sysctlBridgeCallIPTables); err == nil && val != 1 {
klog.InfoS("Missing br-netfilter module or unset sysctl br-nf-call-iptables, proxy may not work as intended")
}
// Set the conntrack sysctl we need for // Set the conntrack sysctl we need for
if err := proxyutil.EnsureSysctl(sysctl, sysctlVSConnTrack, 1); err != nil { if err := proxyutil.EnsureSysctl(sysctl, sysctlVSConnTrack, 1); err != nil {
return nil, err return nil, err