fix: Helm v3 CRD are not deployed

test/e2e/helm_test.go

@@ -290,3 +290,13 @@ func testHelmWithDependencies(t *testing.T, chartPath string, legacyRepo bool) {
  Then().
  Expect(SyncStatusIs(SyncStatusCodeSynced))
 }
+
+func TestHelm3CRD(t *testing.T) {
+ Given(t).
+ Path("helm3-crd").
+ When().
+ Create().
+ Sync().
+ Then().
+ Expect(SyncStatusIs(SyncStatusCodeSynced))
+}

test/e2e/testdata/helm3-crd/Chart.yaml

@@ -0,0 +1,6 @@
+apiVersion: v2
+name: argocd-helm3-crd
+description: A Helm chart for Kubernetes
+type: application
+version: 0.1.0
+appVersion: 1.16.0

test/e2e/testdata/helm3-crd/crds/crd.yaml

@@ -0,0 +1,14 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+ name: crontabs.stable.example.com
+spec:
+ group: stable.example.com
+ version: v1
+ scope: Namespaced
+ names:
+ plural: crontabs
+ singular: crontab
+ kind: CronTab
+ shortNames:
+ - ct

test/e2e/testdata/helm3-crd/templates/config-map.yaml

@@ -0,0 +1,6 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: my-map
+data:
+ foo: bar

util/helm/cmd.go

@@ -221,6 +221,9 @@ func (c *Cmd) template(chartPath string, opts *TemplateOpts) (string, error) {
  for _, v := range opts.APIVersions {
  args = append(args, "--api-versions", v)
  }
+ if c.HelmVer.additionalTempalteArgs != nil {
+ args = append(args, c.HelmVer.additionalTempalteArgs...)
+ }
 
  return c.run(args...)
 }

util/helm/helmver.go

@@ -29,6 +29,7 @@ var (
  pullCommand: "pull",
  initSupported: false,
  getPostTemplateCallback: cleanupChartLockFile,
+ additionalTempalteArgs: []string{"--include-crds"},
  }
 )
 
@@ -82,4 +83,5 @@ type HelmVer struct {
  pullCommand string
  kubeVersionSupported bool
  getPostTemplateCallback func(chartPath string) (func(), error)
+ additionalTempalteArgs []string
 }