From 7566853d2c43113399289ab6f69e08b104a6ba80 Mon Sep 17 00:00:00 2001
From: Dan Moran <danmoran@broadinstitute.org>
Date: Thu, 26 Dec 2019 16:12:52 -0500
Subject: [PATCH] Add Helm3-compatible CRDs directory.

---
 charts/argo/Chart.yaml                      |  2 +-
 charts/argo/README.md                       |  6 ++++++
 charts/argo/crds/workflow-crd.yaml          | 13 +++++++++++++
 charts/argo/crds/workflow-template-crd.yaml | 13 +++++++++++++
 4 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 charts/argo/crds/workflow-crd.yaml
 create mode 100644 charts/argo/crds/workflow-template-crd.yaml

diff --git a/charts/argo/Chart.yaml b/charts/argo/Chart.yaml
index 694a9c9d..6d985fbf 100644
--- a/charts/argo/Chart.yaml
+++ b/charts/argo/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "v2.4.3"
 description: A Helm chart for Argo Workflows
 name: argo
-version: 0.6.5
+version: 0.6.6
 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
 home: https://github.com/argoproj/argo-helm
 maintainers:
diff --git a/charts/argo/README.md b/charts/argo/README.md
index 348a0e0a..daf7ddca 100644
--- a/charts/argo/README.md
+++ b/charts/argo/README.md
@@ -12,6 +12,12 @@ A few options are:
 - Manually create a ServiceAccount in the Namespace which your release will be deployed w/ appropriate bindings to perform this action and set the `init.serviceAccount` attribute
 - Augment the `default` ServiceAccount permissions in the Namespace in which your Release is deployed to have the appropriate permissions
 
+### Helm v3 Compatability
+
+Requires chart version 0.6.6 or newer.
+
+Helm v3 has removed the `install-crds` hook so CRDs are now populated by files in the [crds](./crds) directory. Users of Helm v3 should set the `installCRDs` value to `false` to avoid warnings about nonexistant webhooks.
+
 ## Usage Notes:
 This chart defaults to setting the `controller.instanceID.enabled` to `false` now, which means the deployed controller will act upon any workflow deployed to the cluster.  If you would like to limit the behavior and deploy multiple workflow controllers, please use the `controller.instanceID.enabled` attribute along with one of it's configuration options to set the `instanceID` of the workflow controller to be properly scoped for your needs.
 
diff --git a/charts/argo/crds/workflow-crd.yaml b/charts/argo/crds/workflow-crd.yaml
new file mode 100644
index 00000000..b875a3df
--- /dev/null
+++ b/charts/argo/crds/workflow-crd.yaml
@@ -0,0 +1,13 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: workflows.argoproj.io
+spec:
+  group: argoproj.io
+  version: v1alpha1
+  scope: Namespaced
+  names:
+    kind: Workflow
+    plural: workflows
+    shortNames:
+    - wf
diff --git a/charts/argo/crds/workflow-template-crd.yaml b/charts/argo/crds/workflow-template-crd.yaml
new file mode 100644
index 00000000..ec9c6d84
--- /dev/null
+++ b/charts/argo/crds/workflow-template-crd.yaml
@@ -0,0 +1,13 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: workflowtemplates.argoproj.io
+spec:
+  group: argoproj.io
+  version: v1alpha1
+  scope: Namespaced
+  names:
+    kind: WorkflowTemplate
+    plural: workflowtemplates
+    shortNames:
+    - wftmpl