Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(docs): fix grammar error in comment #5413

Merged
merged 2 commits into from
Jun 30, 2024
Merged

chore(docs): fix grammar error in comment #5413

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
234ab80
chore(docs): fix grammar error in comment
crenshaw-dev Oct 23, 2023
7154635
Add a comment
crenshaw-dev Oct 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion kyaml/fn/framework/processors.go
View file
Open in desktop
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
Loading