Skip to content

Commit 8ef4f6b

Browse files
sudiptob2zirain
authored andcommitted
improve headless service detection logic
Signed-off-by: Sudipto Baral <[email protected]>
1 parent 32b1349 commit 8ef4f6b

File tree

2 files changed

+2
-29
lines changed

2 files changed

+2
-29
lines changed

internal/gatewayapi/route.go

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1951,15 +1951,7 @@ func isServiceHeadless(service *corev1.Service) bool {
19511951
if service == nil {
19521952
return false
19531953
}
1954-
if service.Spec.ClusterIP == "None" || service.Spec.ClusterIP == "" {
1955-
return true
1956-
}
1957-
if len(service.Spec.ClusterIPs) > 0 {
1958-
for _, ip := range service.Spec.ClusterIPs {
1959-
if ip != "None" && ip != "" {
1960-
return false
1961-
}
1962-
}
1954+
if service.Spec.ClusterIP == corev1.ClusterIPNone {
19631955
return true
19641956
}
19651957
return false

internal/gatewayapi/route_test.go

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -406,15 +406,6 @@ func TestIsServiceHeadless(t *testing.T) {
406406
},
407407
want: true,
408408
},
409-
{
410-
name: "headless service with empty ClusterIP",
411-
service: &corev1.Service{
412-
Spec: corev1.ServiceSpec{
413-
ClusterIP: "",
414-
},
415-
},
416-
want: true,
417-
},
418409
{
419410
name: "normal service with ClusterIP",
420411
service: &corev1.Service{
@@ -428,22 +419,12 @@ func TestIsServiceHeadless(t *testing.T) {
428419
name: "dual-stack headless service",
429420
service: &corev1.Service{
430421
Spec: corev1.ServiceSpec{
431-
ClusterIP: "10.0.0.1",
422+
ClusterIP: "None",
432423
ClusterIPs: []string{"None", "None"},
433424
},
434425
},
435426
want: true,
436427
},
437-
{
438-
name: "dual-stack headless service (all ClusterIPs are empty)",
439-
service: &corev1.Service{
440-
Spec: corev1.ServiceSpec{
441-
ClusterIP: "10.0.0.1",
442-
ClusterIPs: []string{"", ""},
443-
},
444-
},
445-
want: true,
446-
},
447428
{
448429
name: "dual-stack service with valid IPs",
449430
service: &corev1.Service{

0 commit comments

Comments
 (0)