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

error wraps for linter

Browse Source
This commit is contained in:
Agustina Barbetta
2022-09-23 18:30:00 -03:00
parent 344b257c1f
commit 2b9ef61f88
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
api/internal/plugins/builtinconfig/transformerconfig.go
View File

@@ -7,6 +7,7 @@ import (
"log" "log"
"sort" "sort"
"github.com/pkg/errors"
"sigs.k8s.io/kustomize/api/ifc" "sigs.k8s.io/kustomize/api/ifc"
"sigs.k8s.io/kustomize/api/konfig/builtinpluginconsts" "sigs.k8s.io/kustomize/api/konfig/builtinpluginconsts"
"sigs.k8s.io/kustomize/api/types" "sigs.k8s.io/kustomize/api/types"
@@ -110,44 +111,44 @@ func (t *TransformerConfig) Merge(input *TransformerConfig) (
merged = &TransformerConfig{} merged = &TransformerConfig{}
merged.NamePrefix, err = t.NamePrefix.MergeAll(input.NamePrefix) merged.NamePrefix, err = t.NamePrefix.MergeAll(input.NamePrefix)
if err != nil { if err != nil {
return nil, err return nil, errors.Wrap(err, "failed to merge NamePrefix fieldSpec")
} }
merged.NameSuffix, err = t.NameSuffix.MergeAll(input.NameSuffix) merged.NameSuffix, err = t.NameSuffix.MergeAll(input.NameSuffix)
if err != nil { if err != nil {
return nil, err return nil, errors.Wrap(err, "failed to merge NameSuffix fieldSpec")
} }
merged.NameSpace, err = t.NameSpace.MergeAll(input.NameSpace) merged.NameSpace, err = t.NameSpace.MergeAll(input.NameSpace)
if err != nil { if err != nil {
return nil, err return nil, errors.Wrap(err, "failed to merge NameSpace fieldSpec")
} }
merged.CommonAnnotations, err = t.CommonAnnotations.MergeAll( merged.CommonAnnotations, err = t.CommonAnnotations.MergeAll(
input.CommonAnnotations) input.CommonAnnotations)
if err != nil { if err != nil {
return nil, err return nil, errors.Wrap(err, "failed to merge CommonAnnotations fieldSpec")
} }
merged.CommonLabels, err = t.CommonLabels.MergeAll(input.CommonLabels) merged.CommonLabels, err = t.CommonLabels.MergeAll(input.CommonLabels)
if err != nil { if err != nil {
return nil, err return nil, errors.Wrap(err, "failed to merge CommonLabels fieldSpec")
} }
merged.TemplateLabels, err = t.TemplateLabels.MergeAll(input.TemplateLabels) merged.TemplateLabels, err = t.TemplateLabels.MergeAll(input.TemplateLabels)
if err != nil { if err != nil {
return nil, err return nil, errors.Wrap(err, "failed to merge TemplateLabels fieldSpec")
} }
merged.VarReference, err = t.VarReference.MergeAll(input.VarReference) merged.VarReference, err = t.VarReference.MergeAll(input.VarReference)
if err != nil { if err != nil {
return nil, err return nil, errors.Wrap(err, "failed to merge VarReference fieldSpec")
} }
merged.NameReference, err = t.NameReference.mergeAll(input.NameReference) merged.NameReference, err = t.NameReference.mergeAll(input.NameReference)
if err != nil { if err != nil {
return nil, err return nil, errors.Wrap(err, "failed to merge NameReference fieldSpec")
} }
merged.Images, err = t.Images.MergeAll(input.Images) merged.Images, err = t.Images.MergeAll(input.Images)
if err != nil { if err != nil {
return nil, err return nil, errors.Wrap(err, "failed to merge Images fieldSpec")
} }
merged.Replicas, err = t.Replicas.MergeAll(input.Replicas) merged.Replicas, err = t.Replicas.MergeAll(input.Replicas)
if err != nil { if err != nil {
return nil, err return nil, errors.Wrap(err, "failed to merge Replicas fieldSpec")
} }
merged.sortFields() merged.sortFields()
return merged, nil return merged, nil