From 61d426c1ca91df6f440f19ba4c9bc78cbbe32b3c Mon Sep 17 00:00:00 2001
From: Ilya Sotkov <ilya@sotkov.com>
Date: Tue, 28 Aug 2018 01:27:30 +0300
Subject: [PATCH] [argo-events] Fix unused crdVersion value and add ability to
 specify crd creation job service account (#19)

* Use crd.version value and add ability to specify crd creation job sa
* Bump chart version to 0.2.0
---
 charts/argo-events/Chart.yaml                          | 2 +-
 charts/argo-events/templates/_sensor-crd.tpl           | 2 +-
 charts/argo-events/templates/apply-sensor-crd-job.yaml | 3 ++-
 charts/argo-events/values.yaml                         | 4 +++-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/charts/argo-events/Chart.yaml b/charts/argo-events/Chart.yaml
index de65136c..d32cb2be 100644
--- a/charts/argo-events/Chart.yaml
+++ b/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.1.0
+version: 0.2.0
 keywords:
 - argo-events
 - sensor-controller
diff --git a/charts/argo-events/templates/_sensor-crd.tpl b/charts/argo-events/templates/_sensor-crd.tpl
index 76761908..48fb2ab5 100644
--- a/charts/argo-events/templates/_sensor-crd.tpl
+++ b/charts/argo-events/templates/_sensor-crd.tpl
@@ -1,6 +1,6 @@
 {{- define "sensor-crd-json" }}
 {
-  "apiVersion": "apiextensions.k8s.io/v1beta1",
+  "apiVersion": "apiextensions.k8s.io/{{ .Values.crd.version }}",
   "kind": "CustomResourceDefinition",
   "metadata": {
     "name": "sensors.argoproj.io"
diff --git a/charts/argo-events/templates/apply-sensor-crd-job.yaml b/charts/argo-events/templates/apply-sensor-crd-job.yaml
index 7f542894..8360d0fd 100644
--- a/charts/argo-events/templates/apply-sensor-crd-job.yaml
+++ b/charts/argo-events/templates/apply-sensor-crd-job.yaml
@@ -10,9 +10,10 @@ spec:
   activeDeadlineSeconds: 100
   template:
     spec:
+      serviceAccountName: {{ .Values.crd.jobServiceAccount }}
       containers:
       - name: kubectl-apply
         image: lachlanevenson/k8s-kubectl
         command: ["/bin/sh"]
         args: ["-c", 'echo ''{{- include "sensor-crd-json" .}}'' | kubectl apply -f -']
-      restartPolicy: Never
\ No newline at end of file
+      restartPolicy: Never
diff --git a/charts/argo-events/values.yaml b/charts/argo-events/values.yaml
index ca0510fa..c68ca7cc 100644
--- a/charts/argo-events/values.yaml
+++ b/charts/argo-events/values.yaml
@@ -2,7 +2,9 @@ registry: argoproj
 imagePullPolicy: Always
 
 # Version of the Sensor CRD
-crdVersion: v1alpha1
+crd:
+  version: v1beta1
+  jobServiceAccount: default
 
 # If set to true then chart set controller instance id to release name
 useReleaseAsInstanceID: true