Merge pull request kubernetes#130561 from danwinship/more-misc-proxy-cleanup

more misc proxy cleanup

Author: k8s-ci-robot

cmd/kube-proxy/app/server_linux.go

@@ -175,7 +175,6 @@ func (s *ProxyServer) createProxier(ctx context.Context, config *proxyconfigapi.
 				ctx,
 				ipt,
 				utilsysctl.New(),
-				exec.New(),
 				config.SyncPeriod.Duration,
 				config.MinSyncPeriod.Duration,
 				config.Linux.MasqueradeAll,
@@ -199,7 +198,6 @@ func (s *ProxyServer) createProxier(ctx context.Context, config *proxyconfigapi.
 				s.PrimaryIPFamily,
 				iptInterface,
 				utilsysctl.New(),
-				exec.New(),
 				config.SyncPeriod.Duration,
 				config.MinSyncPeriod.Duration,
 				config.Linux.MasqueradeAll,
@@ -219,8 +217,7 @@ func (s *ProxyServer) createProxier(ctx context.Context, config *proxyconfigapi.
 			return nil, fmt.Errorf("unable to create proxier: %v", err)
 		}
 	} else if config.Mode == proxyconfigapi.ProxyModeIPVS {
-		execer := exec.New()
-		ipsetInterface := utilipset.New(execer)
+		ipsetInterface := utilipset.New()
 		ipvsInterface := utilipvs.New()
 		if err := ipvs.CanUseIPVSProxier(ctx, ipvsInterface, ipsetInterface, config.IPVS.Scheduler); err != nil {
 			return nil, fmt.Errorf("can't use the IPVS proxier: %v", err)
@@ -235,7 +232,6 @@ func (s *ProxyServer) createProxier(ctx context.Context, config *proxyconfigapi.
 				ipvsInterface,
 				ipsetInterface,
 				utilsysctl.New(),
-				execer,
 				config.SyncPeriod.Duration,
 				config.MinSyncPeriod.Duration,
 				config.IPVS.ExcludeCIDRs,
@@ -263,7 +259,6 @@ func (s *ProxyServer) createProxier(ctx context.Context, config *proxyconfigapi.
 				ipvsInterface,
 				ipsetInterface,
 				utilsysctl.New(),
-				execer,
 				config.SyncPeriod.Duration,
 				config.MinSyncPeriod.Duration,
 				config.IPVS.ExcludeCIDRs,
@@ -515,8 +510,7 @@ func platformCleanup(ctx context.Context, mode proxyconfigapi.ProxyMode, cleanup
 	// Clean up iptables and ipvs rules if switching to nftables, or if cleanupAndExit
 	if !isIPTablesBased(mode) || cleanupAndExit {
 		ipts, _ := getIPTables(v1.IPFamilyUnknown)
-		execer := exec.New()
-		ipsetInterface := utilipset.New(execer)
+		ipsetInterface := utilipset.New()
 		ipvsInterface := utilipvs.New()
 
 		for _, ipt := range ipts {

pkg/proxy/iptables/proxier.go

@@ -19,10 +19,6 @@ limitations under the License.
 
 package iptables
 
-//
-// NOTE: this needs to be tested in e2e since it uses iptables for everything.
-//
-
 import (
 	"bytes"
 	"context"
@@ -54,7 +50,6 @@ import (
 	"k8s.io/kubernetes/pkg/proxy/util/nfacct"
 	"k8s.io/kubernetes/pkg/util/async"
 	utiliptables "k8s.io/kubernetes/pkg/util/iptables"
-	utilexec "k8s.io/utils/exec"
 )
 
 const (
@@ -101,7 +96,6 @@ func NewDualStackProxier(
 	ctx context.Context,
 	ipt [2]utiliptables.Interface,
 	sysctl utilsysctl.Interface,
-	exec utilexec.Interface,
 	syncPeriod time.Duration,
 	minSyncPeriod time.Duration,
 	masqueradeAll bool,
@@ -117,15 +111,15 @@ func NewDualStackProxier(
 ) (proxy.Provider, error) {
 	// Create an ipv4 instance of the single-stack proxier
 	ipv4Proxier, err := NewProxier(ctx, v1.IPv4Protocol, ipt[0], sysctl,
-		exec, syncPeriod, minSyncPeriod, masqueradeAll, localhostNodePorts, masqueradeBit,
+		syncPeriod, minSyncPeriod, masqueradeAll, localhostNodePorts, masqueradeBit,
 		localDetectors[v1.IPv4Protocol], hostname, nodeIPs[v1.IPv4Protocol],
 		recorder, healthzServer, nodePortAddresses, initOnly)
 	if err != nil {
 		return nil, fmt.Errorf("unable to create ipv4 proxier: %v", err)
 	}
 
 	ipv6Proxier, err := NewProxier(ctx, v1.IPv6Protocol, ipt[1], sysctl,
-		exec, syncPeriod, minSyncPeriod, masqueradeAll, false, masqueradeBit,
+		syncPeriod, minSyncPeriod, masqueradeAll, false, masqueradeBit,
 		localDetectors[v1.IPv6Protocol], hostname, nodeIPs[v1.IPv6Protocol],
 		recorder, healthzServer, nodePortAddresses, initOnly)
 	if err != nil {
@@ -137,8 +131,7 @@ func NewDualStackProxier(
 	return metaproxier.NewMetaProxier(ipv4Proxier, ipv6Proxier), nil
 }
 
-// Proxier is an iptables based proxy for connections between a localhost:lport
-// and services that provide the actual backends.
+// Proxier is an iptables-based proxy
 type Proxier struct {
 	// ipFamily defines the IP family which this proxier is tracking.
 	ipFamily v1.IPFamily
@@ -175,7 +168,6 @@ type Proxier struct {
 	localDetector  proxyutil.LocalTrafficDetector
 	hostname       string
 	nodeIP         net.IP
-	recorder       events.EventRecorder
 
 	serviceHealthServer healthcheck.ServiceHealthServer
 	healthzServer       *healthcheck.ProxyHealthServer
@@ -221,16 +213,11 @@ type Proxier struct {
 // Proxier implements proxy.Provider
 var _ proxy.Provider = &Proxier{}
 
-// NewProxier returns a new Proxier given an iptables Interface instance.
-// Because of the iptables logic, it is assumed that there is only a single Proxier active on a machine.
-// An error will be returned if iptables fails to update or acquire the initial lock.
-// Once a proxier is created, it will keep iptables up to date in the background and
-// will not terminate if a particular iptables call fails.
+// NewProxier returns a new single-stack IPTables proxier.
 func NewProxier(ctx context.Context,
 	ipFamily v1.IPFamily,
 	ipt utiliptables.Interface,
 	sysctl utilsysctl.Interface,
-	exec utilexec.Interface,
 	syncPeriod time.Duration,
 	minSyncPeriod time.Duration,
 	masqueradeAll bool,
@@ -300,7 +287,6 @@ func NewProxier(ctx context.Context,
 		localDetector:            localDetector,
 		hostname:                 hostname,
 		nodeIP:                   nodeIP,
-		recorder:                 recorder,
 		serviceHealthServer:      serviceHealthServer,
 		healthzServer:            healthzServer,
 		precomputedProbabilities: make([]string, 0, 1001),

pkg/proxy/iptables/proxier_test.go

@@ -35,6 +35,7 @@ import (
 	"github.com/google/go-cmp/cmp"
 	"github.com/lithammer/dedent"
 	"github.com/stretchr/testify/assert"
+
 	v1 "k8s.io/api/core/v1"
 	discovery "k8s.io/api/discovery/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

pkg/proxy/ipvs/graceful_termination_test.go

@@ -24,10 +24,9 @@ import (
 	"reflect"
 	"testing"
 
-	netutils "k8s.io/utils/net"
-
 	utilipvs "k8s.io/kubernetes/pkg/proxy/ipvs/util"
 	utilipvstest "k8s.io/kubernetes/pkg/proxy/ipvs/util/testing"
+	netutils "k8s.io/utils/net"
 )
 
 func Test_GracefulDeleteRS(t *testing.T) {

pkg/proxy/ipvs/ipset.go

@@ -20,14 +20,13 @@ limitations under the License.
 package ipvs
 
 import (
-	"k8s.io/apimachinery/pkg/util/sets"
-	utilversion "k8s.io/apimachinery/pkg/util/version"
-	utilipset "k8s.io/kubernetes/pkg/proxy/ipvs/ipset"
-
 	"fmt"
 	"strings"
 
+	"k8s.io/apimachinery/pkg/util/sets"
+	utilversion "k8s.io/apimachinery/pkg/util/version"
 	"k8s.io/klog/v2"
+	utilipset "k8s.io/kubernetes/pkg/proxy/ipvs/ipset"
 )
 
 const (

pkg/proxy/ipvs/ipset/ipset.go

@@ -278,9 +278,9 @@ type runner struct {
 }
 
 // New returns a new Interface which will exec ipset.
-func New(exec utilexec.Interface) Interface {
+func New() Interface {
 	return &runner{
-		exec: exec,
+		exec: utilexec.New(),
 	}
 }
 

pkg/proxy/ipvs/ipset/ipset_test.go

@@ -28,6 +28,10 @@ import (
 	fakeexec "k8s.io/utils/exec/testing"
 )
 
+func newInternal(fexec *fakeexec.FakeExec) Interface {
+	return &runner{fexec}
+}
+
 func TestCheckIPSetVersion(t *testing.T) {
 	testCases := []struct {
 		vstring string
@@ -83,7 +87,7 @@ func TestFlushSet(t *testing.T) {
 			func(cmd string, args ...string) exec.Cmd { return fakeexec.InitFakeCmd(&fcmd, cmd, args...) },
 		},
 	}
-	runner := New(fexec)
+	runner := newInternal(fexec)
 	// Success.
 	err := runner.FlushSet("FOOBAR")
 	if err != nil {
@@ -119,7 +123,7 @@ func TestDestroySet(t *testing.T) {
 			func(cmd string, args ...string) exec.Cmd { return fakeexec.InitFakeCmd(&fcmd, cmd, args...) },
 		},
 	}
-	runner := New(fexec)
+	runner := newInternal(fexec)
 	// Success
 	err := runner.DestroySet("FOOBAR")
 	if err != nil {
@@ -153,7 +157,7 @@ func TestDestroyAllSets(t *testing.T) {
 			func(cmd string, args ...string) exec.Cmd { return fakeexec.InitFakeCmd(&fcmd, cmd, args...) },
 		},
 	}
-	runner := New(fexec)
+	runner := newInternal(fexec)
 	// Success
 	err := runner.DestroyAllSets()
 	if err != nil {
@@ -198,7 +202,7 @@ func TestCreateSet(t *testing.T) {
 			func(cmd string, args ...string) exec.Cmd { return fakeexec.InitFakeCmd(&fcmd, cmd, args...) },
 		},
 	}
-	runner := New(fexec)
+	runner := newInternal(fexec)
 	// Create with ignoreExistErr = false, expect success
 	err := runner.CreateSet(&testSet, false)
 	if err != nil {
@@ -388,7 +392,7 @@ func TestAddEntry(t *testing.T) {
 				func(cmd string, args ...string) exec.Cmd { return fakeexec.InitFakeCmd(&fcmd, cmd, args...) },
 			},
 		}
-		runner := New(fexec)
+		runner := newInternal(fexec)
 		// Create with ignoreExistErr = false, expect success
 		err := runner.AddEntry(testCases[i].entry.String(), testCases[i].set, false)
 		if err != nil {
@@ -437,7 +441,7 @@ func TestDelEntry(t *testing.T) {
 				func(cmd string, args ...string) exec.Cmd { return fakeexec.InitFakeCmd(&fcmd, cmd, args...) },
 			},
 		}
-		runner := New(fexec)
+		runner := newInternal(fexec)
 
 		err := runner.DelEntry(testCases[i].entry.String(), testCases[i].set.Name)
 		if err != nil {
@@ -482,7 +486,7 @@ func TestTestEntry(t *testing.T) {
 			func(cmd string, args ...string) exec.Cmd { return fakeexec.InitFakeCmd(&fcmd, cmd, args...) },
 		},
 	}
-	runner := New(fexec)
+	runner := newInternal(fexec)
 	// Success
 	ok, err := runner.TestEntry(testEntry.String(), setName)
 	if err != nil {
@@ -530,7 +534,7 @@ func TestTestEntryIPv6(t *testing.T) {
 			func(cmd string, args ...string) exec.Cmd { return fakeexec.InitFakeCmd(&fcmd, cmd, args...) },
 		},
 	}
-	runner := New(fexec)
+	runner := newInternal(fexec)
 	// Success
 	ok, err := runner.TestEntry(testEntry.String(), setName)
 	if err != nil {
@@ -604,7 +608,7 @@ Members:
 				},
 			},
 		}
-		runner := New(fexec)
+		runner := newInternal(fexec)
 		// Success
 		entries, err := runner.ListEntries("foobar")
 		if err != nil {
@@ -643,7 +647,7 @@ baz`
 			func(cmd string, args ...string) exec.Cmd { return fakeexec.InitFakeCmd(&fcmd, cmd, args...) },
 		},
 	}
-	runner := New(fexec)
+	runner := newInternal(fexec)
 	// Success
 	list, err := runner.ListSets()
 	if err != nil {

pkg/proxy/ipvs/netlink_linux.go

@@ -23,13 +23,13 @@ import (
 	"fmt"
 	"net"
 
+	"github.com/vishvananda/netlink"
+	"golang.org/x/sys/unix"
+
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/klog/v2"
 	proxyutil "k8s.io/kubernetes/pkg/proxy/util"
 	netutils "k8s.io/utils/net"
-
-	"github.com/vishvananda/netlink"
-	"golang.org/x/sys/unix"
 )
 
 type netlinkHandle struct {