Merge branch 'master' into bugfix/argo-workflows_template_names

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.4.2
+version: 1.5.0
 keywords:
   - argo-events
   - sensor-controller

charts/argo-events/templates/argo-events-sa.yaml

@@ -5,7 +5,11 @@ kind: ServiceAccount
 metadata:
   name: {{ .Values.serviceAccount }}
   namespace: {{ .Release.Namespace }}
+  {{- with .Values.serviceAccountAnnotations }}
+  annotations: {{- toYaml . | nindent 4 }}
+  {{- end }}
 {{- if .Values.additionalSaNamespaces }}
+{{ $annotations := .Values.serviceAccountAnnotations }}
 {{ $sa := .Values.serviceAccount }}
 {{- range $namespace := .Values.additionalSaNamespaces }}
 ---
@@ -14,5 +18,8 @@ kind: ServiceAccount
 metadata:
   name: {{ $sa }}
   namespace: {{ $namespace }}
+  {{- with $annotations }}
+  annotations: {{- toYaml . | nindent 4 }}
+  {{- end }}
 {{- end }}
 {{- end }}

charts/argo-events/templates/eventbus-controller-deployment.yaml

@@ -55,6 +55,7 @@ spec:
               port: 8081
             initialDelaySeconds: 3
             periodSeconds: 3
+          resources: {{- toYaml .Values.eventbusController.resources | nindent 12 }}
       {{- with .Values.eventbusController.priorityClassName }}
       priorityClassName: {{ . | quote }}
       {{- end }}

charts/argo-events/templates/eventsource-controller-deployment.yaml

@@ -53,6 +53,7 @@ spec:
               port: 8081
             initialDelaySeconds: 3
             periodSeconds: 3
+          resources: {{- toYaml .Values.eventsourceController.resources | nindent 12 }}
       {{- with .Values.eventsourceController.priorityClassName }}
       priorityClassName: {{ . | quote }}
       {{- end }}

charts/argo-events/templates/sensor-controller-deployment.yaml

@@ -53,6 +53,7 @@ spec:
               port: 8081
             initialDelaySeconds: 3
             periodSeconds: 3
+          resources: {{- toYaml .Values.sensorController.resources | nindent 12 }}
       {{- with .Values.sensorController.priorityClassName }}
       priorityClassName: {{ . | quote }}
       {{- end }}

charts/argo-events/values.yaml

@@ -14,6 +14,9 @@ installCRD: true
 # ServiceAccount to use for running controller.
 serviceAccount: argo-events-sa
 
+# serviceAccountAnnotations can be used to enable GKE workload identity, or other use-cases
+serviceAccountAnnotations: {}
+
 # Create service accounts in additional namespaces specified
 # The SA will always be created in the release namespaces
 additionalSaNamespaces: []
@@ -54,6 +57,7 @@ sensorController:
   priorityClassName: ""
   tolerations: []
   affinity: {}
+  resources: {}
 
 eventsourceController:
   name: eventsource-controller
@@ -67,6 +71,7 @@ eventsourceController:
   priorityClassName: ""
   tolerations: []
   affinity: {}
+  resources: {}
 
 eventbusController:
   name: eventbus-controller
@@ -79,6 +84,7 @@ eventbusController:
   priorityClassName: ""
   tolerations: []
   affinity: {}
+  resources: {}
   natsStreamingImage: nats-streaming:0.17.0
   natsMetricsExporterImage: synadia/prometheus-nats-exporter:0.6.2
 

charts/argocd-notifications/Chart.yaml

@@ -3,7 +3,7 @@ appVersion: 1.1.1
 description: A Helm chart for ArgoCD notifications, an add-on to ArgoCD.
 name: argocd-notifications
 type: application
-version: 1.3.1
+version: 1.3.2
 home: https://github.com/argoproj/argo-helm
 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
 keywords:

charts/argocd-notifications/templates/bots/slack/serviceaccount.yaml

@@ -5,4 +5,8 @@ metadata:
   name: {{ include "argocd-notifications.bots.slack.serviceAccountName" . }}
   labels:
     {{- include "argocd-notifications.bots.slack.labels" . | nindent 4 }}
+  {{- with .Values.bots.slack.serviceAccount.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{ end }}
 {{ end }}

charts/argocd-notifications/templates/serviceaccount.yaml

@@ -5,4 +5,8 @@ metadata:
   name: {{ include "argocd-notifications.serviceAccountName" . }}
   labels:
     {{- include "argocd-notifications.labels" . | nindent 4 }}
+  {{- with .Values.serviceAccount.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 {{- end }}

charts/argocd-notifications/values.yaml

@@ -93,6 +93,8 @@ serviceAccount:
   # If not set and create is true, a name is generated using the fullname template
   name: argocd-notifications-controller
 
+  annotations: {}
+
 cm:
   # Whether helm chart creates controller config map
   create: true
@@ -371,6 +373,8 @@ bots:
       # If not set and create is true, a name is generated using the fullname template
       name: argocd-notifications-bot
 
+      annotations: {}
+
     resources: {}
     # limits:
     #   cpu: 100m