diff --git a/pkg/utils/endpoints.go b/pkg/utils/endpoints.go index e8c0954e7..dd4758d75 100644 --- a/pkg/utils/endpoints.go +++ b/pkg/utils/endpoints.go @@ -21,6 +21,8 @@ import ( "fmt" "net" + "github.com/api7/gopkg/pkg/log" + "go.uber.org/zap" corev1 "k8s.io/api/core/v1" discoveryv1 "k8s.io/api/discovery/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -72,9 +74,7 @@ func ConvertEndpointsToEndpointSlice(ep *corev1.Endpoints) []discoveryv1.Endpoin epPort := discoveryv1.EndpointPort{ Port: &p.Port, Protocol: &p.Protocol, - } - if p.Name != "" { - epPort.Name = &p.Name + Name: &p.Name, } ports = append(ports, epPort) } @@ -140,6 +140,8 @@ func ConvertEndpointsToEndpointSlice(ep *corev1.Endpoints) []discoveryv1.Endpoin } } + log.Debugw("Converted Endpoints to EndpointSlices", zap.Any("endpointSlices", endpointSlices)) + return endpointSlices } diff --git a/pkg/utils/endpoints_test.go b/pkg/utils/endpoints_test.go index a032f08dd..e810ac745 100644 --- a/pkg/utils/endpoints_test.go +++ b/pkg/utils/endpoints_test.go @@ -308,7 +308,7 @@ func TestConvertEndpointsToEndpointSlice(t *testing.T) { }, want: []discoveryv1.EndpointSlice{ createTestEndpointSlice("test-service-0-v4", discoveryv1.AddressTypeIPv4, - []discoveryv1.EndpointPort{createPlainPort(80)}, + []discoveryv1.EndpointPort{createPlainPortWithEmptyName(80)}, []discoveryv1.Endpoint{createEndpointWithHostname("192.168.1.1", "pod-1")}), }, }, @@ -462,8 +462,9 @@ func createHTTPSPort(port int32) discoveryv1.EndpointPort { } } -func createPlainPort(port int32) discoveryv1.EndpointPort { +func createPlainPortWithEmptyName(port int32) discoveryv1.EndpointPort { return discoveryv1.EndpointPort{ + Name: ptr.To(""), Port: ptr.To(port), Protocol: ptr.To(corev1.ProtocolTCP), } diff --git a/test/e2e/scaffold/httpbin.go b/test/e2e/scaffold/httpbin.go index 884e5ac3d..95644701b 100644 --- a/test/e2e/scaffold/httpbin.go +++ b/test/e2e/scaffold/httpbin.go @@ -83,8 +83,7 @@ spec: selector: app: httpbin-deployment-e2e-test ports: - - name: http - port: 80 + - port: 80 protocol: TCP targetPort: 80 type: ClusterIP