diff --git a/pkg/service/query.go b/pkg/service/query.go index acfba4743..d1649e9bc 100644 --- a/pkg/service/query.go +++ b/pkg/service/query.go @@ -52,7 +52,7 @@ func NewQueryService(jaeger *v1.Jaeger, selector map[string]string) *corev1.Serv ClusterIP: "", Ports: []corev1.ServicePort{ { - Name: "http-query", + Name: getPortNameForQueryService(jaeger), Port: int32(GetPortForQueryService(jaeger)), TargetPort: intstr.FromInt(getTargetPortForQueryService(jaeger)), }, @@ -79,6 +79,13 @@ func GetPortForQueryService(jaeger *v1.Jaeger) int { return 16686 } +func getPortNameForQueryService(jaeger *v1.Jaeger) string { + if jaeger.Spec.Ingress.Security == v1.IngressSecurityOAuthProxy { + return "https-query" + } + return "http-query" +} + func getTargetPortForQueryService(jaeger *v1.Jaeger) int { if jaeger.Spec.Ingress.Security == v1.IngressSecurityOAuthProxy { return 8443 diff --git a/pkg/service/query_test.go b/pkg/service/query_test.go index eb107569d..f04555b3a 100644 --- a/pkg/service/query_test.go +++ b/pkg/service/query_test.go @@ -20,6 +20,7 @@ func TestQueryServiceNameAndPorts(t *testing.T) { assert.Equal(t, "testqueryservicenameandports-query", svc.ObjectMeta.Name) assert.Len(t, svc.Spec.Ports, 1) assert.Equal(t, int32(16686), svc.Spec.Ports[0].Port) + assert.Equal(t, "http-query", svc.Spec.Ports[0].Name) assert.Equal(t, intstr.FromInt(16686), svc.Spec.Ports[0].TargetPort) assert.Len(t, svc.Spec.ClusterIP, 0) // make sure we get a cluster IP } @@ -45,5 +46,6 @@ func TestQueryServiceNameAndPortsWithOAuthProxy(t *testing.T) { assert.Equal(t, "testqueryservicenameandportswithoauthproxy-query", svc.ObjectMeta.Name) assert.Len(t, svc.Spec.Ports, 1) assert.Equal(t, int32(443), svc.Spec.Ports[0].Port) + assert.Equal(t, "https-query", svc.Spec.Ports[0].Name) assert.Equal(t, intstr.FromInt(8443), svc.Spec.Ports[0].TargetPort) }