Skip to content

Commit be1c991

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#128819 from danwinship/tracker-cleanup
cleanups to proxy change trackers
2 parents 21525f3 + f5969ad commit be1c991

17 files changed

+77
-144
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: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,10 @@ 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
)
3130

32-
var supportedEndpointSliceAddressTypes = sets.New[discovery.AddressType](
33-
discovery.AddressTypeIPv4,
34-
discovery.AddressTypeIPv6,
35-
)
36-
3731
// EndpointsChangeTracker carries state about uncommitted changes to an arbitrary number of
3832
// Endpoints, keyed by their namespace and name.
3933
type EndpointsChangeTracker struct {
@@ -45,6 +39,9 @@ type EndpointsChangeTracker struct {
4539
// any Proxier-specific cleanup.
4640
processEndpointsMapChange processEndpointsMapChangeFunc
4741

42+
// addressType is the type of EndpointSlice this proxy tracks
43+
addressType discovery.AddressType
44+
4845
// endpointSliceCache holds a simplified version of endpoint slices.
4946
endpointSliceCache *EndpointSliceCache
5047

@@ -62,12 +59,18 @@ type makeEndpointFunc func(info *BaseEndpointInfo, svcPortName *ServicePortName)
6259
type processEndpointsMapChangeFunc func(oldEndpointsMap, newEndpointsMap EndpointsMap)
6360

6461
// NewEndpointsChangeTracker initializes an EndpointsChangeTracker
65-
func NewEndpointsChangeTracker(hostname string, makeEndpointInfo makeEndpointFunc, ipFamily v1.IPFamily, recorder events.EventRecorder, processEndpointsMapChange processEndpointsMapChangeFunc) *EndpointsChangeTracker {
62+
func NewEndpointsChangeTracker(ipFamily v1.IPFamily, hostname string, makeEndpointInfo makeEndpointFunc, processEndpointsMapChange processEndpointsMapChangeFunc) *EndpointsChangeTracker {
63+
addressType := discovery.AddressTypeIPv4
64+
if ipFamily == v1.IPv6Protocol {
65+
addressType = discovery.AddressTypeIPv6
66+
}
67+
6668
return &EndpointsChangeTracker{
69+
addressType: addressType,
6770
lastChangeTriggerTimes: make(map[types.NamespacedName][]time.Time),
6871
trackerStartTime: time.Now(),
6972
processEndpointsMapChange: processEndpointsMapChange,
70-
endpointSliceCache: NewEndpointSliceCache(hostname, ipFamily, recorder, makeEndpointInfo),
73+
endpointSliceCache: NewEndpointSliceCache(hostname, makeEndpointInfo),
7174
}
7275
}
7376

@@ -76,14 +79,8 @@ func NewEndpointsChangeTracker(hostname string, makeEndpointInfo makeEndpointFun
7679
// change that needs to be synced; note that this is different from the return value of
7780
// ServiceChangeTracker.Update().
7881
func (ect *EndpointsChangeTracker) EndpointSliceUpdate(endpointSlice *discovery.EndpointSlice, removeSlice bool) bool {
79-
if !supportedEndpointSliceAddressTypes.Has(endpointSlice.AddressType) {
80-
klog.V(4).InfoS("EndpointSlice address type not supported by kube-proxy", "addressType", endpointSlice.AddressType)
81-
return false
82-
}
83-
84-
// This should never happen
85-
if endpointSlice == nil {
86-
klog.ErrorS(nil, "Nil endpointSlice passed to EndpointSliceUpdate")
82+
if endpointSlice.AddressType != ect.addressType {
83+
klog.V(4).InfoS("Ignoring unsupported EndpointSlice", "endpointSlice", klog.KObj(endpointSlice), "type", endpointSlice.AddressType, "expected", ect.addressType)
8784
return false
8885
}
8986

‎pkg/proxy/endpointschangetracker_test.go‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1037,7 +1037,6 @@ func TestUpdateEndpointsMap(t *testing.T) {
10371037
for tci, tc := range testCases {
10381038
t.Run(tc.name, func(t *testing.T) {
10391039
fp := newFakeProxier(v1.IPv4Protocol, time.Time{})
1040-
fp.hostname = testHostname
10411040

10421041
// First check that after adding all previous versions of endpoints,
10431042
// the fp.previousEndpointsMap is as we expect.
@@ -1245,7 +1244,7 @@ func TestEndpointSliceUpdate(t *testing.T) {
12451244
// test starting from an empty state
12461245
"add a simple slice that doesn't already exist": {
12471246
startingSlices: []*discovery.EndpointSlice{},
1248-
endpointsChangeTracker: NewEndpointsChangeTracker("host1", nil, v1.IPv4Protocol, nil, nil),
1247+
endpointsChangeTracker: NewEndpointsChangeTracker(v1.IPv4Protocol, "host1", nil, nil),
12491248
namespacedName: types.NamespacedName{Name: "svc1", Namespace: "ns1"},
12501249
paramEndpointSlice: generateEndpointSlice("svc1", "ns1", 1, 3, 999, 999, []string{"host1", "host2"}, []*int32{ptr.To[int32](80), ptr.To[int32](443)}),
12511250
paramRemoveSlice: false,
@@ -1268,7 +1267,7 @@ func TestEndpointSliceUpdate(t *testing.T) {
12681267
startingSlices: []*discovery.EndpointSlice{
12691268
generateEndpointSlice("svc1", "ns1", 1, 3, 999, 999, []string{"host1", "host2"}, []*int32{ptr.To[int32](80), ptr.To[int32](443)}),
12701269
},
1271-
endpointsChangeTracker: NewEndpointsChangeTracker("host1", nil, v1.IPv4Protocol, nil, nil),
1270+
endpointsChangeTracker: NewEndpointsChangeTracker(v1.IPv4Protocol, "host1", nil, nil),
12721271
namespacedName: types.NamespacedName{Name: "svc1", Namespace: "ns1"},
12731272
paramEndpointSlice: generateEndpointSlice("svc1", "ns1", 1, 3, 999, 999, []string{"host1", "host2"}, []*int32{ptr.To[int32](80), ptr.To[int32](443)}),
12741273
paramRemoveSlice: false,
@@ -1280,7 +1279,7 @@ func TestEndpointSliceUpdate(t *testing.T) {
12801279
startingSlices: []*discovery.EndpointSlice{
12811280
generateEndpointSlice("svc1", "ns1", 1, 3, 999, 999, []string{"host1", "host2"}, []*int32{ptr.To[int32](80), ptr.To[int32](443)}),
12821281
},
1283-
endpointsChangeTracker: NewEndpointsChangeTracker("host1", nil, v1.IPv4Protocol, nil, nil),
1282+
endpointsChangeTracker: NewEndpointsChangeTracker(v1.IPv4Protocol, "host1", nil, nil),
12841283
namespacedName: types.NamespacedName{Name: "svc1", Namespace: "ns1"},
12851284
paramEndpointSlice: fqdnSlice,
12861285
paramRemoveSlice: false,
@@ -1293,7 +1292,7 @@ func TestEndpointSliceUpdate(t *testing.T) {
12931292
generateEndpointSlice("svc1", "ns1", 1, 3, 999, 999, []string{"host1", "host2"}, []*int32{ptr.To[int32](80), ptr.To[int32](443)}),
12941293
generateEndpointSlice("svc1", "ns1", 2, 2, 999, 999, []string{"host1", "host2"}, []*int32{ptr.To[int32](80), ptr.To[int32](443)}),
12951294
},
1296-
endpointsChangeTracker: NewEndpointsChangeTracker("host1", nil, v1.IPv4Protocol, nil, nil),
1295+
endpointsChangeTracker: NewEndpointsChangeTracker(v1.IPv4Protocol, "host1", nil, nil),
12971296
namespacedName: types.NamespacedName{Name: "svc1", Namespace: "ns1"},
12981297
paramEndpointSlice: generateEndpointSlice("svc1", "ns1", 1, 5, 999, 999, []string{"host1"}, []*int32{ptr.To[int32](80), ptr.To[int32](443)}),
12991298
paramRemoveSlice: false,
@@ -1325,7 +1324,7 @@ func TestEndpointSliceUpdate(t *testing.T) {
13251324
generateEndpointSlice("svc1", "ns1", 1, 3, 999, 999, []string{"host1", "host2"}, []*int32{ptr.To[int32](80), ptr.To[int32](443)}),
13261325
generateEndpointSlice("svc1", "ns1", 2, 2, 999, 999, []string{"host1", "host2"}, []*int32{ptr.To[int32](80), ptr.To[int32](443)}),
13271326
},
1328-
endpointsChangeTracker: NewEndpointsChangeTracker("host1", nil, v1.IPv4Protocol, nil, nil),
1327+
endpointsChangeTracker: NewEndpointsChangeTracker(v1.IPv4Protocol, "host1", nil, nil),
13291328
namespacedName: types.NamespacedName{Name: "svc1", Namespace: "ns1"},
13301329
paramEndpointSlice: generateEndpointSliceWithOffset("svc1", "ns1", 3, 1, 5, 999, 999, []string{"host1"}, []*int32{ptr.To[int32](80)}),
13311330
paramRemoveSlice: false,
@@ -1355,7 +1354,7 @@ func TestEndpointSliceUpdate(t *testing.T) {
13551354
generateEndpointSlice("svc1", "ns1", 1, 3, 999, 999, []string{"host1", "host2"}, []*int32{ptr.To[int32](80), ptr.To[int32](443)}),
13561355
generateEndpointSlice("svc1", "ns1", 2, 2, 999, 999, []string{"host1", "host2"}, []*int32{ptr.To[int32](80), ptr.To[int32](443)}),
13571356
},
1358-
endpointsChangeTracker: NewEndpointsChangeTracker("host1", nil, v1.IPv4Protocol, nil, nil),
1357+
endpointsChangeTracker: NewEndpointsChangeTracker(v1.IPv4Protocol, "host1", nil, nil),
13591358
namespacedName: types.NamespacedName{Name: "svc1", Namespace: "ns1"},
13601359
paramEndpointSlice: generateEndpointSlice("svc1", "ns1", 1, 5, 999, 999, []string{"host1"}, []*int32{ptr.To[int32](80), ptr.To[int32](443)}),
13611360
paramRemoveSlice: true,
@@ -1377,7 +1376,7 @@ func TestEndpointSliceUpdate(t *testing.T) {
13771376
generateEndpointSlice("svc1", "ns1", 1, 5, 999, 999, []string{"host1"}, []*int32{ptr.To[int32](80), ptr.To[int32](443)}),
13781377
generateEndpointSlice("svc1", "ns1", 2, 2, 999, 999, []string{"host1"}, []*int32{ptr.To[int32](80), ptr.To[int32](443)}),
13791378
},
1380-
endpointsChangeTracker: NewEndpointsChangeTracker("host1", nil, v1.IPv4Protocol, nil, nil),
1379+
endpointsChangeTracker: NewEndpointsChangeTracker(v1.IPv4Protocol, "host1", nil, nil),
13811380
namespacedName: types.NamespacedName{Name: "svc1", Namespace: "ns1"},
13821381
paramEndpointSlice: generateEndpointSlice("svc1", "ns1", 3, 5, 999, 999, []string{"host1"}, []*int32{ptr.To[int32](80), ptr.To[int32](443)}),
13831382
paramRemoveSlice: true,
@@ -1389,7 +1388,7 @@ func TestEndpointSliceUpdate(t *testing.T) {
13891388
startingSlices: []*discovery.EndpointSlice{
13901389
generateEndpointSlice("svc1", "ns1", 1, 3, 999, 999, []string{"host1", "host2"}, []*int32{ptr.To[int32](80), ptr.To[int32](443)}),
13911390
},
1392-
endpointsChangeTracker: NewEndpointsChangeTracker("host1", nil, v1.IPv4Protocol, nil, nil),
1391+
endpointsChangeTracker: NewEndpointsChangeTracker(v1.IPv4Protocol, "host1", nil, nil),
13931392
namespacedName: types.NamespacedName{Name: "svc1", Namespace: "ns1"},
13941393
paramEndpointSlice: generateEndpointSlice("svc1", "ns1", 1, 3, 1, 999, []string{"host1"}, []*int32{ptr.To[int32](80), ptr.To[int32](443)}),
13951394
paramRemoveSlice: false,
@@ -1412,7 +1411,7 @@ func TestEndpointSliceUpdate(t *testing.T) {
14121411
startingSlices: []*discovery.EndpointSlice{
14131412
generateEndpointSlice("svc1", "ns1", 1, 2, 1, 999, []string{"host1", "host2"}, []*int32{ptr.To[int32](80), ptr.To[int32](443)}),
14141413
},
1415-
endpointsChangeTracker: NewEndpointsChangeTracker("host1", nil, v1.IPv4Protocol, nil, nil),
1414+
endpointsChangeTracker: NewEndpointsChangeTracker(v1.IPv4Protocol, "host1", nil, nil),
14161415
namespacedName: types.NamespacedName{Name: "svc1", Namespace: "ns1"},
14171416
paramEndpointSlice: generateEndpointSlice("svc1", "ns1", 1, 2, 999, 999, []string{"host1"}, []*int32{ptr.To[int32](80), ptr.To[int32](443)}),
14181417
paramRemoveSlice: false,
@@ -1434,7 +1433,7 @@ func TestEndpointSliceUpdate(t *testing.T) {
14341433
generateEndpointSlice("svc1", "ns1", 1, 3, 2, 999, []string{"host1"}, []*int32{ptr.To[int32](80), ptr.To[int32](443)}),
14351434
generateEndpointSlice("svc1", "ns1", 2, 2, 2, 999, []string{"host1"}, []*int32{ptr.To[int32](80), ptr.To[int32](443)}),
14361435
},
1437-
endpointsChangeTracker: NewEndpointsChangeTracker("host1", nil, v1.IPv4Protocol, nil, nil),
1436+
endpointsChangeTracker: NewEndpointsChangeTracker(v1.IPv4Protocol, "host1", nil, nil),
14381437
namespacedName: types.NamespacedName{Name: "svc1", Namespace: "ns1"},
14391438
paramEndpointSlice: generateEndpointSlice("svc1", "ns1", 1, 3, 3, 999, []string{"host1"}, []*int32{ptr.To[int32](80), ptr.To[int32](443)}),
14401439
paramRemoveSlice: false,
@@ -1462,7 +1461,7 @@ func TestEndpointSliceUpdate(t *testing.T) {
14621461
generateEndpointSlice("svc1", "ns1", 1, 3, 2, 2, []string{"host1"}, []*int32{ptr.To[int32](80), ptr.To[int32](443)}),
14631462
generateEndpointSlice("svc1", "ns1", 2, 2, 2, 2, []string{"host1"}, []*int32{ptr.To[int32](80), ptr.To[int32](443)}),
14641463
},
1465-
endpointsChangeTracker: NewEndpointsChangeTracker("host1", nil, v1.IPv4Protocol, nil, nil),
1464+
endpointsChangeTracker: NewEndpointsChangeTracker(v1.IPv4Protocol, "host1", nil, nil),
14661465
namespacedName: types.NamespacedName{Name: "svc1", Namespace: "ns1"},
14671466
paramEndpointSlice: generateEndpointSlice("svc1", "ns1", 1, 3, 3, 2, []string{"host1"}, []*int32{ptr.To[int32](80), ptr.To[int32](443)}),
14681467
paramRemoveSlice: false,
@@ -1522,13 +1521,13 @@ func TestCheckoutChanges(t *testing.T) {
15221521
pendingSlices []*discovery.EndpointSlice
15231522
}{
15241523
"empty slices": {
1525-
endpointsChangeTracker: NewEndpointsChangeTracker("", nil, v1.IPv4Protocol, nil, nil),
1524+
endpointsChangeTracker: NewEndpointsChangeTracker(v1.IPv4Protocol, "", nil, nil),
15261525
expectedChanges: []*endpointsChange{},
15271526
appliedSlices: []*discovery.EndpointSlice{},
15281527
pendingSlices: []*discovery.EndpointSlice{},
15291528
},
15301529
"adding initial slice": {
1531-
endpointsChangeTracker: NewEndpointsChangeTracker("", nil, v1.IPv4Protocol, nil, nil),
1530+
endpointsChangeTracker: NewEndpointsChangeTracker(v1.IPv4Protocol, "", nil, nil),
15321531
expectedChanges: []*endpointsChange{{
15331532
previous: EndpointsMap{},
15341533
current: EndpointsMap{
@@ -1545,7 +1544,7 @@ func TestCheckoutChanges(t *testing.T) {
15451544
},
15461545
},
15471546
"removing port in update": {
1548-
endpointsChangeTracker: NewEndpointsChangeTracker("", nil, v1.IPv4Protocol, nil, nil),
1547+
endpointsChangeTracker: NewEndpointsChangeTracker(v1.IPv4Protocol, "", nil, nil),
15491548
expectedChanges: []*endpointsChange{{
15501549
previous: EndpointsMap{
15511550
svcPortName0: []Endpoint{

‎pkg/proxy/endpointslicecache.go‎

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,12 @@ import (
2222
"sort"
2323
"sync"
2424

25-
v1 "k8s.io/api/core/v1"
2625
discovery "k8s.io/api/discovery/v1"
2726
"k8s.io/apimachinery/pkg/types"
2827
"k8s.io/apimachinery/pkg/util/sets"
2928
utilfeature "k8s.io/apiserver/pkg/util/feature"
30-
"k8s.io/client-go/tools/events"
3129
"k8s.io/klog/v2"
3230
"k8s.io/kubernetes/pkg/features"
33-
proxyutil "k8s.io/kubernetes/pkg/proxy/util"
3431
utilnet "k8s.io/utils/net"
3532
)
3633

@@ -49,8 +46,6 @@ type EndpointSliceCache struct {
4946

5047
makeEndpointInfo makeEndpointFunc
5148
hostname string
52-
ipFamily v1.IPFamily
53-
recorder events.EventRecorder
5449
}
5550

5651
// endpointSliceTracker keeps track of EndpointSlices as they have been applied
@@ -72,16 +67,14 @@ type endpointSliceData struct {
7267
}
7368

7469
// NewEndpointSliceCache initializes an EndpointSliceCache.
75-
func NewEndpointSliceCache(hostname string, ipFamily v1.IPFamily, recorder events.EventRecorder, makeEndpointInfo makeEndpointFunc) *EndpointSliceCache {
70+
func NewEndpointSliceCache(hostname string, makeEndpointInfo makeEndpointFunc) *EndpointSliceCache {
7671
if makeEndpointInfo == nil {
7772
makeEndpointInfo = standardEndpointInfo
7873
}
7974
return &EndpointSliceCache{
8075
trackerByServiceMap: map[types.NamespacedName]*endpointSliceTracker{},
8176
hostname: hostname,
82-
ipFamily: ipFamily,
8377
makeEndpointInfo: makeEndpointInfo,
84-
recorder: recorder,
8578
}
8679
}
8780

@@ -213,15 +206,6 @@ func (cache *EndpointSliceCache) addEndpoints(svcPortName *ServicePortName, port
213206
continue
214207
}
215208

216-
// Filter out the incorrect IP version case. Any endpoint port that
217-
// contains incorrect IP version will be ignored.
218-
if (cache.ipFamily == v1.IPv6Protocol) != utilnet.IsIPv6String(endpoint.Addresses[0]) {
219-
// Emit event on the corresponding service which had a different IP
220-
// version than the endpoint.
221-
proxyutil.LogAndEmitIncorrectIPVersionEvent(cache.recorder, "endpointslice", endpoint.Addresses[0], svcPortName.NamespacedName.Namespace, svcPortName.NamespacedName.Name, "")
222-
continue
223-
}
224-
225209
isLocal := endpoint.NodeName != nil && cache.isLocal(*endpoint.NodeName)
226210

227211
ready := endpoint.Conditions.Ready == nil || *endpoint.Conditions.Ready

‎pkg/proxy/endpointslicecache_test.go‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ func TestEndpointsMapFromESC(t *testing.T) {
205205

206206
for name, tc := range testCases {
207207
t.Run(name, func(t *testing.T) {
208-
esCache := NewEndpointSliceCache(tc.hostname, v1.IPv4Protocol, nil, nil)
208+
esCache := NewEndpointSliceCache(tc.hostname, nil)
209209

210210
cmc := newCacheMutationCheck(tc.endpointSlices)
211211
for _, endpointSlice := range tc.endpointSlices {
@@ -315,7 +315,7 @@ func TestEndpointInfoByServicePort(t *testing.T) {
315315

316316
for name, tc := range testCases {
317317
t.Run(name, func(t *testing.T) {
318-
esCache := NewEndpointSliceCache(tc.hostname, v1.IPv4Protocol, nil, nil)
318+
esCache := NewEndpointSliceCache(tc.hostname, nil)
319319

320320
for _, endpointSlice := range tc.endpointSlices {
321321
esCache.updatePending(endpointSlice, false)
@@ -350,7 +350,7 @@ func TestEsDataChanged(t *testing.T) {
350350
expectChanged bool
351351
}{
352352
"identical slices, ports only": {
353-
cache: NewEndpointSliceCache("", v1.IPv4Protocol, nil, nil),
353+
cache: NewEndpointSliceCache("", nil),
354354
initialSlice: &discovery.EndpointSlice{
355355
ObjectMeta: objMeta,
356356
Ports: []discovery.EndpointPort{port80},
@@ -362,7 +362,7 @@ func TestEsDataChanged(t *testing.T) {
362362
expectChanged: false,
363363
},
364364
"identical slices, ports out of order": {
365-
cache: NewEndpointSliceCache("", v1.IPv4Protocol, nil, nil),
365+
cache: NewEndpointSliceCache("", nil),
366366
initialSlice: &discovery.EndpointSlice{
367367
ObjectMeta: objMeta,
368368
Ports: []discovery.EndpointPort{port443, port80},
@@ -374,7 +374,7 @@ func TestEsDataChanged(t *testing.T) {
374374
expectChanged: true,
375375
},
376376
"port removed": {
377-
cache: NewEndpointSliceCache("", v1.IPv4Protocol, nil, nil),
377+
cache: NewEndpointSliceCache("", nil),
378378
initialSlice: &discovery.EndpointSlice{
379379
ObjectMeta: objMeta,
380380
Ports: []discovery.EndpointPort{port443, port80},
@@ -386,7 +386,7 @@ func TestEsDataChanged(t *testing.T) {
386386
expectChanged: true,
387387
},
388388
"port added": {
389-
cache: NewEndpointSliceCache("", v1.IPv4Protocol, nil, nil),
389+
cache: NewEndpointSliceCache("", nil),
390390
initialSlice: &discovery.EndpointSlice{
391391
ObjectMeta: objMeta,
392392
Ports: []discovery.EndpointPort{port443},
@@ -398,7 +398,7 @@ func TestEsDataChanged(t *testing.T) {
398398
expectChanged: true,
399399
},
400400
"identical with endpoints": {
401-
cache: NewEndpointSliceCache("", v1.IPv4Protocol, nil, nil),
401+
cache: NewEndpointSliceCache("", nil),
402402
initialSlice: &discovery.EndpointSlice{
403403
ObjectMeta: objMeta,
404404
Ports: []discovery.EndpointPort{port443},
@@ -412,7 +412,7 @@ func TestEsDataChanged(t *testing.T) {
412412
expectChanged: false,
413413
},
414414
"identical with endpoints out of order": {
415-
cache: NewEndpointSliceCache("", v1.IPv4Protocol, nil, nil),
415+
cache: NewEndpointSliceCache("", nil),
416416
initialSlice: &discovery.EndpointSlice{
417417
ObjectMeta: objMeta,
418418
Ports: []discovery.EndpointPort{port443},
@@ -426,7 +426,7 @@ func TestEsDataChanged(t *testing.T) {
426426
expectChanged: true,
427427
},
428428
"identical with endpoint added": {
429-
cache: NewEndpointSliceCache("", v1.IPv4Protocol, nil, nil),
429+
cache: NewEndpointSliceCache("", nil),
430430
initialSlice: &discovery.EndpointSlice{
431431
ObjectMeta: objMeta,
432432
Ports: []discovery.EndpointPort{port443},
@@ -610,7 +610,6 @@ func TestEndpointSliceCacheClearedCorrectly(t *testing.T) {
610610
for _, tc := range testCases {
611611
t.Run(tc.name, func(t *testing.T) {
612612
fp := newFakeProxier(v1.IPv4Protocol, time.Time{})
613-
fp.hostname = testHostname
614613

615614
for _, epSlice := range tc.currEndpointSlices {
616615
fp.addEndpointSlice(epSlice)
@@ -648,7 +647,6 @@ func TestSameServiceEndpointSliceCacheClearedCorrectly(t *testing.T) {
648647
}
649648

650649
fp := newFakeProxier(v1.IPv4Protocol, time.Time{})
651-
fp.hostname = testHostname
652650

653651
for _, epSlice := range currEndpointSlices {
654652
fp.addEndpointSlice(epSlice)

‎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,

0 commit comments

Comments
 (0)