chore(argo-events): Cleanup old CRD hooks (#778)

* Drop old CRDs with hooks containing helm hooks

Signed-off-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>

* Bump chart version

Signed-off-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>

* Drop empty newlines inside manifests

Signed-off-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>

* chore: trigger CI

Signed-off-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>

* chore: Ignore 'ci/' directory in final package

Signed-off-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>

* Apply changes from code review

Signed-off-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>

charts/argo-events/.helmignore

@@ -19,3 +19,4 @@
 .project
 .idea/
 *.tmproj
+ci/

charts/argo-events/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 description: A Helm chart to install Argo-Events in k8s Cluster
 name: argo-events
-version: 1.6.1
+version: 1.6.2
 keywords:
   - argo-events
   - sensor-controller

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.

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

@@ -1,5 +1,4 @@
 {{- if not .Values.singleNamespace }}
-
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
@@ -26,9 +25,9 @@ kind: ClusterRole
 metadata:
   name: argo-events-role
 rules:
-{{- if .Values.additionalServiceAccountRules }}
+  {{- with .Values.additionalServiceAccountRules }}
-{{ .Values.additionalServiceAccountRules | toYaml | nindent 2}}
+    {{- toYaml . | nindent 2 }}
-{{- end }}
+  {{- end }}
   - apiGroups:
       - argoproj.io
     verbs:

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

@@ -1,5 +1,4 @@
 {{- if .Values.singleNamespace }}
-
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
@@ -28,8 +27,8 @@ metadata:
   name: argo-events-role
   namespace: {{ .Release.Namespace }}
 rules:
-  {{- if .Values.additionalServiceAccountRules }}
+  {{- with .Values.additionalServiceAccountRules }}
-  {{ .Values.additionalServiceAccountRules | toYaml | nindent 2}}
+    {{- toYaml . | nindent 2 }}
   {{- end }}
   - apiGroups:
       - argoproj.io

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

@@ -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 }}

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

@@ -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 }}

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

@@ -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 }}

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