From 15315b0dd6d1534eaee8524a887889605f452f03 Mon Sep 17 00:00:00 2001
From: Andrew Suderman <andrew@sudermanjr.com>
Date: Wed, 26 Feb 2020 13:34:03 -0700
Subject: [PATCH] Updating argo chart for v2.5

---
 charts/argo/Chart.yaml                      |  4 ++--
 charts/argo/crds/cronworkflow-crd.yaml      | 14 ++++++++++++++
 charts/argo/crds/workflow-crd.yaml          | 13 ++++++++++---
 charts/argo/crds/workflow-template-crd.yaml |  3 ---
 charts/argo/values.yaml                     |  5 ++++-
 5 files changed, 30 insertions(+), 9 deletions(-)
 create mode 100644 charts/argo/crds/cronworkflow-crd.yaml

diff --git a/charts/argo/Chart.yaml b/charts/argo/Chart.yaml
index 27b2d622..344c3c3a 100644
--- a/charts/argo/Chart.yaml
+++ b/charts/argo/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v1
-appVersion: "v2.4.3"
+appVersion: "v2.5.2"
 description: A Helm chart for Argo Workflows
 name: argo
-version: 0.6.8
+version: 0.7.0
 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/crds/cronworkflow-crd.yaml b/charts/argo/crds/cronworkflow-crd.yaml
new file mode 100644
index 00000000..5c254943
--- /dev/null
+++ b/charts/argo/crds/cronworkflow-crd.yaml
@@ -0,0 +1,14 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: cronworkflows.argoproj.io
+spec:
+  group: argoproj.io
+  version: v1alpha1
+  scope: Namespaced
+  names:
+    kind: CronWorkflow
+    plural: cronworkflows
+    shortNames:
+      - cronwf
+      - cwf
diff --git a/charts/argo/crds/workflow-crd.yaml b/charts/argo/crds/workflow-crd.yaml
index 64a77d7f..5cac1f27 100644
--- a/charts/argo/crds/workflow-crd.yaml
+++ b/charts/argo/crds/workflow-crd.yaml
@@ -2,10 +2,17 @@ apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   name: workflows.argoproj.io
-  annotations:
-    helm.sh/hook: crd-install
-    helm.sh/hook-delete-policy: before-hook-creation
 spec:
+  additionalPrinterColumns:
+  - JSONPath: .status.phase
+    description: Status of the workflow
+    name: Status
+    type: string
+  - JSONPath: .status.startedAt
+    description: When the workflow was started
+    name: Age
+    format: date-time
+    type: date
   group: argoproj.io
   version: v1alpha1
   scope: Namespaced
diff --git a/charts/argo/crds/workflow-template-crd.yaml b/charts/argo/crds/workflow-template-crd.yaml
index 11d008db..ec9c6d84 100644
--- a/charts/argo/crds/workflow-template-crd.yaml
+++ b/charts/argo/crds/workflow-template-crd.yaml
@@ -2,9 +2,6 @@ apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   name: workflowtemplates.argoproj.io
-  annotations:
-    helm.sh/hook: crd-install
-    helm.sh/hook-delete-policy: before-hook-creation
 spec:
   group: argoproj.io
   version: v1alpha1
diff --git a/charts/argo/values.yaml b/charts/argo/values.yaml
index c41025b7..59653770 100644
--- a/charts/argo/values.yaml
+++ b/charts/argo/values.yaml
@@ -4,9 +4,12 @@ images:
   ui: argoui
   executor: argoexec
   pullPolicy: Always
-  tag: v2.4.3
+  tag: v2.5.2
 
 crdVersion: v1alpha1
+
+# Note: For Helm3 this should be set to False
+# the crds/ folder contains the necessary crds and will install them
 installCRD: true
 
 init: