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

Confine calls to ApplyToJSON.

Browse Source
This commit is contained in:
monopole
2021-01-07 18:34:05 -08:00
parent 8c6a9f6495
commit 614e853db3
31 changed files with 59 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
plugin/builtin/annotationstransformer/AnnotationsTransformer.go
View File

@@ -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
}

1
plugin/builtin/annotationstransformer/go.mod
View File

@@ -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
)

9
plugin/builtin/imagetagtransformer/ImageTagTransformer.go
View File

@@ -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
}

1
plugin/builtin/imagetagtransformer/go.mod
View File

@@ -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
)

5
plugin/builtin/labeltransformer/LabelTransformer.go
View File

@@ -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
}

1
plugin/builtin/labeltransformer/go.mod
View File

@@ -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
)

5
plugin/builtin/namespacetransformer/NamespaceTransformer.go
View File

@@ -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
}

1
plugin/builtin/namespacetransformer/go.mod
View File

@@ -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
)

5
plugin/builtin/patchjson6902transformer/PatchJson6902Transformer.go
View File

@@ -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
}

1
plugin/builtin/patchjson6902transformer/go.mod
View File

@@ -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
)

5
plugin/builtin/patchtransformer/PatchTransformer.go
View File

@@ -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
}

1
plugin/builtin/patchtransformer/go.mod
View File

@@ -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
)

5
plugin/builtin/prefixsuffixtransformer/PrefixSuffixTransformer.go
View File

@@ -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
}

1
plugin/builtin/prefixsuffixtransformer/go.mod
View File

@@ -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
)

6
plugin/builtin/replicacounttransformer/ReplicaCountTransformer.go
View File

@@ -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
}

1
plugin/builtin/replicacounttransformer/go.mod
View File

@@ -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
)

9
plugin/builtin/valueaddtransformer/ValueAddTransformer.go
View File

@@ -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

1
plugin/builtin/valueaddtransformer/go.mod
View File

@@ -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
)