Skip to content

Commit

Permalink
Merge pull request #5413 from crenshaw-dev/patch-1
Browse files Browse the repository at this point in the history
chore(docs): fix grammar error in comment
  • Loading branch information
k8s-ci-robot committed Jun 30, 2024
2 parents 5cfd3ab + 7154635 commit c1de030
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion kyaml/fn/framework/processors.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit c1de030

Please sign in to comment.