From c623b656a1ade40d380d450162ffa1dd6390a8a5 Mon Sep 17 00:00:00 2001
From: Vlad Losev <vladlosev@users.noreply.github.com>
Date: Wed, 21 Apr 2021 02:35:38 -0700
Subject: [PATCH] feat(argo-events): Add support for pod annotations. (#680)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat(argo-events): Add support for pod annotations.

Signed-off-by: Vlad Losev <vladimir.losev@sage.com>

* Apply suggestions from code review.

Co-authored-by: Oliver Bähler <oliverbaehler@hotmail.com>
Signed-off-by: Vlad Losev <vladimir.losev@sage.com>

Co-authored-by: Oliver Bähler <oliverbaehler@hotmail.com>

Signed-off-by: kostas-theo <ktheo@oneconcern.com>
---
 charts/argo-events/Chart.yaml                                | 2 +-
 .../templates/eventbus-controller-deployment.yaml            | 3 +++
 .../templates/eventsource-controller-deployment.yaml         | 3 +++
 .../argo-events/templates/sensor-controller-deployment.yaml  | 3 +++
 charts/argo-events/values.yaml                               | 5 ++++-
 5 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/charts/argo-events/Chart.yaml b/charts/argo-events/Chart.yaml
index 8830c053..7525904f 100644
--- a/charts/argo-events/Chart.yaml
+++ b/charts/argo-events/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 description: A Helm chart to install Argo-Events in k8s Cluster
 name: argo-events
-version: 1.2.5
+version: 1.4.0
 keywords:
   - argo-events
   - sensor-controller
diff --git a/charts/argo-events/templates/eventbus-controller-deployment.yaml b/charts/argo-events/templates/eventbus-controller-deployment.yaml
index dd734a88..900daf41 100644
--- a/charts/argo-events/templates/eventbus-controller-deployment.yaml
+++ b/charts/argo-events/templates/eventbus-controller-deployment.yaml
@@ -18,6 +18,9 @@ spec:
       labels:
         app: {{ .Release.Name }}-{{ .Values.eventbusController.name }}
         release: {{ .Release.Name }}
+      {{- with .Values.eventbusController.podAnnotations }}
+      annotations: {{- toYaml . | nindent 8 }}
+      {{- end }}
     spec:
       serviceAccountName: {{ .Values.serviceAccount }}
       containers:
diff --git a/charts/argo-events/templates/eventsource-controller-deployment.yaml b/charts/argo-events/templates/eventsource-controller-deployment.yaml
index 95e7e83a..9fcd1eaf 100644
--- a/charts/argo-events/templates/eventsource-controller-deployment.yaml
+++ b/charts/argo-events/templates/eventsource-controller-deployment.yaml
@@ -18,6 +18,9 @@ spec:
       labels:
         app: {{ .Release.Name }}-{{ .Values.eventsourceController.name }}
         release: {{ .Release.Name }}
+      {{- with .Values.eventsourceController.podAnnotations }}
+      annotations: {{- toYaml . | nindent 8 }}
+      {{- end }}
     spec:
       serviceAccountName: {{ .Values.serviceAccount }}
       containers:
diff --git a/charts/argo-events/templates/sensor-controller-deployment.yaml b/charts/argo-events/templates/sensor-controller-deployment.yaml
index 214ee2bb..371fe82f 100644
--- a/charts/argo-events/templates/sensor-controller-deployment.yaml
+++ b/charts/argo-events/templates/sensor-controller-deployment.yaml
@@ -18,6 +18,9 @@ spec:
       labels:
         app: {{ .Release.Name }}-{{ .Values.sensorController.name }}
         release: {{ .Release.Name }}
+      {{- with .Values.sensorController.podAnnotations }}
+      annotations: {{- toYaml . | nindent 8 }}
+      {{- end }}
     spec:
       serviceAccountName: {{ .Values.serviceAccount }}
       containers:
diff --git a/charts/argo-events/values.yaml b/charts/argo-events/values.yaml
index 95a2b7d9..61f651e2 100644
--- a/charts/argo-events/values.yaml
+++ b/charts/argo-events/values.yaml
@@ -14,7 +14,7 @@ installCRD: true
 # ServiceAccount to use for running controller.
 serviceAccount: argo-events-sa
 
-# serviceAccountAnnotations can be used to enable GKE workload identity, or further other use-cases
+# serviceAccountAnnotations can be used to enable GKE workload identity, or other use-cases
 serviceAccountAnnotations: {}
 
 # Create service accounts in additional namespaces specified
@@ -51,6 +51,7 @@ sensorController:
   tag: v1.2.3
   replicaCount: 1
   sensorImage: sensor
+  podAnnotations: {}
   nodeSelector: {}
   tolerations: {}
   affinity: {}
@@ -61,6 +62,7 @@ eventsourceController:
   tag: v1.2.3
   replicaCount: 1
   eventsourceImage: eventsource
+  podAnnotations: {}
   nodeSelector: {}
   tolerations: {}
   affinity: {}
@@ -70,6 +72,7 @@ eventbusController:
   image: eventbus-controller
   tag: v1.2.3
   replicaCount: 1
+  podAnnotations: {}
   nodeSelector: {}
   tolerations: {}
   affinity: {}