Merge pull request #261 from fluxcd/helm-install-skip-crd-fix

Give CRD policy precedence over skipCRDs field
fluxcd · May 10, 2021 · e79781e · e79781e
2 parents bc12d84 + d832b35
commit e79781e
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/internal/runner/runner.go b/internal/runner/runner.go
@@ -109,18 +109,14 @@ func (r *Runner) Install(hr v2.HelmRelease, chart *chart.Chart, values chartutil
 	install.DisableHooks = hr.Spec.GetInstall().DisableHooks
 	install.DisableOpenAPIValidation = hr.Spec.GetInstall().DisableOpenAPIValidation
 	install.Replace = hr.Spec.GetInstall().Replace
-	var legacyCRDsPolicy v2.CRDsPolicy = v2.Create
+	var legacyCRDsPolicy = v2.Create
 	if hr.Spec.GetInstall().SkipCRDs {
 		legacyCRDsPolicy = v2.Skip
 	}
 	cRDsPolicy, err := r.validateCRDsPolicy(hr.Spec.GetInstall().CRDs, legacyCRDsPolicy)
 	if err != nil {
 		return nil, wrapActionErr(r.logBuffer, err)
 	}
-	if (cRDsPolicy != v2.Skip && legacyCRDsPolicy == v2.Skip) || (cRDsPolicy == v2.Skip && legacyCRDsPolicy != v2.Skip) {
-		return nil, wrapActionErr(r.logBuffer,
-			fmt.Errorf("Contradicting CRDs installation settings, skipCRDs is set to %t and crds is set to %s", hr.Spec.GetInstall().SkipCRDs, cRDsPolicy))
-	}
 	if cRDsPolicy == v2.Skip || cRDsPolicy == v2.CreateReplace {
 		install.SkipCRDs = true
 	}