update comments / doc since crdOptions and upstreamOptions are no longer mutually exclusive

Author: joshmeranda

pkg/options/additionalchart.go

@@ -4,9 +4,9 @@ package options
 type AdditionalChartOptions struct {
 	// WorkingDir is the working directory for this chart within packages/<package-name>
 	WorkingDir string `yaml:"workingDir"`
-	// UpstreamOptions is any options provided on how to get this chart from upstream. It is mutually exclusive with CRDChartOptions
+	// UpstreamOptions is any options provided on how to get this chart from upstream.
 	UpstreamOptions *UpstreamOptions `yaml:"upstreamOptions,omitempty"`
-	// CRDChartOptions is any options provided on how to generate a CRD chart. It is mutually exclusive with UpstreamOptions
+	// CRDChartOptions is any options provided on how to generate a CRD chart.
 	CRDChartOptions *CRDChartOptions `yaml:"crdOptions,omitempty"`
 	// IgnoreDependencies drops certain dependencies from the list that is parsed from upstream
 	IgnoreDependencies []string `yaml:"ignoreDependencies"`

templates/template/docs/packages.md

@@ -16,12 +16,10 @@ additionalCharts:
 # These contain other charts that you would like to package alongside this chart
 - workingDir: # same as above
   upstreamOptions:
-    # Mutually exclusive with crdOptions
     url: # same as above
     subdirectory: # optional, same as above
     commit: # optional, same as above
   crdOptions:
-    # Mutually exclusive with upstreamOptions
     templateDirectory: # A directory within packages/<package>/template that will contain a template for your CRD chart
     crdDirectory: # Where to place your CRDs within a CRD chart (e.g. crds for default charts)
     addCRDValidationToMainChart: # Whether to add additional validation to your main chart to check that the CRD chart is installed.