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

Remove unused sysctl parameter from nftables proxy

Browse Source 
Signed-off-by: Quan Tian <quan.tian@broadcom.com>
This commit is contained in:
Quan Tian
2024-06-08 17:29:51 +08:00
parent 6b73cccb07
commit 9d71e5338d
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kube-proxy/app/server_linux.go
View File

@@ -295,7 +295,6 @@ func (s *ProxyServer) createProxier(ctx context.Context, config *proxyconfigapi.
// TODO this has side effects that should only happen when Run() is invoked. // TODO this has side effects that should only happen when Run() is invoked.
proxier, err = nftables.NewDualStackProxier( proxier, err = nftables.NewDualStackProxier(
ctx, ctx,
utilsysctl.New(),
config.NFTables.SyncPeriod.Duration, config.NFTables.SyncPeriod.Duration,
config.NFTables.MinSyncPeriod.Duration, config.NFTables.MinSyncPeriod.Duration,
config.NFTables.MasqueradeAll, config.NFTables.MasqueradeAll,
@@ -314,7 +313,6 @@ func (s *ProxyServer) createProxier(ctx context.Context, config *proxyconfigapi.
proxier, err = nftables.NewProxier( proxier, err = nftables.NewProxier(
ctx, ctx,
s.PrimaryIPFamily, s.PrimaryIPFamily,
utilsysctl.New(),
config.NFTables.SyncPeriod.Duration, config.NFTables.SyncPeriod.Duration,
config.NFTables.MinSyncPeriod.Duration, config.NFTables.MinSyncPeriod.Duration,
config.NFTables.MasqueradeAll, config.NFTables.MasqueradeAll,

7
pkg/proxy/nftables/proxier.go
View File

@@ -42,7 +42,6 @@ import (
"k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/sets"
"k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/util/wait"
"k8s.io/client-go/tools/events" "k8s.io/client-go/tools/events"
utilsysctl "k8s.io/component-helpers/node/util/sysctl"
"k8s.io/klog/v2" "k8s.io/klog/v2"
"k8s.io/kubernetes/pkg/proxy" "k8s.io/kubernetes/pkg/proxy"
"k8s.io/kubernetes/pkg/proxy/conntrack" "k8s.io/kubernetes/pkg/proxy/conntrack"
@@ -105,7 +104,6 @@ const (
// NewDualStackProxier creates a MetaProxier instance, with IPv4 and IPv6 proxies. // NewDualStackProxier creates a MetaProxier instance, with IPv4 and IPv6 proxies.
func NewDualStackProxier( func NewDualStackProxier(
ctx context.Context, ctx context.Context,
sysctl utilsysctl.Interface,
syncPeriod time.Duration, syncPeriod time.Duration,
minSyncPeriod time.Duration, minSyncPeriod time.Duration,
masqueradeAll bool, masqueradeAll bool,
@@ -119,7 +117,7 @@ func NewDualStackProxier(
initOnly bool, initOnly bool,
) (proxy.Provider, error) { ) (proxy.Provider, error) {
// Create an ipv4 instance of the single-stack proxier // Create an ipv4 instance of the single-stack proxier
ipv4Proxier, err := NewProxier(ctx, v1.IPv4Protocol, sysctl, ipv4Proxier, err := NewProxier(ctx, v1.IPv4Protocol,
syncPeriod, minSyncPeriod, masqueradeAll, masqueradeBit, syncPeriod, minSyncPeriod, masqueradeAll, masqueradeBit,
localDetectors[v1.IPv4Protocol], hostname, nodeIPs[v1.IPv4Protocol], localDetectors[v1.IPv4Protocol], hostname, nodeIPs[v1.IPv4Protocol],
recorder, healthzServer, nodePortAddresses, initOnly) recorder, healthzServer, nodePortAddresses, initOnly)
@@ -127,7 +125,7 @@ func NewDualStackProxier(
return nil, fmt.Errorf("unable to create ipv4 proxier: %v", err) return nil, fmt.Errorf("unable to create ipv4 proxier: %v", err)
} }
ipv6Proxier, err := NewProxier(ctx, v1.IPv6Protocol, sysctl, ipv6Proxier, err := NewProxier(ctx, v1.IPv6Protocol,
syncPeriod, minSyncPeriod, masqueradeAll, masqueradeBit, syncPeriod, minSyncPeriod, masqueradeAll, masqueradeBit,
localDetectors[v1.IPv6Protocol], hostname, nodeIPs[v1.IPv6Protocol], localDetectors[v1.IPv6Protocol], hostname, nodeIPs[v1.IPv6Protocol],
recorder, healthzServer, nodePortAddresses, initOnly) recorder, healthzServer, nodePortAddresses, initOnly)
@@ -203,7 +201,6 @@ var _ proxy.Provider = &Proxier{}
// call fails. // call fails.
func NewProxier(ctx context.Context, func NewProxier(ctx context.Context,
ipFamily v1.IPFamily, ipFamily v1.IPFamily,
sysctl utilsysctl.Interface,
syncPeriod time.Duration, syncPeriod time.Duration,
minSyncPeriod time.Duration, minSyncPeriod time.Duration,
masqueradeAll bool, masqueradeAll bool,