Skip to content

Commit c1de030

Browse files
authored
Merge pull request #5413 from crenshaw-dev/patch-1
chore(docs): fix grammar error in comment
2 parents 5cfd3ab + 7154635 commit c1de030

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

kyaml/fn/framework/processors.go

+4-1
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,9 @@ func LoadFunctionConfig(src *yaml.RNode, api interface{}) error {
176176
return schemaValidationError
177177
}
178178

179+
// combineErrors produces a CompositeValidationError for the given schemaErr and givenErr.
180+
// If either is already a CompsiteError, its constituent errors become part of the new
181+
// composite error. If both given errors are nil, this function returns nil.
179182
func combineErrors(schemaErr, customErr error) error {
180183
combined := validationErrors.CompositeValidationError()
181184
if compositeSchemaErr, ok := schemaErr.(*validationErrors.CompositeError); ok {
@@ -227,7 +230,7 @@ type TemplateProcessor struct {
227230
PatchTemplates []PatchTemplate
228231

229232
// MergeResources, if set to true, will cause the resources in ResourceList.items to be
230-
// will be applied as patches on any matching resources generated by ResourceTemplates.
233+
// applied as patches on any matching resources generated by ResourceTemplates.
231234
MergeResources bool
232235

233236
// PreProcessFilters provides a hook to manipulate the ResourceList's items or config after

0 commit comments

Comments
 (0)