Changes to enable passing labels and annotations to service exposing …

…sensor through eventProtocol (#440)

controllers/sensor/resource.go

@@ -31,12 +31,10 @@ import (
 
 // generateServiceSpec returns a K8s service spec for the sensor
 func (ctx *sensorContext) generateServiceSpec() *corev1.Service {
-	return &corev1.Service{
+	serviceSpec := &corev1.Service{
 		ObjectMeta: metav1.ObjectMeta{
-			Labels: map[string]string{
-				common.LabelSensorName:    ctx.sensor.Name,
-				LabelControllerInstanceID: ctx.controller.Config.InstanceID,
-			},
+			Labels: ctx.sensor.Spec.EventProtocol.Http.Labels,
+			Annotations: ctx.sensor.Spec.EventProtocol.Http.Annotations,
 		},
 		Spec: corev1.ServiceSpec{
 			Ports: []corev1.ServicePort{
@@ -51,6 +49,16 @@ func (ctx *sensorContext) generateServiceSpec() *corev1.Service {
 			},
 		},
 	}
+
+	// Non-overrideable labels required by sensor service
+	if serviceSpec.ObjectMeta.Labels == nil {
+		serviceSpec.ObjectMeta.Labels = map[string]string{}
+	}
+
+	serviceSpec.ObjectMeta.Labels[common.LabelSensorName] = ctx.sensor.Name
+	serviceSpec.ObjectMeta.Labels[LabelControllerInstanceID] = ctx.controller.Config.InstanceID
+
+	return serviceSpec
 }
 
 // serviceBuilder builds a new service that exposes sensor.

controllers/sensor/resource_test.go

@@ -84,6 +84,26 @@ func TestResource_BuildService(t *testing.T) {
 	assert.NotEmpty(t, service.Annotations[common.AnnotationResourceSpecHash])
 }
 
+func TestResource_BuildServiceWithLabelsAnnotations(t *testing.T) {
+	controller := getController()
+	sensorCopy := sensorObj.DeepCopy()
+
+	sensorCopy.Spec.EventProtocol.Http.Labels = map[string]string{}
+	sensorCopy.Spec.EventProtocol.Http.Labels["test-label"] = "label1"
+	sensorCopy.Spec.EventProtocol.Http.Annotations = map[string]string{}
+	sensorCopy.Spec.EventProtocol.Http.Annotations["test-annotation"] = "annotation1"
+
+	opctx := newSensorContext(sensorCopy, controller)
+	service, err := opctx.serviceBuilder()
+	assert.Nil(t, err)
+	assert.NotNil(t, service)
+	assert.NotEmpty(t, service.Annotations[common.AnnotationResourceSpecHash])
+	assert.NotNil(t, service.ObjectMeta.Labels)
+	assert.NotNil(t, service.ObjectMeta.Annotations)
+	assert.Equal(t, service.ObjectMeta.Labels["test-label"], "label1")
+	assert.Equal(t, service.ObjectMeta.Annotations["test-annotation"], "annotation1")
+}
+
 func TestResource_BuildDeployment(t *testing.T) {
 	controller := getController()
 	opctx := newSensorContext(sensorObj.DeepCopy(), controller)

pkg/apis/common/event.go

@@ -81,6 +81,12 @@ type EventProtocol struct {
 type Http struct {
 	// Port on which server will run
 	Port string `json:"port" protobuf:"bytes,1,opt,name=port"`
+
+	// Labels to be set for the service generated
+	Labels map[string]string `json:"labels,omitempty" protobuf:"bytes,11,rep,name=labels"`
+
+	// Annotations to be set for the service generated
+	Annotations map[string]string `json:"annotations,omitempty" protobuf:"bytes,12,rep,name=annotations"`
 }
 
 // Nats contains the information required to connect to nats server and get subscriptions