fix: gateway and sensor resource names (#644)

* fix: gateway and sensor resource names

* feat(add-header-http-trigger): added optional headers to http trigger

* fix: readme

README.md

@@ -34,7 +34,7 @@ Follow these [instruction](https://argoproj.github.io/argo-events/installation/)
 [![asciicast](https://asciinema.org/a/AKkYwzEakSUsLqH8mMORA4kza.png)](https://asciinema.org/a/AKkYwzEakSUsLqH8mMORA4kza)
 
 ## Documentation
-- [Concepts](https://argoproj.github.io/argo-events/concepts/high_level_architecture/).
+- [Concepts](https://argoproj.github.io/argo-events/concepts/architecture/).
 - [Argo Events in action](https://argoproj.github.io/argo-events/quick_start/).
 - [Deploy gateways and sensors](https://argoproj.github.io/argo-events/setup/webhook/).
 - [Deep dive into Argo Events](https://argoproj.github.io/argo-events/tutorials/01-introduction/).  

controllers/gateway/informer.go

@@ -27,13 +27,18 @@ import (
 func (c *Controller) instanceIDReq() (*labels.Requirement, error) {
 	var instanceIDReq *labels.Requirement
 	var err error
+	var values []string
+
+	op := selection.DoesNotExist
+
 	if c.Config.InstanceID != "" {
-		instanceIDReq, err = labels.NewRequirement(LabelControllerInstanceID, selection.Equals, []string{c.Config.InstanceID})
-	} else {
-		instanceIDReq, err = labels.NewRequirement(LabelControllerInstanceID, selection.DoesNotExist, nil)
+		op = selection.Equals
+		values = []string{c.Config.InstanceID}
 	}
+
+	instanceIDReq, err = labels.NewRequirement(LabelControllerInstanceID, op, values)
 	if err != nil {
-		panic(err)
+		return nil, err
 	}
 	c.logger.WithField("instance-id", instanceIDReq.String()).Infoln("instance id requirement")
 	return instanceIDReq, nil

controllers/gateway/resource.go

@@ -112,7 +112,9 @@ func (ctx *gatewayContext) makeDeploymentSpec() (*appv1.DeploymentSpec, error) {
 	}
 
 	if ctx.gateway.Spec.Template.Container != nil {
-		mergo.Merge(&eventContainer, ctx.gateway.Spec.Template.Container, mergo.WithOverride)
+		if err := mergo.Merge(&eventContainer, ctx.gateway.Spec.Template.Container, mergo.WithOverride); err != nil {
+			return nil, err
+		}
 	}
 
 	return &appv1.DeploymentSpec{
@@ -185,7 +187,7 @@ func (ctx *gatewayContext) buildDeploymentResource() (*appv1.Deployment, error)
 	deployment := &appv1.Deployment{
 		ObjectMeta: metav1.ObjectMeta{
 			Namespace:    ctx.gateway.Namespace,
-			GenerateName: fmt.Sprintf("%s-gateway-%s-", ctx.gateway.Spec.Type, ctx.gateway.Name),
+			GenerateName: fmt.Sprintf("%s-gateway-", ctx.gateway.Name),
 			Labels:       deploymentSpec.Template.Labels,
 		},
 		Spec: *deploymentSpec,

controllers/sensor/informer.go

@@ -27,14 +27,20 @@ import (
 func (controller *Controller) instanceIDReq() (*labels.Requirement, error) {
 	var instanceIDReq *labels.Requirement
 	var err error
-	if controller.Config.InstanceID == "" {
-		instanceIDReq, err = labels.NewRequirement(LabelControllerInstanceID, selection.DoesNotExist, nil)
-	} else {
-		instanceIDReq, err = labels.NewRequirement(LabelControllerInstanceID, selection.Equals, []string{controller.Config.InstanceID})
+	var values []string
+
+	op := selection.DoesNotExist
+
+	if controller.Config.InstanceID != "" {
+		op = selection.Equals
+		values = []string{controller.Config.InstanceID}
 	}
+
+	instanceIDReq, err = labels.NewRequirement(LabelControllerInstanceID, op, values)
 	if err != nil {
-		panic(err)
+		return nil, err
 	}
+	controller.logger.WithField("instance-id", instanceIDReq.String()).Infoln("instance id requirement")
 	return instanceIDReq, nil
 }
 

controllers/sensor/resource.go

@@ -79,11 +79,11 @@ func (ctx *sensorContext) serviceBuilder() (*corev1.Service, error) {
 	return service, nil
 }
 
-func (ctx *sensorContext) makeDeploymentSpec() appv1.DeploymentSpec {
+func (ctx *sensorContext) makeDeploymentSpec() (*appv1.DeploymentSpec, error) {
 	// Deprecated spec, will be unsupported soon.
 	if ctx.sensor.Spec.Template.Spec != nil {
 		ctx.logger.WithField("name", ctx.sensor.Name).WithField("namespace", ctx.sensor.Namespace).Warn("spec.template.spec is DEPRECATED, it will be unsupported soon, please use spec.template.container")
-		return ctx.makeLegacyDeploymentSpec()
+		return ctx.makeLegacyDeploymentSpec(), nil
 	}
 
 	replicas := int32(1)
@@ -95,10 +95,12 @@ func (ctx *sensorContext) makeDeploymentSpec() appv1.DeploymentSpec {
 		ImagePullPolicy: corev1.PullAlways,
 	}
 	if ctx.sensor.Spec.Template.Container != nil {
-		mergo.Merge(&sensorContainer, ctx.sensor.Spec.Template.Container, mergo.WithOverride)
+		if err := mergo.Merge(&sensorContainer, ctx.sensor.Spec.Template.Container, mergo.WithOverride); err != nil {
+			return nil, err
+		}
 	}
 	sensorContainer.Name = "main"
-	return appv1.DeploymentSpec{
+	return &appv1.DeploymentSpec{
 		Selector: &metav1.LabelSelector{
 			MatchLabels: labels,
 		},
@@ -116,16 +118,16 @@ func (ctx *sensorContext) makeDeploymentSpec() appv1.DeploymentSpec {
 				SecurityContext: ctx.sensor.Spec.Template.SecurityContext,
 			},
 		},
-	}
+	}, nil
 }
 
 // makeLegacyDeploymentSpec is deprecated, will be unsupported soon.
-func (ctx *sensorContext) makeLegacyDeploymentSpec() appv1.DeploymentSpec {
+func (ctx *sensorContext) makeLegacyDeploymentSpec() *appv1.DeploymentSpec {
 	replicas := int32(1)
 	labels := map[string]string{
 		common.LabelObjectName: ctx.sensor.Name,
 	}
-	return appv1.DeploymentSpec{
+	return &appv1.DeploymentSpec{
 		Selector: &metav1.LabelSelector{
 			MatchLabels: labels,
 		},
@@ -141,14 +143,17 @@ func (ctx *sensorContext) makeLegacyDeploymentSpec() appv1.DeploymentSpec {
 
 // deploymentBuilder builds the deployment specification for the sensor
 func (ctx *sensorContext) deploymentBuilder() (*appv1.Deployment, error) {
-	deploymentSpec := ctx.makeDeploymentSpec()
+	deploymentSpec, err := ctx.makeDeploymentSpec()
+	if err != nil {
+		return nil, err
+	}
 	deployment := &appv1.Deployment{
 		ObjectMeta: metav1.ObjectMeta{
 			Namespace:    ctx.sensor.Namespace,
 			GenerateName: fmt.Sprintf("%s-sensor-", ctx.sensor.Name),
 			Labels:       deploymentSpec.Template.Labels,
 		},
-		Spec: deploymentSpec,
+		Spec: *deploymentSpec,
 	}
 	envVars := []corev1.EnvVar{
 		{