feat: Update events chart (#220)

* added crds directory for helm 3 compability

* added eventsource-crd for helm2

* updated image tags to newer version, added new property for additionalRules for compability

* updated SA Rules to match installation yaml from events repo

* introduced shortnames to match upstream crds

* updated env var names to match events installation yml from upstream repo

* updated chart and app version

charts/argo-events/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 description: A Helm chart to install Argo-Events in k8s Cluster
 name: argo-events
-version: 0.6.1
+version: 0.7.0
 keywords:
   - argo-events
   - sensor-controller
@@ -11,6 +11,6 @@ sources:
 maintainers:
   - name: VaibhavPage
   - name: magaldima
-appVersion: 0.11
+appVersion: 0.12
 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
 home: https://github.com/argoproj/argo-helm

charts/argo-events/crds/event-source-crd.yml

@@ -0,0 +1,18 @@
+---
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: eventsources.argoproj.io
+spec:
+  group: argoproj.io
+  scope: Namespaced
+  names:
+    kind: EventSource
+    plural: eventsources
+    singular: eventsource
+    listKind: EventSourceList
+    shortNames:
+      - es
+  version: "v1alpha1"
+
+

charts/argo-events/crds/gateway-crd.yml

@@ -0,0 +1,16 @@
+---
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: gateways.argoproj.io
+spec:
+  group: argoproj.io
+  names:
+    kind: Gateway
+    listKind: GatewayList
+    plural: gateways
+    singular: gateway
+    shortNames:
+      - gw
+  scope: Namespaced
+  version: "v1alpha1"

charts/argo-events/crds/sensor-crd.yml

@@ -0,0 +1,17 @@
+---
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: sensors.argoproj.io
+spec:
+  group: argoproj.io
+  names:
+    kind: Sensor
+    listKind: SensorList
+    plural: sensors
+    singular: sensor
+    shortNames:
+      - sn
+  scope: Namespaced
+  version: "v1alpha1"
+

charts/argo-events/templates/argo-events-cluster-roles.yaml

@@ -24,20 +24,9 @@ kind: ClusterRole
 metadata:
   name: argo-events-role
 rules:
-  - apiGroups:
+{{- if .Values.additionalServiceAccountRules }}
-      - apiextensions.k8s.io
+{{ .Values.additionalServiceAccountRules | toYaml | nindent 2}}
-      - apiextensions.k8s.io/v1beta1
+{{- end }}
-    verbs:
-      - create
-      - delete
-      - deletecollection
-      - get
-      - list
-      - patch
-      - update
-      - watch
-    resources:
-      - customresourcedefinitions
   - apiGroups:
       - argoproj.io
     verbs:
@@ -58,6 +47,8 @@ rules:
       - gateways/finalizers
       - sensors
       - sensors/finalizers
+      - eventsources
+      - eventsources/finalizers
   - apiGroups:
       - ""
     resources:
@@ -89,9 +80,7 @@ rules:
       - patch
       - delete
   - apiGroups:
-      - "apps/v1"
+      - "apps"
-      - "apps/v1beta2"
-      - "apps/v1beta1"
     resources:
       - deployments
     verbs:
@@ -102,3 +91,4 @@ rules:
       - update
       - patch
       - delete
+

charts/argo-events/templates/eventsource-crd.yaml

@@ -0,0 +1,17 @@
+{{- if .Values.installCRD }}
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: eventsources.argoproj.io
+spec:
+  group: argoproj.io
+  scope: Namespaced
+  names:
+    kind: EventSource
+    plural: eventsources
+    singular: eventsource
+    listKind: EventSourceList
+    shortNames:
+      - es
+  version: "v1alpha1"
+{{- end }}

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

@@ -25,9 +25,9 @@ spec:
           image: "{{ .Values.registry }}/{{ .Values.gatewayController.image }}:{{ .Values.gatewayController.tag }}"
           imagePullPolicy: {{ .Values.imagePullPolicy }}
           env:
-            - name: GATEWAY_NAMESPACE
+            - name: NAMESPACE
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
-            - name: GATEWAY_CONTROLLER_CONFIG_MAP
+            - name: CONTROLLER_CONFIG_MAP
               value: {{ .Release.Name }}-{{ .Values.gatewayController.name }}-configmap

charts/argo-events/templates/gateway-crd.yaml

@@ -11,6 +11,8 @@ spec:
     listKind: GatewayList
     plural: gateways
     singular: gateway
+    shortNames:
+      - gw
   scope: Namespaced
-  version: v1alpha1
+  version: "v1alpha1"
 {{- end }}

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

@@ -25,9 +25,9 @@ spec:
           image: "{{ .Values.registry }}/{{ .Values.sensorController.image }}:{{ .Values.sensorController.tag }}"
           imagePullPolicy: {{ .Values.imagePullPolicy }}
           env:
-            - name: SENSOR_NAMESPACE
+            - name: NAMESPACE
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
-            - name: SENSOR_CONFIG_MAP
+            - name: CONTROLLER_CONFIG_MAP
               value: {{ .Release.Name }}-{{ .Values.sensorController.name }}-configmap

charts/argo-events/templates/sensor-crd.yaml

@@ -11,6 +11,8 @@ spec:
     listKind: SensorList
     plural: sensors
     singular: sensor
+    shortNames:
+      - sn
   scope: Namespaced
   version: v1alpha1
 {{- end }}

charts/argo-events/values.yaml

@@ -9,10 +9,26 @@ installCRD: true
 
 # ServiceAccount to use for running controller.
 serviceAccount: argo-events-sa
+
 # Create service accounts in additional namespaces specified
 # The SA will always be created in the release namespaces
 additionalSaNamespaces: []
   # - argo-prod
+additionalServiceAccountRules:
+- apiGroups:
+    - apiextensions.k8s.io
+    - apiextensions.k8s.io/v1beta1
+  verbs:
+    - create
+    - delete
+    - deletecollection
+    - get
+    - list
+    - patch
+    - update
+    - watch
+  resources:
+    - customresourcedefinitions
 
 instanceID: argo-events
 
@@ -26,11 +42,11 @@ singleNamespace: true
 sensorController:
   name: sensor-controller
   image: sensor-controller
-  tag: v0.11
+  tag: v0.12
   replicaCount: 1
 
 gatewayController:
   name: gateway-controller
   image: gateway-controller
-  tag: v0.11
+  tag: v0.12
   replicaCount: 1