Skip to content

Allow for headless envoy services #6250

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
arkodg merged 9 commits into from
Jun 3, 2025
Merged

Allow for headless envoy services #6250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
da863de
Allow for headless envoy services
ryanhristovski Jun 2, 2025
cffae1b
Allow headless service, cleanup
ryanhristovski Jun 2, 2025
4135cd3
clean
ryanhristovski Jun 2, 2025
add0fa6
Add test and comment
ryanhristovski Jun 2, 2025
f4d328d
Fix tests
ryanhristovski Jun 2, 2025
2be30a0
fix import
ryanhristovski Jun 2, 2025
5438761
import
ryanhristovski Jun 2, 2025
21cbefc
add extra quest for coverage
ryanhristovski Jun 2, 2025
20275f0
Fix import
ryanhristovski Jun 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions internal/gatewayapi/status/gateway.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,12 @@
if len(svc.Spec.ExternalIPs) > 0 {
addresses = append(addresses, svc.Spec.ExternalIPs...)
} else if len(svc.Spec.ClusterIPs) > 0 {
addresses = append(addresses, svc.Spec.ClusterIPs...)
// Filter out "None" values which represent headless services
for _, ip := range svc.Spec.ClusterIPs {
if ip != "" && ip != "None" {
addresses = append(addresses, ip)
}

Check warning on line 65 in internal/gatewayapi/status/gateway.go

View check run for this annotation

Codecov / codecov/patch

internal/gatewayapi/status/gateway.go#L64-L65 

Added lines #L64 - L65 were not covered by tests
}
}
} else {
if svc.Spec.Type == corev1.ServiceTypeLoadBalancer {
Expand All @@ -79,7 +84,8 @@

if svc.Spec.Type == corev1.ServiceTypeClusterIP {
for i := range svc.Spec.ClusterIPs {
if svc.Spec.ClusterIPs[i] != "" {
// Filter out "None" values which represent headless services
if svc.Spec.ClusterIPs[i] != "" && svc.Spec.ClusterIPs[i] != "None" {
addresses = append(addresses, svc.Spec.ClusterIPs[i])
}
}
Expand Down
39 changes: 39 additions & 0 deletions internal/gatewayapi/status/gateway_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,45 @@ func TestUpdateGatewayStatusProgrammedCondition(t *testing.T) {
},
},
},
{
name: "Headless ClusterIP svc with None",
args: args{
gw: &gwapiv1.Gateway{},
svc: &corev1.Service{
TypeMeta: metav1.TypeMeta{},
ObjectMeta: metav1.ObjectMeta{},
Spec: corev1.ServiceSpec{
ClusterIPs: []string{"None"},
Type: corev1.ServiceTypeClusterIP,
},
},
},
wantAddresses: []gwapiv1.GatewayStatusAddress{},
},
{
name: "Headless ClusterIP svc with None and explicit Gateway addresses",
args: args{
gw: &gwapiv1.Gateway{
Spec: gwapiv1.GatewaySpec{
Addresses: []gwapiv1.GatewaySpecAddress{
{
Type: ptr.To(gwapiv1.IPAddressType),
Value: "10.0.0.1",
},
},
},
},
svc: &corev1.Service{
TypeMeta: metav1.TypeMeta{},
ObjectMeta: metav1.ObjectMeta{},
Spec: corev1.ServiceSpec{
ClusterIPs: []string{"None"},
Type: corev1.ServiceTypeClusterIP,
},
},
},
wantAddresses: []gwapiv1.GatewayStatusAddress{},
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
Expand Down