From df66140844e411b0abe2a01dc3c622d97d9f410f Mon Sep 17 00:00:00 2001
From: Ilya Sotkov <ilya.sotkov@sanoma.com>
Date: Sun, 23 Sep 2018 11:32:01 +0300
Subject: [PATCH] Fix #20

---
 charts/argo-events/templates/_gateway-crd.tpl | 20 ------------------
 charts/argo-events/templates/_helpers.tpl     | 21 -------------------
 charts/argo-events/templates/_sensor-crd.tpl  | 20 ------------------
 .../templates/apply-gateway-crd-job.yaml      | 19 -----------------
 .../templates/apply-sensor-crd-job.yaml       | 19 -----------------
 charts/argo-events/templates/gateway-crd.yaml | 13 ++++++++++++
 .../sensor-controller-clusterrole.yaml        | 13 ++++++++++++
 charts/argo-events/templates/sensor-crd.yaml  | 13 ++++++++++++
 charts/argo-events/values.yaml                |  5 -----
 9 files changed, 39 insertions(+), 104 deletions(-)
 delete mode 100644 charts/argo-events/templates/_gateway-crd.tpl
 delete mode 100644 charts/argo-events/templates/_sensor-crd.tpl
 delete mode 100644 charts/argo-events/templates/apply-gateway-crd-job.yaml
 delete mode 100644 charts/argo-events/templates/apply-sensor-crd-job.yaml
 create mode 100644 charts/argo-events/templates/gateway-crd.yaml
 create mode 100644 charts/argo-events/templates/sensor-crd.yaml

diff --git a/charts/argo-events/templates/_gateway-crd.tpl b/charts/argo-events/templates/_gateway-crd.tpl
deleted file mode 100644
index d2665b09..00000000
--- a/charts/argo-events/templates/_gateway-crd.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-{{- define "gateway-crd-json" }}
-{
-  "apiVersion": "apiextensions.k8s.io/{{ .Values.crd.version }}",
-  "kind": "CustomResourceDefinition",
-  "metadata": {
-    "name": "gateways.argoproj.io"
-  },
-  "spec": {
-    "group": "argoproj.io",
-    "names": {
-      "kind": "Gateway",
-      "listKind": "GatewayList",
-      "plural": "gateways",
-      "singular": "gateway"
-    },
-    "scope": "Namespaced",
-    "version": "v1alpha1"
-  }
-}
-{{- end}}
diff --git a/charts/argo-events/templates/_helpers.tpl b/charts/argo-events/templates/_helpers.tpl
index 55c1142c..f0d83d2e 100644
--- a/charts/argo-events/templates/_helpers.tpl
+++ b/charts/argo-events/templates/_helpers.tpl
@@ -14,24 +14,3 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 {{- $name := default .Chart.Name .Values.nameOverride -}}
 {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
-
-{{- define "sensor-crd-json" }}
-{
-  "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"
-    },
-    "scope": "Namespaced",
-    "version": "v1alpha1"
-  }
-}
-{{- end}}
diff --git a/charts/argo-events/templates/_sensor-crd.tpl b/charts/argo-events/templates/_sensor-crd.tpl
deleted file mode 100644
index 48fb2ab5..00000000
--- a/charts/argo-events/templates/_sensor-crd.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-{{- define "sensor-crd-json" }}
-{
-  "apiVersion": "apiextensions.k8s.io/{{ .Values.crd.version }}",
-  "kind": "CustomResourceDefinition",
-  "metadata": {
-    "name": "sensors.argoproj.io"
-  },
-  "spec": {
-    "group": "argoproj.io",
-    "names": {
-      "kind": "Sensor",
-      "listKind": "SensorList",
-      "plural": "sensors",
-      "singular": "sensor"
-    },
-    "scope": "Namespaced",
-    "version": "v1alpha1"
-  }
-}
-{{- end}}
diff --git a/charts/argo-events/templates/apply-gateway-crd-job.yaml b/charts/argo-events/templates/apply-gateway-crd-job.yaml
deleted file mode 100644
index 1aca28ec..00000000
--- a/charts/argo-events/templates/apply-gateway-crd-job.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: {{ .Release.Name }}-apply-gateway-crd
-  annotations:
-    helm.sh/hook: pre-install
-    helm.sh/hook-delete-policy: hook-succeeded
-spec:
-  backoffLimit: 5
-  activeDeadlineSeconds: 100
-  template:
-    spec:
-      serviceAccountName: {{ .Values.crd.jobServiceAccount }}
-      containers:
-      - name: kubectl-apply
-        image: lachlanevenson/k8s-kubectl
-        command: ["/bin/sh"]
-        args: ["-c", 'echo ''{{- include "gateway-crd-json" .}}'' | kubectl apply -f -']
-      restartPolicy: Never
diff --git a/charts/argo-events/templates/apply-sensor-crd-job.yaml b/charts/argo-events/templates/apply-sensor-crd-job.yaml
deleted file mode 100644
index 8360d0fd..00000000
--- a/charts/argo-events/templates/apply-sensor-crd-job.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: {{ .Release.Name }}-apply-sensor-crd
-  annotations:
-    helm.sh/hook: pre-install
-    helm.sh/hook-delete-policy: hook-succeeded
-spec:
-  backoffLimit: 5
-  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
diff --git a/charts/argo-events/templates/gateway-crd.yaml b/charts/argo-events/templates/gateway-crd.yaml
new file mode 100644
index 00000000..9d41e273
--- /dev/null
+++ b/charts/argo-events/templates/gateway-crd.yaml
@@ -0,0 +1,13 @@
+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
+  scope: Namespaced
+  version: v1alpha1
diff --git a/charts/argo-events/templates/sensor-controller-clusterrole.yaml b/charts/argo-events/templates/sensor-controller-clusterrole.yaml
index 13230e1f..aa3d6eef 100644
--- a/charts/argo-events/templates/sensor-controller-clusterrole.yaml
+++ b/charts/argo-events/templates/sensor-controller-clusterrole.yaml
@@ -6,3 +6,16 @@ rules:
 - apiGroups: ["*"]
   resources: ["*"]
   verbs: ["*"]
+#
+# - apiGroups: ["argoproj.io"]
+#   resources: ["sensors"]
+#   verbs: ["get", "list", "watch", "update", "patch"]
+# - apiGroups: ["argoproj.io"]
+#   resources: ["gateways"]
+#   verbs: ["get", "list", "watch", "update", "patch"]
+# - apiGroups: ["argoproj.io"]
+#   resources: ["workflows"]
+#   verbs: ["get", "list", "watch", "update", "patch"]
+# - apiGroups: ["", "batch"]
+#   resources: ["configmaps", "secrets", "pods", "services", "jobs"]
+#   verbs: ["get", "watch", "list", "patch"]
diff --git a/charts/argo-events/templates/sensor-crd.yaml b/charts/argo-events/templates/sensor-crd.yaml
new file mode 100644
index 00000000..810b296b
--- /dev/null
+++ b/charts/argo-events/templates/sensor-crd.yaml
@@ -0,0 +1,13 @@
+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
+  scope: Namespaced
+  version: v1alpha1
diff --git a/charts/argo-events/values.yaml b/charts/argo-events/values.yaml
index e21a1aee..7264d72f 100644
--- a/charts/argo-events/values.yaml
+++ b/charts/argo-events/values.yaml
@@ -1,11 +1,6 @@
 registry: metalgearsolid
 imagePullPolicy: Always
 
-# Version of the Sensor CRD
-crd:
-  version: v1beta1
-  jobServiceAccount: default
-
 # If set to true then chart set controller instance id to release name
 useReleaseAsInstanceID: true
 instanceID: 1