fix(argo-workflows): move crds folder into templates folder (#1472)

Fixes #1430 #1468

Due to multiple instances where new/changed CRDs for argo-workflows do not
get installed/updated I believe it is time to move the crds folder into
the templates folder like our other helm charts.

I'm aware helm 3 is supposed to handle the crds folder but it seems there
are a few known issues currently [here](https://github.com/hashicorp/terraform-provider-helm/issues/944), [here](https://github.com/helm/helm/issues/11321) and [here](https://github.com/helm/helm/pull/11330) that show that may still
need some work.

Signed-off-by: jmeridth <jmeridth@gmail.com>

Signed-off-by: jmeridth <jmeridth@gmail.com>

charts/argo-workflows/Chart.yaml

@@ -3,7 +3,7 @@ appVersion: v3.4.0
 name: argo-workflows
 description: A Helm chart for Argo Workflows
 type: application
-version: 0.18.0
+version: 0.19.0
 icon: https://raw.githubusercontent.com/argoproj/argo-workflows/master/docs/assets/argo.png
 home: https://github.com/argoproj/argo-helm
 sources:
@@ -13,5 +13,4 @@ maintainers:
     url: https://argoproj.github.io/
 annotations:
   artifacthub.io/changes: |
-    - "[Changed]: Upgrade ArgoWorkflows to v3.4.0"
-    - "[Fixed]: Remove unsupported attributes on metricsConfig and telemetryConfig, from workflow-controller-configmap"
+    - "[Fixed]: Move crds folder into templates folder and add conditional flags for install and keep"

charts/argo-workflows/README.md

@@ -41,6 +41,9 @@ Fields to note:
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
+| crds.annotations | object | `{}` | Annotations to be added to all CRDs |
+| crds.install | bool | `true` | Install and upgrade CRDs |
+| crds.keep | bool | `true` | Keep CRDs on chart uninstall |
 | createAggregateRoles | bool | `true` | Create clusterroles that extend existing clusterroles to interact with argo-cd crds |
 | fullnameOverride | string | `nil` | String to fully override "argo-workflows.fullname" template |
 | images.pullPolicy | string | `"Always"` | imagePullPolicy to apply to all containers |

charts/argo-workflows/ci/default-values.yaml

@@ -1 +1,3 @@
 # Test with default values
+crds:
+  keep: false

charts/argo-workflows/ci/enable-ingress-values.yaml

@@ -1,3 +1,6 @@
+crds:
+  keep: false
+
 server:
   ingress:
     enabled: true

charts/argo-workflows/ci/enable-metrics-values.yaml

@@ -1,3 +1,6 @@
+crds:
+  keep: false
+
 controller:
   serviceMonitor:
     enabled: false

charts/argo-workflows/ci/enable-rbac-values.yaml

@@ -1,3 +1,6 @@
+crds:
+  keep: false
+
 workflow:
   serviceAccount:
     create: true # Specifies whether a service account should be created

charts/argo-workflows/templates/crds/argoproj.io_clusterworkflowtemplates.yaml

@@ -1,7 +1,15 @@
+{{- if .Values.crds.install }}
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: clusterworkflowtemplates.argoproj.io
+  annotations:
+    {{- if .Values.crds.keep }}
+    "helm.sh/resource-policy": keep
+    {{- end }}
+    {{- with .Values.crds.annotations }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
 spec:
   group: argoproj.io
   names:
@@ -34,3 +42,4 @@ spec:
         type: object
     served: true
     storage: true
+{{- end }}

charts/argo-workflows/templates/crds/argoproj.io_cronworkflows.yaml

@@ -1,7 +1,15 @@
+{{- if .Values.crds.install }}
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: cronworkflows.argoproj.io
+  annotations:
+    {{- if .Values.crds.keep }}
+    "helm.sh/resource-policy": keep
+    {{- end }}
+    {{- with .Values.crds.annotations }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
 spec:
   group: argoproj.io
   names:
@@ -38,3 +46,4 @@ spec:
         type: object
     served: true
     storage: true
+{{- end }}

charts/argo-workflows/templates/crds/argoproj.io_workflowartifactgctasks.yaml

@@ -1,7 +1,15 @@
+{{- if .Values.crds.install }}
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: workflowartifactgctasks.argoproj.io
+  annotations:
+    {{- if .Values.crds.keep }}
+    "helm.sh/resource-policy": keep
+    {{- end }}
+    {{- with .Values.crds.annotations }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
 spec:
   group: argoproj.io
   names:
@@ -39,3 +47,4 @@ spec:
       storage: true
       subresources:
         status: {}
+{{- end }}

charts/argo-workflows/templates/crds/argoproj.io_workfloweventbindings.yaml

@@ -1,7 +1,15 @@
+{{- if .Values.crds.install }}
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: workfloweventbindings.argoproj.io
+  annotations:
+    {{- if .Values.crds.keep }}
+    "helm.sh/resource-policy": keep
+    {{- end }}
+    {{- with .Values.crds.annotations }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
 spec:
   group: argoproj.io
   names:
@@ -33,3 +41,4 @@ spec:
         type: object
     served: true
     storage: true
+{{- end }}

charts/argo-workflows/templates/crds/argoproj.io_workflows.yaml

@@ -1,7 +1,15 @@
+{{- if .Values.crds.install }}
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: workflows.argoproj.io
+  annotations:
+    {{- if .Values.crds.keep }}
+    "helm.sh/resource-policy": keep
+    {{- end }}
+    {{- with .Values.crds.annotations }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
 spec:
   group: argoproj.io
   names:
@@ -53,3 +61,4 @@ spec:
     served: true
     storage: true
     subresources: {}
+{{- end }}

charts/argo-workflows/templates/crds/argoproj.io_workflowtaskresults.yaml

@@ -1,7 +1,15 @@
+{{- if .Values.crds.install }}
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: workflowtaskresults.argoproj.io
+  annotations:
+    {{- if .Values.crds.keep }}
+    "helm.sh/resource-policy": keep
+    {{- end }}
+    {{- with .Values.crds.annotations }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
 spec:
   group: argoproj.io
   names:
@@ -582,3 +590,4 @@ spec:
         type: object
     served: true
     storage: true
+{{- end }}

charts/argo-workflows/templates/crds/argoproj.io_workflowtasksets.yaml

@@ -1,7 +1,15 @@
+{{- if .Values.crds.install }}
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: workflowtasksets.argoproj.io
+  annotations:
+    {{- if .Values.crds.keep }}
+    "helm.sh/resource-policy": keep
+    {{- end }}
+    {{- with .Values.crds.annotations }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
 spec:
   group: argoproj.io
   names:
@@ -39,3 +47,4 @@ spec:
     storage: true
     subresources:
       status: {}
+{{- end }}

charts/argo-workflows/templates/crds/argoproj.io_workflowtemplates.yaml

@@ -1,7 +1,15 @@
+{{- if .Values.crds.install }}
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: workflowtemplates.argoproj.io
+  annotations:
+    {{- if .Values.crds.keep }}
+    "helm.sh/resource-policy": keep
+    {{- end }}
+    {{- with .Values.crds.annotations }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
 spec:
   group: argoproj.io
   names:
@@ -33,3 +41,4 @@ spec:
         type: object
     served: true
     storage: true
+{{- end }}

charts/argo-workflows/values.yaml

@@ -7,6 +7,15 @@ images:
   pullSecrets: []
   # - name: argo-pull-secret
 
+## Custom resource configuration
+crds:
+  # -- Install and upgrade CRDs
+  install: true
+  # -- Keep CRDs on chart uninstall
+  keep: true
+  # -- Annotations to be added to all CRDs
+  annotations: {}
+
 # -- Create clusterroles that extend existing clusterroles to interact with argo-cd crds
 ## Ref: https://kubernetes.io/docs/reference/access-authn-authz/rbac/#aggregated-clusterroles
 createAggregateRoles: true