From 5070399ad5056e31caab6ab27ff2ea2227ace781 Mon Sep 17 00:00:00 2001
From: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>
Date: Mon, 31 May 2021 23:56:07 +0200
Subject: [PATCH] Drop old CRDs with hooks containing helm hooks

Signed-off-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>
---
 charts/argo-events/README.md                  |  2 +-
 .../argo-events/templates/eventbus-crd.yaml   | 44 ------------------
 .../templates/eventsource-crd.yaml            | 44 ------------------
 charts/argo-events/templates/sensor-crd.yaml  | 45 -------------------
 charts/argo-events/values.yaml                |  3 --
 5 files changed, 1 insertion(+), 137 deletions(-)
 delete mode 100644 charts/argo-events/templates/eventbus-crd.yaml
 delete mode 100644 charts/argo-events/templates/eventsource-crd.yaml
 delete mode 100644 charts/argo-events/templates/sensor-crd.yaml

diff --git a/charts/argo-events/README.md b/charts/argo-events/README.md
index 3c375c3a..2bece9b9 100644
--- a/charts/argo-events/README.md
+++ b/charts/argo-events/README.md
@@ -15,6 +15,6 @@ This is a **community maintained** chart. It installs the [argo-events](https://
 
 ## Notes on CRD Installation
 
-Some users would prefer to install the CRDs _outside_ of the chart. You can disable the CRD installation of this chart by using `--set installCRD=false` when installing the chart.
+Some users would prefer to install the CRDs _outside_ of the chart. You can disable the CRD installation of this chart by using `--skip-crds` when installing the chart.
 
 You can install the CRDs manually from `crds` folder.
\ No newline at end of file
diff --git a/charts/argo-events/templates/eventbus-crd.yaml b/charts/argo-events/templates/eventbus-crd.yaml
deleted file mode 100644
index 4a67294e..00000000
--- a/charts/argo-events/templates/eventbus-crd.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
-{{- if .Values.installCRD }}
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
-  name: eventbus.argoproj.io
-  annotations:
-    helm.sh/hook: crd-install
-    helm.sh/hook-delete-policy: before-hook-creation
-spec:
-  group: argoproj.io
-  names:
-    kind: EventBus
-    listKind: EventBusList
-    plural: eventbus
-    shortNames:
-      - eb
-    singular: eventbus
-  scope: Namespaced
-  versions:
-    - name: v1alpha1
-      served: true
-      storage: true
-      schema:
-        openAPIV3Schema:
-          properties:
-            apiVersion:
-              type: string
-            kind:
-              type: string
-            metadata:
-              type: object
-            spec:
-              type: object
-              x-kubernetes-preserve-unknown-fields: true
-            status:
-              type: object
-              x-kubernetes-preserve-unknown-fields: true
-          required:
-          - metadata
-          - spec
-          type: object
-      subresources:
-        status: {}
-{{- end }}
diff --git a/charts/argo-events/templates/eventsource-crd.yaml b/charts/argo-events/templates/eventsource-crd.yaml
deleted file mode 100644
index 5c6a0b6b..00000000
--- a/charts/argo-events/templates/eventsource-crd.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
-{{- if .Values.installCRD }}
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
-  name: eventsources.argoproj.io
-  annotations:
-    helm.sh/hook: crd-install
-    helm.sh/hook-delete-policy: before-hook-creation
-spec:
-  group: argoproj.io
-  scope: Namespaced
-  names:
-    kind: EventSource
-    plural: eventsources
-    singular: eventsource
-    listKind: EventSourceList
-    shortNames:
-      - es
-  versions:
-    - name: v1alpha1
-      served: true
-      storage: true
-      schema:
-        openAPIV3Schema:
-          properties:
-            apiVersion:
-              type: string
-            kind:
-              type: string
-            metadata:
-              type: object
-            spec:
-              type: object
-              x-kubernetes-preserve-unknown-fields: true
-            status:
-              type: object
-              x-kubernetes-preserve-unknown-fields: true
-          required:
-          - metadata
-          - spec
-          type: object
-      subresources:
-        status: {}
-{{- end }}
diff --git a/charts/argo-events/templates/sensor-crd.yaml b/charts/argo-events/templates/sensor-crd.yaml
deleted file mode 100644
index d121019e..00000000
--- a/charts/argo-events/templates/sensor-crd.yaml
+++ /dev/null
@@ -1,45 +0,0 @@
-{{- if .Values.installCRD }}
-# Define a "sensor" custom resource definition
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
-  name: sensors.argoproj.io
-  annotations:
-    helm.sh/hook: crd-install
-    helm.sh/hook-delete-policy: before-hook-creation
-spec:
-  group: argoproj.io
-  names:
-    kind: Sensor
-    listKind: SensorList
-    plural: sensors
-    singular: sensor
-    shortNames:
-      - sn
-  scope: Namespaced
-  versions:
-    - name: v1alpha1
-      served: true
-      storage: true
-      schema:
-        openAPIV3Schema:
-          properties:
-            apiVersion:
-              type: string
-            kind:
-              type: string
-            metadata:
-              type: object
-            spec:
-              type: object
-              x-kubernetes-preserve-unknown-fields: true
-            status:
-              type: object
-              x-kubernetes-preserve-unknown-fields: true
-          required:
-          - metadata
-          - spec
-          type: object
-      subresources:
-        status: {}
-{{- end }}
diff --git a/charts/argo-events/values.yaml b/charts/argo-events/values.yaml
index 55dd6643..11827406 100644
--- a/charts/argo-events/values.yaml
+++ b/charts/argo-events/values.yaml
@@ -8,9 +8,6 @@ imagePullPolicy: Always
 imagePullSecrets: []
 # - name: argo-pull-secret
 
-# If set to false, skip installing the CRDs. Requires user to have them installed prior to helm chart installation.
-installCRD: true
-
 # ServiceAccount to use for running controller.
 serviceAccount: argo-events-sa