kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-06-14 10:30:59 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #5413 from crenshaw-dev/patch-1

Browse Source 
chore(docs): fix grammar error in comment
This commit is contained in:
Kubernetes Prow Robot
2024-06-30 11:45:02 -07:00
committed by GitHub
parent 5cfd3ab3e7 71546359b8
commit c1de0301f5
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
kyaml/fn/framework/processors.go
View File

@@ -176,6 +176,9 @@ func LoadFunctionConfig(src *yaml.RNode, api interface{}) error {
return schemaValidationError 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 { func combineErrors(schemaErr, customErr error) error {
combined := validationErrors.CompositeValidationError() combined := validationErrors.CompositeValidationError()
if compositeSchemaErr, ok := schemaErr.(*validationErrors.CompositeError); ok { if compositeSchemaErr, ok := schemaErr.(*validationErrors.CompositeError); ok {
@@ -227,7 +230,7 @@ type TemplateProcessor struct {
PatchTemplates []PatchTemplate PatchTemplates []PatchTemplate
// MergeResources, if set to true, will cause the resources in ResourceList.items to be // 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 MergeResources bool
// PreProcessFilters provides a hook to manipulate the ResourceList's items or config after // PreProcessFilters provides a hook to manipulate the ResourceList's items or config after