diff --git a/api/builtins/AnnotationsTransformer.go b/api/builtins/AnnotationsTransformer.go index fefe5afa7..6cf7621e8 100644 --- a/api/builtins/AnnotationsTransformer.go +++ b/api/builtins/AnnotationsTransformer.go @@ -7,7 +7,6 @@ import ( "sigs.k8s.io/kustomize/api/filters/annotations" "sigs.k8s.io/kustomize/api/resmap" "sigs.k8s.io/kustomize/api/types" - "sigs.k8s.io/kustomize/kyaml/filtersutil" "sigs.k8s.io/yaml" ) @@ -26,10 +25,10 @@ func (p *AnnotationsTransformerPlugin) Config( func (p *AnnotationsTransformerPlugin) Transform(m resmap.ResMap) error { for _, r := range m.Resources() { - err := filtersutil.ApplyToJSON(annotations.Filter{ + err := r.ApplyFilter(annotations.Filter{ Annotations: p.Annotations, FsSlice: p.FieldSpecs, - }, r) + }) if err != nil { return err } diff --git a/api/builtins/ImageTagTransformer.go b/api/builtins/ImageTagTransformer.go index bab00819e..a9d633a7f 100644 --- a/api/builtins/ImageTagTransformer.go +++ b/api/builtins/ImageTagTransformer.go @@ -11,7 +11,6 @@ import ( "sigs.k8s.io/kustomize/api/filters/imagetag" "sigs.k8s.io/kustomize/api/resmap" "sigs.k8s.io/kustomize/api/types" - "sigs.k8s.io/kustomize/kyaml/filtersutil" "sigs.k8s.io/yaml" ) @@ -32,17 +31,17 @@ func (p *ImageTagTransformerPlugin) Config( func (p *ImageTagTransformerPlugin) Transform(m resmap.ResMap) error { for _, r := range m.Resources() { // traverse all fields at first - err := filtersutil.ApplyToJSON(imagetag.LegacyFilter{ + err := r.ApplyFilter(imagetag.LegacyFilter{ ImageTag: p.ImageTag, - }, r) + }) if err != nil { return err } // then use user specified field specs - err = filtersutil.ApplyToJSON(imagetag.Filter{ + err = r.ApplyFilter(imagetag.Filter{ ImageTag: p.ImageTag, FsSlice: p.FieldSpecs, - }, r) + }) if err != nil { return err } diff --git a/api/builtins/LabelTransformer.go b/api/builtins/LabelTransformer.go index 97e729dd2..bb8b4837e 100644 --- a/api/builtins/LabelTransformer.go +++ b/api/builtins/LabelTransformer.go @@ -7,7 +7,6 @@ import ( "sigs.k8s.io/kustomize/api/filters/labels" "sigs.k8s.io/kustomize/api/resmap" "sigs.k8s.io/kustomize/api/types" - "sigs.k8s.io/kustomize/kyaml/filtersutil" "sigs.k8s.io/yaml" ) @@ -26,10 +25,10 @@ func (p *LabelTransformerPlugin) Config( func (p *LabelTransformerPlugin) Transform(m resmap.ResMap) error { for _, r := range m.Resources() { - err := filtersutil.ApplyToJSON(labels.Filter{ + err := r.ApplyFilter(labels.Filter{ Labels: p.Labels, FsSlice: p.FieldSpecs, - }, r) + }) if err != nil { return err } diff --git a/api/builtins/NamespaceTransformer.go b/api/builtins/NamespaceTransformer.go index 8d7b226ee..9d996d118 100644 --- a/api/builtins/NamespaceTransformer.go +++ b/api/builtins/NamespaceTransformer.go @@ -9,7 +9,6 @@ import ( "sigs.k8s.io/kustomize/api/filters/namespace" "sigs.k8s.io/kustomize/api/resmap" "sigs.k8s.io/kustomize/api/types" - "sigs.k8s.io/kustomize/kyaml/filtersutil" "sigs.k8s.io/yaml" ) @@ -35,10 +34,10 @@ func (p *NamespaceTransformerPlugin) Transform(m resmap.ResMap) error { // Don't mutate empty objects? continue } - err := filtersutil.ApplyToJSON(namespace.Filter{ + err := r.ApplyFilter(namespace.Filter{ Namespace: p.Namespace, FsSlice: p.FieldSpecs, - }, r) + }) if err != nil { return err } diff --git a/api/builtins/PatchJson6902Transformer.go b/api/builtins/PatchJson6902Transformer.go index 2051c874a..dfe4db43b 100644 --- a/api/builtins/PatchJson6902Transformer.go +++ b/api/builtins/PatchJson6902Transformer.go @@ -12,7 +12,6 @@ import ( "sigs.k8s.io/kustomize/api/ifc" "sigs.k8s.io/kustomize/api/resmap" "sigs.k8s.io/kustomize/api/types" - "sigs.k8s.io/kustomize/kyaml/filtersutil" "sigs.k8s.io/yaml" ) @@ -79,9 +78,9 @@ func (p *PatchJson6902TransformerPlugin) Transform(m resmap.ResMap) error { return err } for _, res := range resources { - err = filtersutil.ApplyToJSON(patchjson6902.Filter{ + err = res.ApplyFilter(patchjson6902.Filter{ Patch: p.JsonOp, - }, res) + }) if err != nil { return err } diff --git a/api/builtins/PatchTransformer.go b/api/builtins/PatchTransformer.go index 62f1f4196..a485c44c6 100644 --- a/api/builtins/PatchTransformer.go +++ b/api/builtins/PatchTransformer.go @@ -12,7 +12,6 @@ import ( "sigs.k8s.io/kustomize/api/resmap" "sigs.k8s.io/kustomize/api/resource" "sigs.k8s.io/kustomize/api/types" - "sigs.k8s.io/kustomize/kyaml/filtersutil" "sigs.k8s.io/yaml" ) @@ -105,9 +104,9 @@ func (p *PatchTransformerPlugin) transformJson6902(m resmap.ResMap, patch jsonpa return err } for _, res := range resources { - err = filtersutil.ApplyToJSON(patchjson6902.Filter{ + err = res.ApplyFilter(patchjson6902.Filter{ Patch: p.Patch, - }, res) + }) if err != nil { return err } diff --git a/api/builtins/PrefixSuffixTransformer.go b/api/builtins/PrefixSuffixTransformer.go index 09de319d8..f43a03fda 100644 --- a/api/builtins/PrefixSuffixTransformer.go +++ b/api/builtins/PrefixSuffixTransformer.go @@ -10,7 +10,6 @@ import ( "sigs.k8s.io/kustomize/api/resid" "sigs.k8s.io/kustomize/api/resmap" "sigs.k8s.io/kustomize/api/types" - "sigs.k8s.io/kustomize/kyaml/filtersutil" "sigs.k8s.io/yaml" ) @@ -70,11 +69,11 @@ func (p *PrefixSuffixTransformerPlugin) Transform(m resmap.ResMap) error { r.AddNamePrefix(p.Prefix) r.AddNameSuffix(p.Suffix) } - err := filtersutil.ApplyToJSON(prefixsuffix.Filter{ + err := r.ApplyFilter(prefixsuffix.Filter{ Prefix: p.Prefix, Suffix: p.Suffix, FieldSpec: fs, - }, r) + }) if err != nil { return err } diff --git a/api/builtins/ReplicaCountTransformer.go b/api/builtins/ReplicaCountTransformer.go index 367402d97..47d21417d 100644 --- a/api/builtins/ReplicaCountTransformer.go +++ b/api/builtins/ReplicaCountTransformer.go @@ -7,8 +7,6 @@ import ( "fmt" "sigs.k8s.io/kustomize/api/filters/replicacount" - "sigs.k8s.io/kustomize/kyaml/filtersutil" - "sigs.k8s.io/kustomize/api/resid" "sigs.k8s.io/kustomize/api/resmap" "sigs.k8s.io/kustomize/api/types" @@ -42,10 +40,10 @@ func (p *ReplicaCountTransformerPlugin) Transform(m resmap.ResMap) error { // There are redundant checks in the filter // that we'll live with until resolution of // https://github.com/kubernetes-sigs/kustomize/issues/2506 - err := filtersutil.ApplyToJSON(replicacount.Filter{ + err := r.ApplyFilter(replicacount.Filter{ Replica: p.Replica, FieldSpec: fs, - }, r) + }) if err != nil { return err } diff --git a/api/builtins/ValueAddTransformer.go b/api/builtins/ValueAddTransformer.go index 769266f73..c2c460ab9 100644 --- a/api/builtins/ValueAddTransformer.go +++ b/api/builtins/ValueAddTransformer.go @@ -13,7 +13,6 @@ import ( "sigs.k8s.io/kustomize/api/resmap" "sigs.k8s.io/kustomize/api/resource" "sigs.k8s.io/kustomize/api/types" - "sigs.k8s.io/kustomize/kyaml/filtersutil" "sigs.k8s.io/yaml" ) @@ -119,15 +118,15 @@ func (p *ValueAddTransformerPlugin) Transform(m resmap.ResMap) (err error) { // TODO: consider t.NotSelector if implemented for _, res := range resources { if t.FieldPath == types.MetadataNamespacePath { - err = filtersutil.ApplyToJSON(namespace.Filter{ + err = res.ApplyFilter(namespace.Filter{ Namespace: p.Value, - }, res) + }) } else { - err = filtersutil.ApplyToJSON(valueadd.Filter{ + err = res.ApplyFilter(valueadd.Filter{ Value: p.Value, FieldPath: t.FieldPath, FilePathPosition: t.FilePathPosition, - }, res) + }) } if err != nil { return err diff --git a/api/internal/accumulator/namereferencetransformer.go b/api/internal/accumulator/namereferencetransformer.go index 59497312a..adb910a19 100644 --- a/api/internal/accumulator/namereferencetransformer.go +++ b/api/internal/accumulator/namereferencetransformer.go @@ -9,7 +9,6 @@ import ( "sigs.k8s.io/kustomize/api/filters/nameref" "sigs.k8s.io/kustomize/api/internal/plugins/builtinconfig" "sigs.k8s.io/kustomize/api/resmap" - "sigs.k8s.io/kustomize/kyaml/filtersutil" ) type nameReferenceTransformer struct { @@ -84,12 +83,12 @@ func (o *nameReferenceTransformer) Transform(m resmap.ResMap) error { if candidates == nil { candidates = m.SubsetThatCouldBeReferencedByResource(referrer) } - err := filtersutil.ApplyToJSON(nameref.Filter{ + err := referrer.ApplyFilter(nameref.Filter{ FieldSpec: fSpec, Referrer: referrer, Target: target.Gvk, ReferralCandidates: candidates, - }, referrer) + }) if err != nil { return err } diff --git a/api/internal/accumulator/refvartransformer.go b/api/internal/accumulator/refvartransformer.go index ae3667a70..405041b93 100644 --- a/api/internal/accumulator/refvartransformer.go +++ b/api/internal/accumulator/refvartransformer.go @@ -9,7 +9,6 @@ import ( "sigs.k8s.io/kustomize/api/filters/refvar" "sigs.k8s.io/kustomize/api/resmap" "sigs.k8s.io/kustomize/api/types" - "sigs.k8s.io/kustomize/kyaml/filtersutil" ) type refVarTransformer struct { @@ -50,10 +49,10 @@ func (rv *refVarTransformer) Transform(m resmap.ResMap) error { rv.replacementCounts, rv.varMap) for _, res := range m.Resources() { for _, fieldSpec := range rv.fieldSpecs { - err := filtersutil.ApplyToJSON(refvar.Filter{ + err := res.ApplyFilter(refvar.Filter{ MappingFunc: rv.mappingFunc, FieldSpec: fieldSpec, - }, res) + }) if err != nil { return err } diff --git a/api/internal/wrappy/wnode.go b/api/internal/wrappy/wnode.go index b00613936..26b94117d 100644 --- a/api/internal/wrappy/wnode.go +++ b/api/internal/wrappy/wnode.go @@ -43,6 +43,10 @@ func FromRNode(node *yaml.RNode) *WNode { return &WNode{node: node} } +func (wn *WNode) AsRNode() *yaml.RNode { + return wn.node +} + func (wn *WNode) demandMetaData(label string) yaml.ResourceMeta { meta, err := wn.node.GetMeta() if err != nil { diff --git a/api/resource/resource.go b/api/resource/resource.go index ae3729cd9..aa881ae16 100644 --- a/api/resource/resource.go +++ b/api/resource/resource.go @@ -13,6 +13,7 @@ import ( "sigs.k8s.io/kustomize/api/resid" "sigs.k8s.io/kustomize/api/types" "sigs.k8s.io/kustomize/kyaml/filtersutil" + "sigs.k8s.io/kustomize/kyaml/kio" "sigs.k8s.io/yaml" ) @@ -422,9 +423,9 @@ func (r *Resource) ApplySmPatch(patch *Resource) error { return err } n, ns := r.GetName(), r.GetNamespace() - err = filtersutil.ApplyToJSON(patchstrategicmerge.Filter{ + r.ApplyFilter(patchstrategicmerge.Filter{ Patch: node, - }, r) + }) if !r.IsEmpty() { r.SetName(n) r.SetNamespace(ns) @@ -432,6 +433,10 @@ func (r *Resource) ApplySmPatch(patch *Resource) error { return err } +func (r *Resource) ApplyFilter(f kio.Filter) error { + return filtersutil.ApplyToJSON(f, r) +} + func mergeStringMaps(maps ...map[string]string) map[string]string { result := map[string]string{} for _, m := range maps { diff --git a/plugin/builtin/annotationstransformer/AnnotationsTransformer.go b/plugin/builtin/annotationstransformer/AnnotationsTransformer.go index 0aafec882..8454887b9 100644 --- a/plugin/builtin/annotationstransformer/AnnotationsTransformer.go +++ b/plugin/builtin/annotationstransformer/AnnotationsTransformer.go @@ -8,7 +8,6 @@ import ( "sigs.k8s.io/kustomize/api/filters/annotations" "sigs.k8s.io/kustomize/api/resmap" "sigs.k8s.io/kustomize/api/types" - "sigs.k8s.io/kustomize/kyaml/filtersutil" "sigs.k8s.io/yaml" ) @@ -30,10 +29,10 @@ func (p *plugin) Config( func (p *plugin) Transform(m resmap.ResMap) error { for _, r := range m.Resources() { - err := filtersutil.ApplyToJSON(annotations.Filter{ + err := r.ApplyFilter(annotations.Filter{ Annotations: p.Annotations, FsSlice: p.FieldSpecs, - }, r) + }) if err != nil { return err } diff --git a/plugin/builtin/annotationstransformer/go.mod b/plugin/builtin/annotationstransformer/go.mod index 241f5f8f7..effefe7b4 100644 --- a/plugin/builtin/annotationstransformer/go.mod +++ b/plugin/builtin/annotationstransformer/go.mod @@ -4,7 +4,6 @@ go 1.15 require ( sigs.k8s.io/kustomize/api v0.7.1 - sigs.k8s.io/kustomize/kyaml v0.10.5 sigs.k8s.io/yaml v1.2.0 ) diff --git a/plugin/builtin/imagetagtransformer/ImageTagTransformer.go b/plugin/builtin/imagetagtransformer/ImageTagTransformer.go index 04c2961c2..6ce794b33 100644 --- a/plugin/builtin/imagetagtransformer/ImageTagTransformer.go +++ b/plugin/builtin/imagetagtransformer/ImageTagTransformer.go @@ -12,7 +12,6 @@ import ( "sigs.k8s.io/kustomize/api/filters/imagetag" "sigs.k8s.io/kustomize/api/resmap" "sigs.k8s.io/kustomize/api/types" - "sigs.k8s.io/kustomize/kyaml/filtersutil" "sigs.k8s.io/yaml" ) @@ -36,17 +35,17 @@ func (p *plugin) Config( func (p *plugin) Transform(m resmap.ResMap) error { for _, r := range m.Resources() { // traverse all fields at first - err := filtersutil.ApplyToJSON(imagetag.LegacyFilter{ + err := r.ApplyFilter(imagetag.LegacyFilter{ ImageTag: p.ImageTag, - }, r) + }) if err != nil { return err } // then use user specified field specs - err = filtersutil.ApplyToJSON(imagetag.Filter{ + err = r.ApplyFilter(imagetag.Filter{ ImageTag: p.ImageTag, FsSlice: p.FieldSpecs, - }, r) + }) if err != nil { return err } diff --git a/plugin/builtin/imagetagtransformer/go.mod b/plugin/builtin/imagetagtransformer/go.mod index 39e01e43e..c987b896e 100644 --- a/plugin/builtin/imagetagtransformer/go.mod +++ b/plugin/builtin/imagetagtransformer/go.mod @@ -4,7 +4,6 @@ go 1.15 require ( sigs.k8s.io/kustomize/api v0.7.1 - sigs.k8s.io/kustomize/kyaml v0.10.5 sigs.k8s.io/yaml v1.2.0 ) diff --git a/plugin/builtin/labeltransformer/LabelTransformer.go b/plugin/builtin/labeltransformer/LabelTransformer.go index 5ae0a38ff..8f5b13356 100644 --- a/plugin/builtin/labeltransformer/LabelTransformer.go +++ b/plugin/builtin/labeltransformer/LabelTransformer.go @@ -8,7 +8,6 @@ import ( "sigs.k8s.io/kustomize/api/filters/labels" "sigs.k8s.io/kustomize/api/resmap" "sigs.k8s.io/kustomize/api/types" - "sigs.k8s.io/kustomize/kyaml/filtersutil" "sigs.k8s.io/yaml" ) @@ -30,10 +29,10 @@ func (p *plugin) Config( func (p *plugin) Transform(m resmap.ResMap) error { for _, r := range m.Resources() { - err := filtersutil.ApplyToJSON(labels.Filter{ + err := r.ApplyFilter(labels.Filter{ Labels: p.Labels, FsSlice: p.FieldSpecs, - }, r) + }) if err != nil { return err } diff --git a/plugin/builtin/labeltransformer/go.mod b/plugin/builtin/labeltransformer/go.mod index 9a79db105..f3dd03fc6 100644 --- a/plugin/builtin/labeltransformer/go.mod +++ b/plugin/builtin/labeltransformer/go.mod @@ -4,7 +4,6 @@ go 1.15 require ( sigs.k8s.io/kustomize/api v0.7.1 - sigs.k8s.io/kustomize/kyaml v0.10.5 sigs.k8s.io/yaml v1.2.0 ) diff --git a/plugin/builtin/namespacetransformer/NamespaceTransformer.go b/plugin/builtin/namespacetransformer/NamespaceTransformer.go index 549a17a6d..f4a026193 100644 --- a/plugin/builtin/namespacetransformer/NamespaceTransformer.go +++ b/plugin/builtin/namespacetransformer/NamespaceTransformer.go @@ -10,7 +10,6 @@ import ( "sigs.k8s.io/kustomize/api/filters/namespace" "sigs.k8s.io/kustomize/api/resmap" "sigs.k8s.io/kustomize/api/types" - "sigs.k8s.io/kustomize/kyaml/filtersutil" "sigs.k8s.io/yaml" ) @@ -39,10 +38,10 @@ func (p *plugin) Transform(m resmap.ResMap) error { // Don't mutate empty objects? continue } - err := filtersutil.ApplyToJSON(namespace.Filter{ + err := r.ApplyFilter(namespace.Filter{ Namespace: p.Namespace, FsSlice: p.FieldSpecs, - }, r) + }) if err != nil { return err } diff --git a/plugin/builtin/namespacetransformer/go.mod b/plugin/builtin/namespacetransformer/go.mod index 89df947f5..df6c41104 100644 --- a/plugin/builtin/namespacetransformer/go.mod +++ b/plugin/builtin/namespacetransformer/go.mod @@ -4,7 +4,6 @@ go 1.15 require ( sigs.k8s.io/kustomize/api v0.7.1 - sigs.k8s.io/kustomize/kyaml v0.10.5 sigs.k8s.io/yaml v1.2.0 ) diff --git a/plugin/builtin/patchjson6902transformer/PatchJson6902Transformer.go b/plugin/builtin/patchjson6902transformer/PatchJson6902Transformer.go index 340d1abb0..3e4f619c9 100644 --- a/plugin/builtin/patchjson6902transformer/PatchJson6902Transformer.go +++ b/plugin/builtin/patchjson6902transformer/PatchJson6902Transformer.go @@ -13,7 +13,6 @@ import ( "sigs.k8s.io/kustomize/api/ifc" "sigs.k8s.io/kustomize/api/resmap" "sigs.k8s.io/kustomize/api/types" - "sigs.k8s.io/kustomize/kyaml/filtersutil" "sigs.k8s.io/yaml" ) @@ -83,9 +82,9 @@ func (p *plugin) Transform(m resmap.ResMap) error { return err } for _, res := range resources { - err = filtersutil.ApplyToJSON(patchjson6902.Filter{ + err = res.ApplyFilter(patchjson6902.Filter{ Patch: p.JsonOp, - }, res) + }) if err != nil { return err } diff --git a/plugin/builtin/patchjson6902transformer/go.mod b/plugin/builtin/patchjson6902transformer/go.mod index c788a1a6a..7e22e887c 100644 --- a/plugin/builtin/patchjson6902transformer/go.mod +++ b/plugin/builtin/patchjson6902transformer/go.mod @@ -6,7 +6,6 @@ require ( github.com/evanphx/json-patch v4.5.0+incompatible github.com/pkg/errors v0.8.1 sigs.k8s.io/kustomize/api v0.7.1 - sigs.k8s.io/kustomize/kyaml v0.10.5 sigs.k8s.io/yaml v1.2.0 ) diff --git a/plugin/builtin/patchtransformer/PatchTransformer.go b/plugin/builtin/patchtransformer/PatchTransformer.go index a92758dae..a973cbea2 100644 --- a/plugin/builtin/patchtransformer/PatchTransformer.go +++ b/plugin/builtin/patchtransformer/PatchTransformer.go @@ -13,7 +13,6 @@ import ( "sigs.k8s.io/kustomize/api/resmap" "sigs.k8s.io/kustomize/api/resource" "sigs.k8s.io/kustomize/api/types" - "sigs.k8s.io/kustomize/kyaml/filtersutil" "sigs.k8s.io/yaml" ) @@ -109,9 +108,9 @@ func (p *plugin) transformJson6902(m resmap.ResMap, patch jsonpatch.Patch) error return err } for _, res := range resources { - err = filtersutil.ApplyToJSON(patchjson6902.Filter{ + err = res.ApplyFilter(patchjson6902.Filter{ Patch: p.Patch, - }, res) + }) if err != nil { return err } diff --git a/plugin/builtin/patchtransformer/go.mod b/plugin/builtin/patchtransformer/go.mod index 571582e68..ae85888ae 100644 --- a/plugin/builtin/patchtransformer/go.mod +++ b/plugin/builtin/patchtransformer/go.mod @@ -5,7 +5,6 @@ go 1.15 require ( github.com/evanphx/json-patch v4.5.0+incompatible sigs.k8s.io/kustomize/api v0.7.1 - sigs.k8s.io/kustomize/kyaml v0.10.5 sigs.k8s.io/yaml v1.2.0 ) diff --git a/plugin/builtin/prefixsuffixtransformer/PrefixSuffixTransformer.go b/plugin/builtin/prefixsuffixtransformer/PrefixSuffixTransformer.go index ec225a989..c09684047 100644 --- a/plugin/builtin/prefixsuffixtransformer/PrefixSuffixTransformer.go +++ b/plugin/builtin/prefixsuffixtransformer/PrefixSuffixTransformer.go @@ -11,7 +11,6 @@ import ( "sigs.k8s.io/kustomize/api/resid" "sigs.k8s.io/kustomize/api/resmap" "sigs.k8s.io/kustomize/api/types" - "sigs.k8s.io/kustomize/kyaml/filtersutil" "sigs.k8s.io/yaml" ) @@ -74,11 +73,11 @@ func (p *plugin) Transform(m resmap.ResMap) error { r.AddNamePrefix(p.Prefix) r.AddNameSuffix(p.Suffix) } - err := filtersutil.ApplyToJSON(prefixsuffix.Filter{ + err := r.ApplyFilter(prefixsuffix.Filter{ Prefix: p.Prefix, Suffix: p.Suffix, FieldSpec: fs, - }, r) + }) if err != nil { return err } diff --git a/plugin/builtin/prefixsuffixtransformer/go.mod b/plugin/builtin/prefixsuffixtransformer/go.mod index f640338bd..794bf57f9 100644 --- a/plugin/builtin/prefixsuffixtransformer/go.mod +++ b/plugin/builtin/prefixsuffixtransformer/go.mod @@ -4,7 +4,6 @@ go 1.15 require ( sigs.k8s.io/kustomize/api v0.7.1 - sigs.k8s.io/kustomize/kyaml v0.10.5 sigs.k8s.io/yaml v1.2.0 ) diff --git a/plugin/builtin/replicacounttransformer/ReplicaCountTransformer.go b/plugin/builtin/replicacounttransformer/ReplicaCountTransformer.go index fee8468a5..7a479812f 100644 --- a/plugin/builtin/replicacounttransformer/ReplicaCountTransformer.go +++ b/plugin/builtin/replicacounttransformer/ReplicaCountTransformer.go @@ -8,8 +8,6 @@ import ( "fmt" "sigs.k8s.io/kustomize/api/filters/replicacount" - "sigs.k8s.io/kustomize/kyaml/filtersutil" - "sigs.k8s.io/kustomize/api/resid" "sigs.k8s.io/kustomize/api/resmap" "sigs.k8s.io/kustomize/api/types" @@ -46,10 +44,10 @@ func (p *plugin) Transform(m resmap.ResMap) error { // There are redundant checks in the filter // that we'll live with until resolution of // https://github.com/kubernetes-sigs/kustomize/issues/2506 - err := filtersutil.ApplyToJSON(replicacount.Filter{ + err := r.ApplyFilter(replicacount.Filter{ Replica: p.Replica, FieldSpec: fs, - }, r) + }) if err != nil { return err } diff --git a/plugin/builtin/replicacounttransformer/go.mod b/plugin/builtin/replicacounttransformer/go.mod index b740f563b..039a4ee58 100644 --- a/plugin/builtin/replicacounttransformer/go.mod +++ b/plugin/builtin/replicacounttransformer/go.mod @@ -4,7 +4,6 @@ go 1.15 require ( sigs.k8s.io/kustomize/api v0.7.1 - sigs.k8s.io/kustomize/kyaml v0.10.5 sigs.k8s.io/yaml v1.2.0 ) diff --git a/plugin/builtin/valueaddtransformer/ValueAddTransformer.go b/plugin/builtin/valueaddtransformer/ValueAddTransformer.go index 3ae35c571..ead170c06 100644 --- a/plugin/builtin/valueaddtransformer/ValueAddTransformer.go +++ b/plugin/builtin/valueaddtransformer/ValueAddTransformer.go @@ -14,7 +14,6 @@ import ( "sigs.k8s.io/kustomize/api/resmap" "sigs.k8s.io/kustomize/api/resource" "sigs.k8s.io/kustomize/api/types" - "sigs.k8s.io/kustomize/kyaml/filtersutil" "sigs.k8s.io/yaml" ) @@ -123,15 +122,15 @@ func (p *plugin) Transform(m resmap.ResMap) (err error) { // TODO: consider t.NotSelector if implemented for _, res := range resources { if t.FieldPath == types.MetadataNamespacePath { - err = filtersutil.ApplyToJSON(namespace.Filter{ + err = res.ApplyFilter(namespace.Filter{ Namespace: p.Value, - }, res) + }) } else { - err = filtersutil.ApplyToJSON(valueadd.Filter{ + err = res.ApplyFilter(valueadd.Filter{ Value: p.Value, FieldPath: t.FieldPath, FilePathPosition: t.FilePathPosition, - }, res) + }) } if err != nil { return err diff --git a/plugin/builtin/valueaddtransformer/go.mod b/plugin/builtin/valueaddtransformer/go.mod index 9138777d0..01f07ff86 100644 --- a/plugin/builtin/valueaddtransformer/go.mod +++ b/plugin/builtin/valueaddtransformer/go.mod @@ -4,7 +4,6 @@ go 1.15 require ( sigs.k8s.io/kustomize/api v0.7.1 - sigs.k8s.io/kustomize/kyaml v0.10.5 sigs.k8s.io/yaml v1.2.0 )