feat: Expose metadata for sensors and fix metadata for eventsources (#…

…773)
argoproj · Jul 26, 2020 · 21f4360 · 21f4360
1 parent c911103
commit 21f4360
Show file tree

Hide file tree

Showing 27 changed files with 1,074 additions and 290 deletions.
diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json
diff --git a/api/sensor.html b/api/sensor.html
diff --git a/api/sensor.md b/api/sensor.md
diff --git a/controllers/eventsource/resource.go b/controllers/eventsource/resource.go
@@ -286,14 +286,25 @@ func buildDeploymentSpec(args *AdaptorArgs) (*appv1.DeploymentSpec, error) {
 		}
 	}
 	eventSourceContainer.Name = "main"
+	podTemplateLabels := make(map[string]string)
+	if len(args.EventSource.Spec.Template.Metadata.Labels) > 0 {
+		for k, v := range args.EventSource.Spec.Template.Metadata.Labels {
+			podTemplateLabels[k] = v
+		}
+	}
+	for k, v := range args.Labels {
+		podTemplateLabels[k] = v
+	}
+
 	spec := &appv1.DeploymentSpec{
 		Selector: &metav1.LabelSelector{
-			MatchLabels: args.Labels,
+			MatchLabels: podTemplateLabels,
 		},
 		Replicas: &replicas,
 		Template: corev1.PodTemplateSpec{
 			ObjectMeta: metav1.ObjectMeta{
-				Labels: args.Labels,
+				Labels:      podTemplateLabels,
+				Annotations: args.EventSource.Spec.Template.Metadata.Annotations,
 			},
 			Spec: corev1.PodSpec{
 				ServiceAccountName: args.EventSource.Spec.Template.ServiceAccountName,

diff --git a/controllers/sensor/resource.go b/controllers/sensor/resource.go
@@ -218,9 +218,18 @@ func buildDeploymentSpec(args *AdaptorArgs) (*appv1.DeploymentSpec, error) {
 		}
 	}
 	sensorContainer.Name = "main"
+	podTemplateLabels := make(map[string]string)
+	if len(args.Sensor.Spec.Template.Metadata.Labels) > 0 {
+		for k, v := range args.Sensor.Spec.Template.Metadata.Labels {
+			podTemplateLabels[k] = v
+		}
+	}
+	for k, v := range args.Labels {
+		podTemplateLabels[k] = v
+	}
 	return &appv1.DeploymentSpec{
 		Selector: &metav1.LabelSelector{
-			MatchLabels: args.Labels,
+			MatchLabels: podTemplateLabels,
 		},
 		Replicas: &replicas,
 		Strategy: appv1.DeploymentStrategy{
@@ -229,7 +238,8 @@ func buildDeploymentSpec(args *AdaptorArgs) (*appv1.DeploymentSpec, error) {
 		},
 		Template: corev1.PodTemplateSpec{
 			ObjectMeta: metav1.ObjectMeta{
-				Labels: args.Labels,
+				Labels:      podTemplateLabels,
+				Annotations: args.Sensor.Spec.Template.Metadata.Annotations,
 			},
 			Spec: corev1.PodSpec{
 				ServiceAccountName: args.Sensor.Spec.Template.ServiceAccountName,

diff --git a/examples/event-sources/aws-sns.yaml b/examples/event-sources/aws-sns.yaml
@@ -3,8 +3,6 @@ kind: EventSource
 metadata:
   name: aws-sns
 spec:
-  template:
-    serviceAccountName: argo-events-sa # assign a service account with `get` permissions for secrets.
   service:
     ports:
       - port: 12000

diff --git a/examples/event-sources/aws-sqs.yaml b/examples/event-sources/aws-sqs.yaml
@@ -3,8 +3,6 @@ kind: EventSource
 metadata:
   name: aws-sqs
 spec:
-  template:
-    serviceAccountName: argo-events-sa # assign a service account with `get` permissions for secrets.
   sqs:
     example:
       # jsonBody specifies that all event body payload coming from this

diff --git a/examples/event-sources/azure-events-hub.yaml b/examples/event-sources/azure-events-hub.yaml
@@ -3,8 +3,6 @@ kind: EventSource
 metadata:
   name: azure-events-hub
 spec:
-  template:
-    serviceAccountName: argo-events-sa # assign a service account with `get` permissions for secrets.
   azureEventsHub:
     example:
       # FQDN of the EventsHub namespace you created

diff --git a/examples/event-sources/emitter.yaml b/examples/event-sources/emitter.yaml
@@ -26,7 +26,6 @@ spec:
         factor: 2
         jitter: 0.2
 #  template:
-#    serviceAccountName: argo-events-sa # assign a service account with `get` permissions for secrets.
 #      # Username to use to connect to broker
 #      # +optional
 #      username:

diff --git a/examples/event-sources/github.yaml b/examples/event-sources/github.yaml
@@ -4,8 +4,6 @@ kind: EventSource
 metadata:
   name: github
 spec:
-  template:
-    serviceAccountName: argo-events-sa # assign a service account with `get` permissions for secrets.
   service:
     ports:
       - port: 12000

diff --git a/examples/event-sources/gitlab.yaml b/examples/event-sources/gitlab.yaml
@@ -4,8 +4,6 @@ kind: EventSource
 metadata:
   name: gitlab
 spec:
-  template:
-    serviceAccountName: argo-events-sa # assign a service account with `get` permissions for secrets.
   service:
     ports:
       - port: 12000

diff --git a/examples/event-sources/hdfs.yaml b/examples/event-sources/hdfs.yaml
@@ -13,7 +13,6 @@ spec:
         - my-hdfs-namenode-1.my-hdfs-namenode.default.svc.cluster.local:8020
       hdfsUser: root
 #  template:
-#    serviceAccountName: argo-events-sa # assign a service account with `get` permissions for secrets.
       # krbCCacheSecret:
       #   name: krb
       #   key: krb5cc_0

diff --git a/examples/event-sources/minio.yaml b/examples/event-sources/minio.yaml
@@ -3,8 +3,6 @@ kind: EventSource
 metadata:
   name: minio
 spec:
-  template:
-    serviceAccountName: argo-events-sa # assign a service account with `get` permissions for secrets.
   minio:
     example:
       # bucket information

diff --git a/examples/event-sources/redis.yaml b/examples/event-sources/redis.yaml
@@ -3,9 +3,6 @@ kind: EventSource
 metadata:
   name: redis
 spec:
-  # uncomment if the password field is set
-#  template:
-#    serviceAccountName: argo-events-sa # assign a service account with `get` permissions for secrets.
   redis:
     example:
       # HostAddress refers to the address of the Redis host/server

diff --git a/examples/event-sources/slack.yaml b/examples/event-sources/slack.yaml
@@ -3,8 +3,6 @@ kind: EventSource
 metadata:
   name: slack
 spec:
-  template:
-    serviceAccountName: argo-events-sa # assign a service account with `get` permissions for secrets.
   service:
     ports:
       - port: 12000

diff --git a/examples/event-sources/storage-grid.yaml b/examples/event-sources/storage-grid.yaml
@@ -3,8 +3,6 @@ kind: EventSource
 metadata:
   name: storage-grid
 spec:
-  template:
-    serviceAccountName: argo-events-sa # assign a service account with `get` permissions for secrets.
   service:
     ports:
       - port: 8080

diff --git a/examples/event-sources/stripe.yaml b/examples/event-sources/stripe.yaml
@@ -3,8 +3,6 @@ kind: EventSource
 metadata:
   name: stripe
 spec:
-  template:
-    serviceAccountName: argo-events-sa # assign a service account with `get` permissions for secrets.
   service:
     ports:
       - port: 12000

diff --git a/examples/eventbus/native.yaml b/examples/eventbus/native.yaml
@@ -5,7 +5,9 @@ metadata:
 spec:
   nats:
     native:
+      # Optional, defaults to 3
       replicas: 3
+      # Optional, authen strategy, "none" or "token", defaults to "none"
       auth: token
 #      containerTemplate:
 #        resources:

diff --git a/examples/sensors/http-trigger.yaml b/examples/sensors/http-trigger.yaml
@@ -3,8 +3,6 @@ kind: Sensor
 metadata:
   name: minio
 spec:
-  template:
-    serviceAccountName: argo-events-sa
   dependencies:
     - name: test-dep
       eventSourceName: minio