From 2dd744d4b6a273ddb7a78e9b56863abf1fefba12 Mon Sep 17 00:00:00 2001
From: Ilya Sotkov <ilya.sotkov@sanoma.com>
Date: Sun, 26 Aug 2018 20:01:06 +0300
Subject: [PATCH] Use crd.version value and add ability to specify crd creation
 job sa

---
 charts/argo-events/templates/_sensor-crd.tpl           | 2 +-
 charts/argo-events/templates/apply-sensor-crd-job.yaml | 3 ++-
 charts/argo-events/values.yaml                         | 4 +++-
 3 files changed, 6 insertions(+), 3 deletions(-)

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