Skip to content

Commit cc4bd51

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#99746 from swetharepakula/nodeName-feature-gate-ga
Graduate EndpointSliceNodeName feature gate to GA
2 parents 4d5868a + be2ef55 commit cc4bd51

File tree

6 files changed

+65
-164
lines changed

6 files changed

+65
-164
lines changed

‎pkg/controller/endpointslice/endpointslice_controller_test.go

+9
Original file line numberDiff line numberDiff line change
@@ -452,6 +452,7 @@ func TestSyncService(t *testing.T) {
452452
Addresses: []string{"10.0.0.1"},
453453
TargetRef: &v1.ObjectReference{Kind: "Pod", Namespace: "default", Name: "pod0"},
454454
Topology: map[string]string{"kubernetes.io/hostname": "node-1"},
455+
NodeName: utilpointer.StringPtr("node-1"),
455456
},
456457
{
457458
Conditions: discovery.EndpointConditions{
@@ -460,6 +461,7 @@ func TestSyncService(t *testing.T) {
460461
Addresses: []string{"10.0.0.2"},
461462
TargetRef: &v1.ObjectReference{Kind: "Pod", Namespace: "default", Name: "pod1"},
462463
Topology: map[string]string{"kubernetes.io/hostname": "node-1"},
464+
NodeName: utilpointer.StringPtr("node-1"),
463465
},
464466
},
465467
},
@@ -565,6 +567,7 @@ func TestSyncService(t *testing.T) {
565567
Addresses: []string{"fd08::5678:0000:0000:9abc:def0"},
566568
TargetRef: &v1.ObjectReference{Kind: "Pod", Namespace: "default", Name: "pod1"},
567569
Topology: map[string]string{"kubernetes.io/hostname": "node-1"},
570+
NodeName: utilpointer.StringPtr("node-1"),
568571
},
569572
},
570573
},
@@ -670,6 +673,7 @@ func TestSyncService(t *testing.T) {
670673
Addresses: []string{"10.0.0.1"},
671674
TargetRef: &v1.ObjectReference{Kind: "Pod", Namespace: "default", Name: "pod0"},
672675
Topology: map[string]string{"kubernetes.io/hostname": "node-1"},
676+
NodeName: utilpointer.StringPtr("node-1"),
673677
},
674678
{
675679
Conditions: discovery.EndpointConditions{
@@ -680,6 +684,7 @@ func TestSyncService(t *testing.T) {
680684
Addresses: []string{"10.0.0.2"},
681685
TargetRef: &v1.ObjectReference{Kind: "Pod", Namespace: "default", Name: "pod1"},
682686
Topology: map[string]string{"kubernetes.io/hostname": "node-1"},
687+
NodeName: utilpointer.StringPtr("node-1"),
683688
},
684689
},
685690
terminatingGateEnabled: true,
@@ -784,6 +789,7 @@ func TestSyncService(t *testing.T) {
784789
Addresses: []string{"10.0.0.1"},
785790
TargetRef: &v1.ObjectReference{Kind: "Pod", Namespace: "default", Name: "pod0"},
786791
Topology: map[string]string{"kubernetes.io/hostname": "node-1"},
792+
NodeName: utilpointer.StringPtr("node-1"),
787793
},
788794
},
789795
terminatingGateEnabled: false,
@@ -890,6 +896,7 @@ func TestSyncService(t *testing.T) {
890896
Addresses: []string{"10.0.0.1"},
891897
TargetRef: &v1.ObjectReference{Kind: "Pod", Namespace: "default", Name: "pod0"},
892898
Topology: map[string]string{"kubernetes.io/hostname": "node-1"},
899+
NodeName: utilpointer.StringPtr("node-1"),
893900
},
894901
{
895902
Conditions: discovery.EndpointConditions{
@@ -900,6 +907,7 @@ func TestSyncService(t *testing.T) {
900907
Addresses: []string{"10.0.0.2"},
901908
TargetRef: &v1.ObjectReference{Kind: "Pod", Namespace: "default", Name: "pod1"},
902909
Topology: map[string]string{"kubernetes.io/hostname": "node-1"},
910+
NodeName: utilpointer.StringPtr("node-1"),
903911
},
904912
},
905913
terminatingGateEnabled: true,
@@ -1004,6 +1012,7 @@ func TestSyncService(t *testing.T) {
10041012
Addresses: []string{"10.0.0.1"},
10051013
TargetRef: &v1.ObjectReference{Kind: "Pod", Namespace: "default", Name: "pod0"},
10061014
Topology: map[string]string{"kubernetes.io/hostname": "node-1"},
1015+
NodeName: utilpointer.StringPtr("node-1"),
10071016
},
10081017
},
10091018
terminatingGateEnabled: false,

‎pkg/controller/endpointslice/reconciler_test.go

+13
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ func TestReconcile1Pod(t *testing.T) {
131131
"topology.kubernetes.io/zone": "us-central1-a",
132132
"topology.kubernetes.io/region": "us-central1",
133133
},
134+
NodeName: utilpointer.StringPtr("node-1"),
134135
TargetRef: &corev1.ObjectReference{
135136
Kind: "Pod",
136137
Namespace: namespace,
@@ -156,6 +157,7 @@ func TestReconcile1Pod(t *testing.T) {
156157
"topology.kubernetes.io/zone": "us-central1-a",
157158
"topology.kubernetes.io/region": "us-central1",
158159
},
160+
NodeName: utilpointer.StringPtr("node-1"),
159161
TargetRef: &corev1.ObjectReference{
160162
Kind: "Pod",
161163
Namespace: namespace,
@@ -186,6 +188,7 @@ func TestReconcile1Pod(t *testing.T) {
186188
"topology.kubernetes.io/zone": "us-central1-a",
187189
"topology.kubernetes.io/region": "us-central1",
188190
},
191+
NodeName: utilpointer.StringPtr("node-1"),
189192
TargetRef: &corev1.ObjectReference{
190193
Kind: "Pod",
191194
Namespace: namespace,
@@ -213,6 +216,7 @@ func TestReconcile1Pod(t *testing.T) {
213216
"topology.kubernetes.io/zone": "us-central1-a",
214217
"topology.kubernetes.io/region": "us-central1",
215218
},
219+
NodeName: utilpointer.StringPtr("node-1"),
216220
TargetRef: &corev1.ObjectReference{
217221
Kind: "Pod",
218222
Namespace: namespace,
@@ -230,6 +234,7 @@ func TestReconcile1Pod(t *testing.T) {
230234
"topology.kubernetes.io/zone": "us-central1-a",
231235
"topology.kubernetes.io/region": "us-central1",
232236
},
237+
NodeName: utilpointer.StringPtr("node-1"),
233238
TargetRef: &corev1.ObjectReference{
234239
Kind: "Pod",
235240
Namespace: namespace,
@@ -253,6 +258,7 @@ func TestReconcile1Pod(t *testing.T) {
253258
"topology.kubernetes.io/zone": "us-central1-a",
254259
"topology.kubernetes.io/region": "us-central1",
255260
},
261+
NodeName: utilpointer.StringPtr("node-1"),
256262
TargetRef: &corev1.ObjectReference{
257263
Kind: "Pod",
258264
Namespace: namespace,
@@ -270,6 +276,7 @@ func TestReconcile1Pod(t *testing.T) {
270276
"topology.kubernetes.io/zone": "us-central1-a",
271277
"topology.kubernetes.io/region": "us-central1",
272278
},
279+
NodeName: utilpointer.StringPtr("node-1"),
273280
TargetRef: &corev1.ObjectReference{
274281
Kind: "Pod",
275282
Namespace: namespace,
@@ -295,6 +302,7 @@ func TestReconcile1Pod(t *testing.T) {
295302
"topology.kubernetes.io/zone": "us-central1-a",
296303
"topology.kubernetes.io/region": "us-central1",
297304
},
305+
NodeName: utilpointer.StringPtr("node-1"),
298306
TargetRef: &corev1.ObjectReference{
299307
Kind: "Pod",
300308
Namespace: namespace,
@@ -312,6 +320,7 @@ func TestReconcile1Pod(t *testing.T) {
312320
"topology.kubernetes.io/zone": "us-central1-a",
313321
"topology.kubernetes.io/region": "us-central1",
314322
},
323+
NodeName: utilpointer.StringPtr("node-1"),
315324
TargetRef: &corev1.ObjectReference{
316325
Kind: "Pod",
317326
Namespace: namespace,
@@ -337,6 +346,7 @@ func TestReconcile1Pod(t *testing.T) {
337346
"topology.kubernetes.io/zone": "us-central1-a",
338347
"topology.kubernetes.io/region": "us-central1",
339348
},
349+
NodeName: utilpointer.StringPtr("node-1"),
340350
TargetRef: &corev1.ObjectReference{
341351
Kind: "Pod",
342352
Namespace: namespace,
@@ -364,6 +374,7 @@ func TestReconcile1Pod(t *testing.T) {
364374
"topology.kubernetes.io/zone": "us-central1-a",
365375
"topology.kubernetes.io/region": "us-central1",
366376
},
377+
NodeName: utilpointer.StringPtr("node-1"),
367378
TargetRef: &corev1.ObjectReference{
368379
Kind: "Pod",
369380
Namespace: namespace,
@@ -390,6 +401,7 @@ func TestReconcile1Pod(t *testing.T) {
390401
"topology.kubernetes.io/zone": "us-central1-a",
391402
"topology.kubernetes.io/region": "us-central1",
392403
},
404+
NodeName: utilpointer.StringPtr("node-1"),
393405
TargetRef: &corev1.ObjectReference{
394406
Kind: "Pod",
395407
Namespace: namespace,
@@ -406,6 +418,7 @@ func TestReconcile1Pod(t *testing.T) {
406418
"topology.kubernetes.io/zone": "us-central1-a",
407419
"topology.kubernetes.io/region": "us-central1",
408420
},
421+
NodeName: utilpointer.StringPtr("node-1"),
409422
TargetRef: &corev1.ObjectReference{
410423
Kind: "Pod",
411424
Namespace: namespace,

‎pkg/controller/endpointslice/utils_test.go

+11-20
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,6 @@ func TestPodToEndpoint(t *testing.T) {
252252
expectedEndpoint discovery.Endpoint
253253
publishNotReadyAddresses bool
254254
terminatingGateEnabled bool
255-
nodeNameGateEnabled bool
256255
}{
257256
{
258257
name: "Ready pod",
@@ -262,6 +261,7 @@ func TestPodToEndpoint(t *testing.T) {
262261
Addresses: []string{"1.2.3.5"},
263262
Conditions: discovery.EndpointConditions{Ready: utilpointer.BoolPtr(true)},
264263
Topology: map[string]string{"kubernetes.io/hostname": "node-1"},
264+
NodeName: utilpointer.StringPtr("node-1"),
265265
TargetRef: &v1.ObjectReference{
266266
Kind: "Pod",
267267
Namespace: ns,
@@ -279,6 +279,7 @@ func TestPodToEndpoint(t *testing.T) {
279279
Addresses: []string{"1.2.3.5"},
280280
Conditions: discovery.EndpointConditions{Ready: utilpointer.BoolPtr(true)},
281281
Topology: map[string]string{"kubernetes.io/hostname": "node-1"},
282+
NodeName: utilpointer.StringPtr("node-1"),
282283
TargetRef: &v1.ObjectReference{
283284
Kind: "Pod",
284285
Namespace: ns,
@@ -296,6 +297,7 @@ func TestPodToEndpoint(t *testing.T) {
296297
Addresses: []string{"1.2.3.5"},
297298
Conditions: discovery.EndpointConditions{Ready: utilpointer.BoolPtr(false)},
298299
Topology: map[string]string{"kubernetes.io/hostname": "node-1"},
300+
NodeName: utilpointer.StringPtr("node-1"),
299301
TargetRef: &v1.ObjectReference{
300302
Kind: "Pod",
301303
Namespace: ns,
@@ -309,24 +311,6 @@ func TestPodToEndpoint(t *testing.T) {
309311
name: "Unready pod + publishNotReadyAddresses",
310312
pod: unreadyPod,
311313
svc: &svcPublishNotReady,
312-
expectedEndpoint: discovery.Endpoint{
313-
Addresses: []string{"1.2.3.5"},
314-
Conditions: discovery.EndpointConditions{Ready: utilpointer.BoolPtr(true)},
315-
Topology: map[string]string{"kubernetes.io/hostname": "node-1"},
316-
TargetRef: &v1.ObjectReference{
317-
Kind: "Pod",
318-
Namespace: ns,
319-
Name: readyPod.Name,
320-
UID: readyPod.UID,
321-
ResourceVersion: readyPod.ResourceVersion,
322-
},
323-
},
324-
},
325-
{
326-
name: "Ready pod + node name gate enabled",
327-
pod: readyPod,
328-
svc: &svc,
329-
nodeNameGateEnabled: true,
330314
expectedEndpoint: discovery.Endpoint{
331315
Addresses: []string{"1.2.3.5"},
332316
Conditions: discovery.EndpointConditions{Ready: utilpointer.BoolPtr(true)},
@@ -354,6 +338,7 @@ func TestPodToEndpoint(t *testing.T) {
354338
"topology.kubernetes.io/zone": "us-central1-a",
355339
"topology.kubernetes.io/region": "us-central1",
356340
},
341+
NodeName: utilpointer.StringPtr("node-1"),
357342
TargetRef: &v1.ObjectReference{
358343
Kind: "Pod",
359344
Namespace: ns,
@@ -376,6 +361,7 @@ func TestPodToEndpoint(t *testing.T) {
376361
"topology.kubernetes.io/zone": "us-central1-a",
377362
"topology.kubernetes.io/region": "us-central1",
378363
},
364+
NodeName: utilpointer.StringPtr("node-1"),
379365
TargetRef: &v1.ObjectReference{
380366
Kind: "Pod",
381367
Namespace: ns,
@@ -399,6 +385,7 @@ func TestPodToEndpoint(t *testing.T) {
399385
"topology.kubernetes.io/zone": "us-central1-a",
400386
"topology.kubernetes.io/region": "us-central1",
401387
},
388+
NodeName: utilpointer.StringPtr("node-1"),
402389
TargetRef: &v1.ObjectReference{
403390
Kind: "Pod",
404391
Namespace: ns,
@@ -420,6 +407,7 @@ func TestPodToEndpoint(t *testing.T) {
420407
Terminating: utilpointer.BoolPtr(false),
421408
},
422409
Topology: map[string]string{"kubernetes.io/hostname": "node-1"},
410+
NodeName: utilpointer.StringPtr("node-1"),
423411
TargetRef: &v1.ObjectReference{
424412
Kind: "Pod",
425413
Namespace: ns,
@@ -440,6 +428,7 @@ func TestPodToEndpoint(t *testing.T) {
440428
Ready: utilpointer.BoolPtr(false),
441429
},
442430
Topology: map[string]string{"kubernetes.io/hostname": "node-1"},
431+
NodeName: utilpointer.StringPtr("node-1"),
443432
TargetRef: &v1.ObjectReference{
444433
Kind: "Pod",
445434
Namespace: ns,
@@ -462,6 +451,7 @@ func TestPodToEndpoint(t *testing.T) {
462451
Terminating: utilpointer.BoolPtr(true),
463452
},
464453
Topology: map[string]string{"kubernetes.io/hostname": "node-1"},
454+
NodeName: utilpointer.StringPtr("node-1"),
465455
TargetRef: &v1.ObjectReference{
466456
Kind: "Pod",
467457
Namespace: ns,
@@ -482,6 +472,7 @@ func TestPodToEndpoint(t *testing.T) {
482472
Ready: utilpointer.BoolPtr(false),
483473
},
484474
Topology: map[string]string{"kubernetes.io/hostname": "node-1"},
475+
NodeName: utilpointer.StringPtr("node-1"),
485476
TargetRef: &v1.ObjectReference{
486477
Kind: "Pod",
487478
Namespace: ns,
@@ -504,6 +495,7 @@ func TestPodToEndpoint(t *testing.T) {
504495
Terminating: utilpointer.BoolPtr(true),
505496
},
506497
Topology: map[string]string{"kubernetes.io/hostname": "node-1"},
498+
NodeName: utilpointer.StringPtr("node-1"),
507499
TargetRef: &v1.ObjectReference{
508500
Kind: "Pod",
509501
Namespace: ns,
@@ -519,7 +511,6 @@ func TestPodToEndpoint(t *testing.T) {
519511
for _, testCase := range testCases {
520512
t.Run(testCase.name, func(t *testing.T) {
521513
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.EndpointSliceTerminatingCondition, testCase.terminatingGateEnabled)()
522-
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.EndpointSliceNodeName, testCase.nodeNameGateEnabled)()
523514

524515
endpoint := podToEndpoint(testCase.pod, testCase.node, testCase.svc, discovery.AddressTypeIPv4)
525516
if !reflect.DeepEqual(testCase.expectedEndpoint, endpoint) {

0 commit comments

Comments
 (0)