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>
argoproj · Jun 7, 2021 · 01c78a8 · 01c78a8
1 parent be8f33c
commit 01c78a8
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 145 deletions.
diff --git a/charts/argo-events/.helmignore b/charts/argo-events/.helmignore
@@ -19,3 +19,4 @@
 .project
 .idea/
 *.tmproj
+ci/
diff --git a/charts/argo-events/Chart.yaml b/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

diff --git 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.
diff --git a/charts/argo-events/templates/argo-events-cluster-roles.yaml b/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 }}
-{{ .Values.additionalServiceAccountRules | toYaml | nindent 2}}
-{{- end }}
+  {{- with .Values.additionalServiceAccountRules }}
+    {{- toYaml . | nindent 2 }}
+  {{- end }}
   - apiGroups:
       - argoproj.io
     verbs:

diff --git a/charts/argo-events/templates/argo-events-roles.yaml b/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 }}
-  {{ .Values.additionalServiceAccountRules | toYaml | nindent 2}}
+  {{- with .Values.additionalServiceAccountRules }}
+    {{- toYaml . | nindent 2 }}
   {{- end }}
   - apiGroups:
       - argoproj.io

diff --git a/charts/argo-events/templates/eventbus-crd.yaml b/charts/argo-events/templates/eventbus-crd.yaml
diff --git a/charts/argo-events/templates/eventsource-crd.yaml b/charts/argo-events/templates/eventsource-crd.yaml
diff --git a/charts/argo-events/templates/sensor-crd.yaml b/charts/argo-events/templates/sensor-crd.yaml
diff --git 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