Merge e900f05a16 into 0199b748aa

pkg/action/install.go

@@ -259,14 +259,16 @@ func (i *Install) RunWithContext(ctx context.Context, chrt *chart.Chart, vals ma
 		interactWithRemote = true
 	}
 
-	// Pre-install anything in the crd/ directory. We do this before Helm
+	// Pre-install anything in the crds/ directory. We do this before Helm
 	// contacts the upstream server and builds the capabilities object.
-	if crds := chrt.CRDObjects(); !i.ClientOnly && !i.SkipCRDs && len(crds) > 0 {
+	if !i.ClientOnly && !i.SkipCRDs {
 		// On dry run, bail here
 		if i.isDryRun() {
 			i.cfg.Log("WARNING: This chart or one of its subcharts contains CRDs. Rendering may fail or contain inaccuracies.")
-		} else if err := i.installCRDs(crds); err != nil {
-			return nil, err
+		} else if crds := chrt.CRDObjects(); len(crds) > 0 {
+			if err := i.installCRDs(crds); err != nil {
+				return nil, err
+			}
 		}
 	}