diff --git a/kyaml/fn/framework/processors.go b/kyaml/fn/framework/processors.go index 7d2a9b4c9c..1b390b2695 100644 --- a/kyaml/fn/framework/processors.go +++ b/kyaml/fn/framework/processors.go @@ -176,6 +176,9 @@ func LoadFunctionConfig(src *yaml.RNode, api interface{}) error { return schemaValidationError } +// combineErrors produces a CompositeValidationError for the given schemaErr and givenErr. +// If either is already a CompsiteError, its constituent errors become part of the new +// composite error. If both given errors are nil, this function returns nil. func combineErrors(schemaErr, customErr error) error { combined := validationErrors.CompositeValidationError() if compositeSchemaErr, ok := schemaErr.(*validationErrors.CompositeError); ok { @@ -227,7 +230,7 @@ type TemplateProcessor struct { PatchTemplates []PatchTemplate // MergeResources, if set to true, will cause the resources in ResourceList.items to be - // will be applied as patches on any matching resources generated by ResourceTemplates. + // applied as patches on any matching resources generated by ResourceTemplates. MergeResources bool // PreProcessFilters provides a hook to manipulate the ResourceList's items or config after