add serviceType for the collector service

deploy/crds/jaegertracing.io_jaegers_crd.yaml

@@ -2660,6 +2660,8 @@ spec:
                   type: object
                 serviceAccount:
                   type: string
+                serviceType:
+                  type: string
                 tolerations:
                   items:
                     properties:

pkg/apis/jaegertracing/v1/jaeger_types.go

@@ -380,6 +380,13 @@ type JaegerCollectorSpec struct {
 
 	// +optional
 	Config FreeForm `json:"config,omitempty"`
+
+	// +optional
+	// ServiceType represents the type of Service to create.
+	// Valid values include: ClusterIP, NodePort, LoadBalancer, and ExternalName.
+	// The default, if omitted, is ClusterIP.
+	// See https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types
+	ServiceType v1.ServiceType `json:"serviceType,omitempty"`
 }
 
 // JaegerIngesterSpec defines the options to be used when deploying the ingester

pkg/service/collector.go

@@ -32,7 +32,9 @@ func headlessCollectorService(jaeger *v1.Jaeger, selector map[string]string) *co
 }
 
 func clusteripCollectorService(jaeger *v1.Jaeger, selector map[string]string) *corev1.Service {
-	return collectorService(jaeger, selector)
+	svc := collectorService(jaeger, selector)
+	svc.Spec.Type = getTypeForCollectorService(jaeger)
+	return svc
 }
 
 func collectorService(jaeger *v1.Jaeger, selector map[string]string) *corev1.Service {
@@ -121,3 +123,10 @@ func GetPortNameForGRPC(jaeger *v1.Jaeger) string {
 	// doesn't look like we have TLS enabled
 	return "http-grpc"
 }
+
+func getTypeForCollectorService(jaeger *v1.Jaeger) corev1.ServiceType {
+	if jaeger.Spec.Collector.ServiceType != "" {
+		return jaeger.Spec.Collector.ServiceType
+	}
+	return corev1.ServiceTypeClusterIP
+}

pkg/service/collector_test.go

@@ -5,6 +5,7 @@ import (
 
 	"github.com/spf13/viper"
 	"github.com/stretchr/testify/assert"
+	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
 
 	v1 "github.com/jaegertracing/jaeger-operator/pkg/apis/jaegertracing/v1"
@@ -130,3 +131,15 @@ func TestCollectorGRPCPortName(t *testing.T) {
 		})
 	}
 }
+
+func TestCollectorServiceLoadBalancer(t *testing.T) {
+	name := "TestCollectorServiceLoadBalancer"
+	selector := map[string]string{"app": "myapp", "jaeger": name, "jaeger-component": "collector"}
+
+	jaeger := v1.NewJaeger(types.NamespacedName{Name: name})
+	jaeger.Spec.Collector.ServiceType = corev1.ServiceTypeLoadBalancer
+	svc := NewCollectorServices(jaeger, selector)
+
+	// Only the non-headless service will receive the type
+	assert.Equal(t, svc[1].Spec.Type, corev1.ServiceTypeLoadBalancer)
+}