From 9d71e5338db0950478624b2ac99c047c8bc97958 Mon Sep 17 00:00:00 2001 From: Quan Tian Date: Sat, 8 Jun 2024 17:29:51 +0800 Subject: [PATCH] Remove unused sysctl parameter from nftables proxy Signed-off-by: Quan Tian --- cmd/kube-proxy/app/server_linux.go | 2 -- pkg/proxy/nftables/proxier.go | 7 ++----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/cmd/kube-proxy/app/server_linux.go b/cmd/kube-proxy/app/server_linux.go index f1e150e3a70..d052d2bb790 100644 --- a/cmd/kube-proxy/app/server_linux.go +++ b/cmd/kube-proxy/app/server_linux.go @@ -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. proxier, err = nftables.NewDualStackProxier( ctx, - utilsysctl.New(), config.NFTables.SyncPeriod.Duration, config.NFTables.MinSyncPeriod.Duration, config.NFTables.MasqueradeAll, @@ -314,7 +313,6 @@ func (s *ProxyServer) createProxier(ctx context.Context, config *proxyconfigapi. proxier, err = nftables.NewProxier( ctx, s.PrimaryIPFamily, - utilsysctl.New(), config.NFTables.SyncPeriod.Duration, config.NFTables.MinSyncPeriod.Duration, config.NFTables.MasqueradeAll, diff --git a/pkg/proxy/nftables/proxier.go b/pkg/proxy/nftables/proxier.go index e4740310587..0ba4a437363 100644 --- a/pkg/proxy/nftables/proxier.go +++ b/pkg/proxy/nftables/proxier.go @@ -42,7 +42,6 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/tools/events" - utilsysctl "k8s.io/component-helpers/node/util/sysctl" "k8s.io/klog/v2" "k8s.io/kubernetes/pkg/proxy" "k8s.io/kubernetes/pkg/proxy/conntrack" @@ -105,7 +104,6 @@ const ( // NewDualStackProxier creates a MetaProxier instance, with IPv4 and IPv6 proxies. func NewDualStackProxier( ctx context.Context, - sysctl utilsysctl.Interface, syncPeriod time.Duration, minSyncPeriod time.Duration, masqueradeAll bool, @@ -119,7 +117,7 @@ func NewDualStackProxier( initOnly bool, ) (proxy.Provider, error) { // 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, localDetectors[v1.IPv4Protocol], hostname, nodeIPs[v1.IPv4Protocol], recorder, healthzServer, nodePortAddresses, initOnly) @@ -127,7 +125,7 @@ func NewDualStackProxier( 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, localDetectors[v1.IPv6Protocol], hostname, nodeIPs[v1.IPv6Protocol], recorder, healthzServer, nodePortAddresses, initOnly) @@ -203,7 +201,6 @@ var _ proxy.Provider = &Proxier{} // call fails. func NewProxier(ctx context.Context, ipFamily v1.IPFamily, - sysctl utilsysctl.Interface, syncPeriod time.Duration, minSyncPeriod time.Duration, masqueradeAll bool,