Skip to content

Commit f5969ad

Browse files
danwinshipdanwinship
committed
Clean up NewServiceChangeTracker/NewEndpointsChangeTracker args
Remove the now-unused event recorders, and put the remaining args into a sensible order, and consistent between the two.
1 parent 79d1c07 commit f5969ad

13 files changed

+38
-42
lines changed

‎pkg/proxy/conntrack/cleanup_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ func TestCleanStaleEntries(t *testing.T) {
6262
// interface, or else use a proxy.ServiceChangeTracker and proxy.NewEndpointsChangeTracker
6363
// to construct them and fill in the maps for us.
6464

65-
sct := proxy.NewServiceChangeTracker(nil, v1.IPv4Protocol, nil, nil)
65+
sct := proxy.NewServiceChangeTracker(v1.IPv4Protocol, nil, nil)
6666
svc := &v1.Service{
6767
ObjectMeta: metav1.ObjectMeta{
6868
Name: testServiceName,
@@ -104,7 +104,7 @@ func TestCleanStaleEntries(t *testing.T) {
104104
svcPortMap := make(proxy.ServicePortMap)
105105
_ = svcPortMap.Update(sct)
106106

107-
ect := proxy.NewEndpointsChangeTracker("test-worker", nil, v1.IPv4Protocol, nil, nil)
107+
ect := proxy.NewEndpointsChangeTracker(v1.IPv4Protocol, "test-worker", nil, nil)
108108
eps := &discovery.EndpointSlice{
109109
TypeMeta: metav1.TypeMeta{},
110110
AddressType: discovery.AddressTypeIPv4,

‎pkg/proxy/endpointschangetracker.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import (
2424
discovery "k8s.io/api/discovery/v1"
2525
"k8s.io/apimachinery/pkg/types"
2626
"k8s.io/apimachinery/pkg/util/sets"
27-
"k8s.io/client-go/tools/events"
2827
"k8s.io/klog/v2"
2928
"k8s.io/kubernetes/pkg/proxy/metrics"
3029
)
@@ -60,7 +59,7 @@ type makeEndpointFunc func(info *BaseEndpointInfo, svcPortName *ServicePortName)
6059
type processEndpointsMapChangeFunc func(oldEndpointsMap, newEndpointsMap EndpointsMap)
6160

6261
// NewEndpointsChangeTracker initializes an EndpointsChangeTracker
63-
func NewEndpointsChangeTracker(hostname string, makeEndpointInfo makeEndpointFunc, ipFamily v1.IPFamily, _ events.EventRecorder, processEndpointsMapChange processEndpointsMapChangeFunc) *EndpointsChangeTracker {
62+
func NewEndpointsChangeTracker(ipFamily v1.IPFamily, hostname string, makeEndpointInfo makeEndpointFunc, processEndpointsMapChange processEndpointsMapChangeFunc) *EndpointsChangeTracker {
6463
addressType := discovery.AddressTypeIPv4
6564
if ipFamily == v1.IPv6Protocol {
6665
addressType = discovery.AddressTypeIPv6

‎pkg/proxy/endpointschangetracker_test.go‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1244,7 +1244,7 @@ func TestEndpointSliceUpdate(t *testing.T) {
12441244
// test starting from an empty state
12451245
"add a simple slice that doesn't already exist": {
12461246
startingSlices: []*discovery.EndpointSlice{},
1247-
endpointsChangeTracker: NewEndpointsChangeTracker("host1", nil, v1.IPv4Protocol, nil, nil),
1247+
endpointsChangeTracker: NewEndpointsChangeTracker(v1.IPv4Protocol, "host1", nil, nil),
12481248
namespacedName: types.NamespacedName{Name: "svc1", Namespace: "ns1"},
12491249
paramEndpointSlice: generateEndpointSlice("svc1", "ns1", 1, 3, 999, 999, []string{"host1", "host2"}, []*int32{ptr.To[int32](80), ptr.To[int32](443)}),
12501250
paramRemoveSlice: false,
@@ -1267,7 +1267,7 @@ func TestEndpointSliceUpdate(t *testing.T) {
12671267
startingSlices: []*discovery.EndpointSlice{
12681268
generateEndpointSlice("svc1", "ns1", 1, 3, 999, 999, []string{"host1", "host2"}, []*int32{ptr.To[int32](80), ptr.To[int32](443)}),
12691269
},
1270-
endpointsChangeTracker: NewEndpointsChangeTracker("host1", nil, v1.IPv4Protocol, nil, nil),
1270+
endpointsChangeTracker: NewEndpointsChangeTracker(v1.IPv4Protocol, "host1", nil, nil),
12711271
namespacedName: types.NamespacedName{Name: "svc1", Namespace: "ns1"},
12721272
paramEndpointSlice: generateEndpointSlice("svc1", "ns1", 1, 3, 999, 999, []string{"host1", "host2"}, []*int32{ptr.To[int32](80), ptr.To[int32](443)}),
12731273
paramRemoveSlice: false,
@@ -1279,7 +1279,7 @@ func TestEndpointSliceUpdate(t *testing.T) {
12791279
startingSlices: []*discovery.EndpointSlice{
12801280
generateEndpointSlice("svc1", "ns1", 1, 3, 999, 999, []string{"host1", "host2"}, []*int32{ptr.To[int32](80), ptr.To[int32](443)}),
12811281
},
1282-
endpointsChangeTracker: NewEndpointsChangeTracker("host1", nil, v1.IPv4Protocol, nil, nil),
1282+
endpointsChangeTracker: NewEndpointsChangeTracker(v1.IPv4Protocol, "host1", nil, nil),
12831283
namespacedName: types.NamespacedName{Name: "svc1", Namespace: "ns1"},
12841284
paramEndpointSlice: fqdnSlice,
12851285
paramRemoveSlice: false,
@@ -1292,7 +1292,7 @@ func TestEndpointSliceUpdate(t *testing.T) {
12921292
generateEndpointSlice("svc1", "ns1", 1, 3, 999, 999, []string{"host1", "host2"}, []*int32{ptr.To[int32](80), ptr.To[int32](443)}),
12931293
generateEndpointSlice("svc1", "ns1", 2, 2, 999, 999, []string{"host1", "host2"}, []*int32{ptr.To[int32](80), ptr.To[int32](443)}),
12941294
},
1295-
endpointsChangeTracker: NewEndpointsChangeTracker("host1", nil, v1.IPv4Protocol, nil, nil),
1295+
endpointsChangeTracker: NewEndpointsChangeTracker(v1.IPv4Protocol, "host1", nil, nil),
12961296
namespacedName: types.NamespacedName{Name: "svc1", Namespace: "ns1"},
12971297
paramEndpointSlice: generateEndpointSlice("svc1", "ns1", 1, 5, 999, 999, []string{"host1"}, []*int32{ptr.To[int32](80), ptr.To[int32](443)}),
12981298
paramRemoveSlice: false,
@@ -1324,7 +1324,7 @@ func TestEndpointSliceUpdate(t *testing.T) {
13241324
generateEndpointSlice("svc1", "ns1", 1, 3, 999, 999, []string{"host1", "host2"}, []*int32{ptr.To[int32](80), ptr.To[int32](443)}),
13251325
generateEndpointSlice("svc1", "ns1", 2, 2, 999, 999, []string{"host1", "host2"}, []*int32{ptr.To[int32](80), ptr.To[int32](443)}),
13261326
},
1327-
endpointsChangeTracker: NewEndpointsChangeTracker("host1", nil, v1.IPv4Protocol, nil, nil),
1327+
endpointsChangeTracker: NewEndpointsChangeTracker(v1.IPv4Protocol, "host1", nil, nil),
13281328
namespacedName: types.NamespacedName{Name: "svc1", Namespace: "ns1"},
13291329
paramEndpointSlice: generateEndpointSliceWithOffset("svc1", "ns1", 3, 1, 5, 999, 999, []string{"host1"}, []*int32{ptr.To[int32](80)}),
13301330
paramRemoveSlice: false,
@@ -1354,7 +1354,7 @@ func TestEndpointSliceUpdate(t *testing.T) {
13541354
generateEndpointSlice("svc1", "ns1", 1, 3, 999, 999, []string{"host1", "host2"}, []*int32{ptr.To[int32](80), ptr.To[int32](443)}),
13551355
generateEndpointSlice("svc1", "ns1", 2, 2, 999, 999, []string{"host1", "host2"}, []*int32{ptr.To[int32](80), ptr.To[int32](443)}),
13561356
},
1357-
endpointsChangeTracker: NewEndpointsChangeTracker("host1", nil, v1.IPv4Protocol, nil, nil),
1357+
endpointsChangeTracker: NewEndpointsChangeTracker(v1.IPv4Protocol, "host1", nil, nil),
13581358
namespacedName: types.NamespacedName{Name: "svc1", Namespace: "ns1"},
13591359
paramEndpointSlice: generateEndpointSlice("svc1", "ns1", 1, 5, 999, 999, []string{"host1"}, []*int32{ptr.To[int32](80), ptr.To[int32](443)}),
13601360
paramRemoveSlice: true,
@@ -1376,7 +1376,7 @@ func TestEndpointSliceUpdate(t *testing.T) {
13761376
generateEndpointSlice("svc1", "ns1", 1, 5, 999, 999, []string{"host1"}, []*int32{ptr.To[int32](80), ptr.To[int32](443)}),
13771377
generateEndpointSlice("svc1", "ns1", 2, 2, 999, 999, []string{"host1"}, []*int32{ptr.To[int32](80), ptr.To[int32](443)}),
13781378
},
1379-
endpointsChangeTracker: NewEndpointsChangeTracker("host1", nil, v1.IPv4Protocol, nil, nil),
1379+
endpointsChangeTracker: NewEndpointsChangeTracker(v1.IPv4Protocol, "host1", nil, nil),
13801380
namespacedName: types.NamespacedName{Name: "svc1", Namespace: "ns1"},
13811381
paramEndpointSlice: generateEndpointSlice("svc1", "ns1", 3, 5, 999, 999, []string{"host1"}, []*int32{ptr.To[int32](80), ptr.To[int32](443)}),
13821382
paramRemoveSlice: true,
@@ -1388,7 +1388,7 @@ func TestEndpointSliceUpdate(t *testing.T) {
13881388
startingSlices: []*discovery.EndpointSlice{
13891389
generateEndpointSlice("svc1", "ns1", 1, 3, 999, 999, []string{"host1", "host2"}, []*int32{ptr.To[int32](80), ptr.To[int32](443)}),
13901390
},
1391-
endpointsChangeTracker: NewEndpointsChangeTracker("host1", nil, v1.IPv4Protocol, nil, nil),
1391+
endpointsChangeTracker: NewEndpointsChangeTracker(v1.IPv4Protocol, "host1", nil, nil),
13921392
namespacedName: types.NamespacedName{Name: "svc1", Namespace: "ns1"},
13931393
paramEndpointSlice: generateEndpointSlice("svc1", "ns1", 1, 3, 1, 999, []string{"host1"}, []*int32{ptr.To[int32](80), ptr.To[int32](443)}),
13941394
paramRemoveSlice: false,
@@ -1411,7 +1411,7 @@ func TestEndpointSliceUpdate(t *testing.T) {
14111411
startingSlices: []*discovery.EndpointSlice{
14121412
generateEndpointSlice("svc1", "ns1", 1, 2, 1, 999, []string{"host1", "host2"}, []*int32{ptr.To[int32](80), ptr.To[int32](443)}),
14131413
},
1414-
endpointsChangeTracker: NewEndpointsChangeTracker("host1", nil, v1.IPv4Protocol, nil, nil),
1414+
endpointsChangeTracker: NewEndpointsChangeTracker(v1.IPv4Protocol, "host1", nil, nil),
14151415
namespacedName: types.NamespacedName{Name: "svc1", Namespace: "ns1"},
14161416
paramEndpointSlice: generateEndpointSlice("svc1", "ns1", 1, 2, 999, 999, []string{"host1"}, []*int32{ptr.To[int32](80), ptr.To[int32](443)}),
14171417
paramRemoveSlice: false,
@@ -1433,7 +1433,7 @@ func TestEndpointSliceUpdate(t *testing.T) {
14331433
generateEndpointSlice("svc1", "ns1", 1, 3, 2, 999, []string{"host1"}, []*int32{ptr.To[int32](80), ptr.To[int32](443)}),
14341434
generateEndpointSlice("svc1", "ns1", 2, 2, 2, 999, []string{"host1"}, []*int32{ptr.To[int32](80), ptr.To[int32](443)}),
14351435
},
1436-
endpointsChangeTracker: NewEndpointsChangeTracker("host1", nil, v1.IPv4Protocol, nil, nil),
1436+
endpointsChangeTracker: NewEndpointsChangeTracker(v1.IPv4Protocol, "host1", nil, nil),
14371437
namespacedName: types.NamespacedName{Name: "svc1", Namespace: "ns1"},
14381438
paramEndpointSlice: generateEndpointSlice("svc1", "ns1", 1, 3, 3, 999, []string{"host1"}, []*int32{ptr.To[int32](80), ptr.To[int32](443)}),
14391439
paramRemoveSlice: false,
@@ -1461,7 +1461,7 @@ func TestEndpointSliceUpdate(t *testing.T) {
14611461
generateEndpointSlice("svc1", "ns1", 1, 3, 2, 2, []string{"host1"}, []*int32{ptr.To[int32](80), ptr.To[int32](443)}),
14621462
generateEndpointSlice("svc1", "ns1", 2, 2, 2, 2, []string{"host1"}, []*int32{ptr.To[int32](80), ptr.To[int32](443)}),
14631463
},
1464-
endpointsChangeTracker: NewEndpointsChangeTracker("host1", nil, v1.IPv4Protocol, nil, nil),
1464+
endpointsChangeTracker: NewEndpointsChangeTracker(v1.IPv4Protocol, "host1", nil, nil),
14651465
namespacedName: types.NamespacedName{Name: "svc1", Namespace: "ns1"},
14661466
paramEndpointSlice: generateEndpointSlice("svc1", "ns1", 1, 3, 3, 2, []string{"host1"}, []*int32{ptr.To[int32](80), ptr.To[int32](443)}),
14671467
paramRemoveSlice: false,
@@ -1521,13 +1521,13 @@ func TestCheckoutChanges(t *testing.T) {
15211521
pendingSlices []*discovery.EndpointSlice
15221522
}{
15231523
"empty slices": {
1524-
endpointsChangeTracker: NewEndpointsChangeTracker("", nil, v1.IPv4Protocol, nil, nil),
1524+
endpointsChangeTracker: NewEndpointsChangeTracker(v1.IPv4Protocol, "", nil, nil),
15251525
expectedChanges: []*endpointsChange{},
15261526
appliedSlices: []*discovery.EndpointSlice{},
15271527
pendingSlices: []*discovery.EndpointSlice{},
15281528
},
15291529
"adding initial slice": {
1530-
endpointsChangeTracker: NewEndpointsChangeTracker("", nil, v1.IPv4Protocol, nil, nil),
1530+
endpointsChangeTracker: NewEndpointsChangeTracker(v1.IPv4Protocol, "", nil, nil),
15311531
expectedChanges: []*endpointsChange{{
15321532
previous: EndpointsMap{},
15331533
current: EndpointsMap{
@@ -1544,7 +1544,7 @@ func TestCheckoutChanges(t *testing.T) {
15441544
},
15451545
},
15461546
"removing port in update": {
1547-
endpointsChangeTracker: NewEndpointsChangeTracker("", nil, v1.IPv4Protocol, nil, nil),
1547+
endpointsChangeTracker: NewEndpointsChangeTracker(v1.IPv4Protocol, "", nil, nil),
15481548
expectedChanges: []*endpointsChange{{
15491549
previous: EndpointsMap{
15501550
svcPortName0: []Endpoint{

‎pkg/proxy/iptables/proxier.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -286,9 +286,9 @@ func NewProxier(ctx context.Context,
286286
proxier := &Proxier{
287287
ipFamily: ipFamily,
288288
svcPortMap: make(proxy.ServicePortMap),
289-
serviceChanges: proxy.NewServiceChangeTracker(newServiceInfo, ipFamily, recorder, nil),
289+
serviceChanges: proxy.NewServiceChangeTracker(ipFamily, newServiceInfo, nil),
290290
endpointsMap: make(proxy.EndpointsMap),
291-
endpointsChanges: proxy.NewEndpointsChangeTracker(hostname, newEndpointInfo, ipFamily, recorder, nil),
291+
endpointsChanges: proxy.NewEndpointsChangeTracker(ipFamily, hostname, newEndpointInfo, nil),
292292
needFullSync: true,
293293
syncPeriod: syncPeriod,
294294
iptables: ipt,

‎pkg/proxy/iptables/proxier_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,9 @@ func NewFakeProxier(ipt utiliptables.Interface) *Proxier {
116116
p := &Proxier{
117117
ipFamily: ipfamily,
118118
svcPortMap: make(proxy.ServicePortMap),
119-
serviceChanges: proxy.NewServiceChangeTracker(newServiceInfo, ipfamily, nil, nil),
119+
serviceChanges: proxy.NewServiceChangeTracker(ipfamily, newServiceInfo, nil),
120120
endpointsMap: make(proxy.EndpointsMap),
121-
endpointsChanges: proxy.NewEndpointsChangeTracker(testHostname, newEndpointInfo, ipfamily, nil, nil),
121+
endpointsChanges: proxy.NewEndpointsChangeTracker(ipfamily, testHostname, newEndpointInfo, nil),
122122
needFullSync: true,
123123
iptables: ipt,
124124
masqueradeMark: "0x4000",

‎pkg/proxy/ipvs/proxier.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -375,9 +375,9 @@ func NewProxier(
375375
proxier := &Proxier{
376376
ipFamily: ipFamily,
377377
svcPortMap: make(proxy.ServicePortMap),
378-
serviceChanges: proxy.NewServiceChangeTracker(newServiceInfo, ipFamily, recorder, nil),
378+
serviceChanges: proxy.NewServiceChangeTracker(ipFamily, newServiceInfo, nil),
379379
endpointsMap: make(proxy.EndpointsMap),
380-
endpointsChanges: proxy.NewEndpointsChangeTracker(hostname, nil, ipFamily, recorder, nil),
380+
endpointsChanges: proxy.NewEndpointsChangeTracker(ipFamily, hostname, nil, nil),
381381
initialSync: true,
382382
syncPeriod: syncPeriod,
383383
minSyncPeriod: minSyncPeriod,

‎pkg/proxy/ipvs/proxier_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,9 +140,9 @@ func NewFakeProxier(ctx context.Context, ipt utiliptables.Interface, ipvs utilip
140140
}
141141
p := &Proxier{
142142
svcPortMap: make(proxy.ServicePortMap),
143-
serviceChanges: proxy.NewServiceChangeTracker(newServiceInfo, ipFamily, nil, nil),
143+
serviceChanges: proxy.NewServiceChangeTracker(ipFamily, newServiceInfo, nil),
144144
endpointsMap: make(proxy.EndpointsMap),
145-
endpointsChanges: proxy.NewEndpointsChangeTracker(testHostname, nil, ipFamily, nil, nil),
145+
endpointsChanges: proxy.NewEndpointsChangeTracker(ipFamily, testHostname, nil, nil),
146146
excludeCIDRs: excludeCIDRs,
147147
iptables: ipt,
148148
ipvs: ipvs,

‎pkg/proxy/nftables/proxier.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,9 +250,9 @@ func NewProxier(ctx context.Context,
250250
proxier := &Proxier{
251251
ipFamily: ipFamily,
252252
svcPortMap: make(proxy.ServicePortMap),
253-
serviceChanges: proxy.NewServiceChangeTracker(newServiceInfo, ipFamily, recorder, nil),
253+
serviceChanges: proxy.NewServiceChangeTracker(ipFamily, newServiceInfo, nil),
254254
endpointsMap: make(proxy.EndpointsMap),
255-
endpointsChanges: proxy.NewEndpointsChangeTracker(hostname, newEndpointInfo, ipFamily, recorder, nil),
255+
endpointsChanges: proxy.NewEndpointsChangeTracker(ipFamily, hostname, newEndpointInfo, nil),
256256
needFullSync: true,
257257
syncPeriod: syncPeriod,
258258
nftables: nft,

‎pkg/proxy/nftables/proxier_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,9 +118,9 @@ func NewFakeProxier(ipFamily v1.IPFamily) (*knftables.Fake, *Proxier) {
118118
p := &Proxier{
119119
ipFamily: ipFamily,
120120
svcPortMap: make(proxy.ServicePortMap),
121-
serviceChanges: proxy.NewServiceChangeTracker(newServiceInfo, ipFamily, nil, nil),
121+
serviceChanges: proxy.NewServiceChangeTracker(ipFamily, newServiceInfo, nil),
122122
endpointsMap: make(proxy.EndpointsMap),
123-
endpointsChanges: proxy.NewEndpointsChangeTracker(testHostname, newEndpointInfo, ipFamily, nil, nil),
123+
endpointsChanges: proxy.NewEndpointsChangeTracker(ipFamily, testHostname, newEndpointInfo, nil),
124124
needFullSync: true,
125125
nftables: nft,
126126
masqueradeMark: "0x4000",

‎pkg/proxy/servicechangetracker.go‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import (
2323
v1 "k8s.io/api/core/v1"
2424
"k8s.io/apimachinery/pkg/types"
2525
"k8s.io/apimachinery/pkg/util/sets"
26-
"k8s.io/client-go/tools/events"
2726
"k8s.io/klog/v2"
2827
"k8s.io/kubernetes/pkg/proxy/metrics"
2928
proxyutil "k8s.io/kubernetes/pkg/proxy/util"
@@ -46,7 +45,6 @@ type ServiceChangeTracker struct {
4645
processServiceMapChange processServiceMapChangeFunc
4746

4847
ipFamily v1.IPFamily
49-
recorder events.EventRecorder
5048
}
5149

5250
type makeServicePortFunc func(*v1.ServicePort, *v1.Service, *BaseServicePortInfo) ServicePort
@@ -61,11 +59,10 @@ type serviceChange struct {
6159
}
6260

6361
// NewServiceChangeTracker initializes a ServiceChangeTracker
64-
func NewServiceChangeTracker(makeServiceInfo makeServicePortFunc, ipFamily v1.IPFamily, recorder events.EventRecorder, processServiceMapChange processServiceMapChangeFunc) *ServiceChangeTracker {
62+
func NewServiceChangeTracker(ipFamily v1.IPFamily, makeServiceInfo makeServicePortFunc, processServiceMapChange processServiceMapChangeFunc) *ServiceChangeTracker {
6563
return &ServiceChangeTracker{
6664
items: make(map[types.NamespacedName]*serviceChange),
6765
makeServiceInfo: makeServiceInfo,
68-
recorder: recorder,
6966
ipFamily: ipFamily,
7067
processServiceMapChange: processServiceMapChange,
7168
}

0 commit comments

Comments
 (0)