pin kyaml version to v0.2.0 for release

.gitignore

@@ -19,5 +19,3 @@
 
 # macOS
 *.DS_store
-
-.bin

Makefile

@@ -15,8 +15,7 @@ verify-kustomize: \
 	lint-kustomize \
 	test-unit-kustomize-all \
 	test-examples-kustomize-against-HEAD \
-	test-examples-kustomize-against-3.8.0 \
-	test-examples-kustomize-against-3.8.2
+	test-examples-kustomize-against-3.6.1
 
 # The following target referenced by a file in
 # https://github.com/kubernetes/test-infra/tree/master/config/jobs/kubernetes-sigs/kustomize
@@ -24,11 +23,10 @@ verify-kustomize: \
 prow-presubmit-check: \
 	lint-kustomize \
 	test-unit-kustomize-all \
-	test-unit-cmd-all \
-	test-go-mod \
 	test-examples-kustomize-against-HEAD \
-	test-examples-kustomize-against-3.8.0 \
-	test-examples-kustomize-against-3.8.2
+	test-examples-kustomize-against-3.6.1 \
+	test-unit-cmd-all \
+	test-go-mod
 
 .PHONY: verify-kustomize-e2e
 verify-kustomize-e2e: test-examples-e2e-kustomize
@@ -47,18 +45,17 @@ $(MYGOBIN)/golangci-lint-kustomize:
 		GO111MODULE=on go build -tags=tools -o $(MYGOBIN)/golangci-lint-kustomize github.com/golangci/golangci-lint/cmd/golangci-lint; \
 	)
 
-$(MYGOBIN)/gorepomod:
-	cd api; \
-	go install github.com/monopole/gorepomod
-
+# Version pinned by api/go.mod
 $(MYGOBIN)/mdrip:
 	cd api; \
 	go install github.com/monopole/mdrip
 
+# Version pinned by api/go.mod
 $(MYGOBIN)/stringer:
 	cd api; \
 	go install golang.org/x/tools/cmd/stringer
 
+# Version pinned by api/go.mod
 $(MYGOBIN)/goimports:
 	cd api; \
 	go install golang.org/x/tools/cmd/goimports
@@ -84,7 +81,6 @@ $(MYGOBIN)/kustomize:
 install-tools: \
 	$(MYGOBIN)/goimports \
 	$(MYGOBIN)/golangci-lint-kustomize \
-	$(MYGOBIN)/gorepomod \
 	$(MYGOBIN)/mdrip \
 	$(MYGOBIN)/pluginator \
 	$(MYGOBIN)/stringer
@@ -200,7 +196,7 @@ build-kustomize-api: $(builtinplugins)
 
 .PHONY: test-unit-kustomize-api
 test-unit-kustomize-api: build-kustomize-api
-	cd api; go test ./...  -ldflags "-X sigs.k8s.io/kustomize/api/provenance.version=v444.333.222"
+	cd api; go test ./...
 
 .PHONY: test-unit-kustomize-plugins
 test-unit-kustomize-plugins:
@@ -237,23 +233,10 @@ test-examples-kustomize-against-HEAD: $(MYGOBIN)/kustomize $(MYGOBIN)/mdrip
 	./hack/testExamplesAgainstKustomize.sh HEAD
 
 .PHONY:
-test-examples-kustomize-against-3.8.0: $(MYGOBIN)/mdrip
+test-examples-kustomize-against-3.6.1: $(MYGOBIN)/mdrip
 	( \
 		set -e; \
-		tag=v3.8.0; \
-		/bin/rm -f $(MYGOBIN)/kustomize; \
-		echo "Installing kustomize $$tag."; \
-		GO111MODULE=on go get sigs.k8s.io/kustomize/kustomize/v3@$${tag}; \
-		./hack/testExamplesAgainstKustomize.sh $$tag; \
-		echo "Reinstalling kustomize from HEAD."; \
-		cd kustomize; go install .; \
-	)
-
-.PHONY:
-test-examples-kustomize-against-3.8.2: $(MYGOBIN)/mdrip
-	( \
-		set -e; \
-		tag=v3.8.2; \
+		tag=v3.6.1; \
 		/bin/rm -f $(MYGOBIN)/kustomize; \
 		echo "Installing kustomize $$tag."; \
 		GO111MODULE=on go get sigs.k8s.io/kustomize/kustomize/v3@$${tag}; \

OWNERS_ALIASES

@@ -11,4 +11,3 @@ aliases:
     - pwittrock
     - mortent
     - phanimarupaka
-    - Shell32-Natsu

README.md

@@ -9,15 +9,18 @@ patch [kubernetes style] API objects.  It's like
 [`make`], in that what it does is declared in a file,
 and it's like [`sed`], in that it emits edited text.
 
-This tool is sponsored by [sig-cli] ([KEP]).
-
- - [Installation instructions](https://kubernetes-sigs.github.io/kustomize/installation)
- - [General documentation](https://kubernetes-sigs.github.io/kustomize)
- - [Examples](examples)
+This tool is sponsored by [sig-cli] ([KEP]), and
+inspired by [DAM].
 
 [![Build Status](https://prow.k8s.io/badge.svg?jobs=kustomize-presubmit-master)](https://prow.k8s.io/job-history/kubernetes-jenkins/pr-logs/directory/kustomize-presubmit-master)
 [![Go Report Card](https://goreportcard.com/badge/github.com/kubernetes-sigs/kustomize)](https://goreportcard.com/report/github.com/kubernetes-sigs/kustomize)
 
+Download a binary from the [release page], or see
+these [instructions](docs/INSTALL.md).
+
+Browse the [docs](docs) or jump right into the
+tested [examples](examples).
+
 ## kubectl integration
 
 Since [v1.14][kubectl announcement] the kustomize build system has been included in kubectl.
@@ -129,8 +132,20 @@ The YAML can be directly [applied] to a cluster:
 
 ## Community
 
-- [file a bug](https://kubernetes-sigs.github.io/kustomize/contributing/bugs/) instructions
-- [contribute a feature](https://kubernetes-sigs.github.io/kustomize/contributing/features/) instructions
+To file bugs please read [this](docs/bugs.md).
+
+Before working on an implementation, please
+
+ * Read the [eschewed feature list].
+ * File an issue describing
+   how the new feature would behave
+   and label it [kind/feature].
+
+### Other communication channels
+
+- [Slack]
+- [Mailing List]
+- General kubernetes [community page]
 
 ### Code of conduct
 
@@ -139,27 +154,32 @@ is governed by the [Kubernetes Code of Conduct].
 
 [`make`]: https://www.gnu.org/software/make
 [`sed`]: https://www.gnu.org/software/sed
-[DAM]: https://kubernetes-sigs.github.io/kustomize/api-reference/glossary#declarative-application-management
+[DAM]: docs/glossary.md#declarative-application-management
 [KEP]: https://github.com/kubernetes/enhancements/blob/master/keps/sig-cli/0008-kustomize.md
 [Kubernetes Code of Conduct]: code-of-conduct.md
-[applied]: https://kubernetes-sigs.github.io/kustomize/api-reference/glossary#apply
-[base]: https://kubernetes-sigs.github.io/kustomize/api-reference/glossary#base
-[declarative configuration]: https://kubernetes-sigs.github.io/kustomize/api-reference/glossary#declarative-application-management
+[Mailing List]: https://groups.google.com/forum/#!forum/kubernetes-sig-cli
+[Slack]: https://kubernetes.slack.com/messages/sig-cli
+[applied]: docs/glossary.md#apply
+[base]: docs/glossary.md#base
+[community page]: http://kubernetes.io/community/
+[declarative configuration]: docs/glossary.md#declarative-application-management
+[eschewed feature list]: docs/eschewedFeatures.md
 [imageBase]: docs/images/base.jpg
 [imageOverlay]: docs/images/overlay.jpg
+[kind/feature]: /../../labels/kind%2Ffeature
 [kubectl announcement]: https://kubernetes.io/blog/2019/03/25/kubernetes-1-14-release-announcement
 [kubectl book]: https://kubectl.docs.kubernetes.io/pages/app_customization/introduction.html
 [kubernetes documentation]: https://kubernetes.io/docs/tasks/manage-kubernetes-objects/kustomization/
-[kubernetes style]: https://kubernetes-sigs.github.io/kustomize/api-reference/glossary#kubernetes-style-object
-[kustomization]: https://kubernetes-sigs.github.io/kustomize/api-reference/glossary#kustomization
-[overlay]: https://kubernetes-sigs.github.io/kustomize/api-reference/glossary#overlay
-[overlays]: https://kubernetes-sigs.github.io/kustomize/api-reference/glossary#overlay
-[release page]: https://github.com/kubernetes-sigs/kustomize/releases
-[resource]: https://kubernetes-sigs.github.io/kustomize/api-reference/glossary#resource
-[resources]: https://kubernetes-sigs.github.io/kustomize/api-reference/glossary#resource
+[kubernetes style]: docs/glossary.md#kubernetes-style-object
+[kustomization]: docs/glossary.md#kustomization
+[overlay]: docs/glossary.md#overlay
+[overlays]: docs/glossary.md#overlay
+[release page]: /../../releases
+[resource]: docs/glossary.md#resource
+[resources]: docs/glossary.md#resource
 [sig-cli]: https://github.com/kubernetes/community/blob/master/sig-cli/README.md
-[variant]: https://kubernetes-sigs.github.io/kustomize/api-reference/glossary#variant
-[variants]: https://kubernetes-sigs.github.io/kustomize/api-reference/glossary#variant
-[v2.0.3]: https://github.com/kubernetes-sigs/kustomize/releases/tag/v2.0.3
-[v2.1.0]: https://github.com/kubernetes-sigs/kustomize/releases/tag/v2.1.0
-[workflows]: https://kubernetes-sigs.github.io/kustomize/guides
+[variant]: docs/glossary.md#variant
+[variants]: docs/glossary.md#variant
+[v2.0.3]: /../../releases/tag/v2.0.3
+[v2.1.0]: /../../releases/tag/v2.1.0
+[workflows]: docs/workflows.md

api/builtins/AnnotationsTransformer.go

@@ -29,7 +29,7 @@ func (p *AnnotationsTransformerPlugin) Transform(m resmap.ResMap) error {
 		err := filtersutil.ApplyToJSON(annotations.Filter{
 			Annotations: p.Annotations,
 			FsSlice:     p.FieldSpecs,
-		}, r)
+		}, r.Kunstructured)
 		if err != nil {
 			return err
 		}

api/builtins/ImageTagTransformer.go

@@ -8,10 +8,10 @@ import (
 	"regexp"
 	"strings"
 
-	"sigs.k8s.io/kustomize/api/filters/imagetag"
-	"sigs.k8s.io/kustomize/api/resmap"
+	"sigs.k8s.io/kustomize/api/transform"
 	"sigs.k8s.io/kustomize/api/types"
-	"sigs.k8s.io/kustomize/kyaml/filtersutil"
+
+	"sigs.k8s.io/kustomize/api/resmap"
 	"sigs.k8s.io/yaml"
 )
 
@@ -31,19 +31,18 @@ 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{
-			ImageTag: p.ImageTag,
-		}, r)
-		if err != nil {
-			return err
+		for _, path := range p.FieldSpecs {
+			if !r.OrgId().IsSelected(&path.Gvk) {
+				continue
+			}
+			err := transform.MutateField(
+				r.Map(), path.PathSlice(), false, p.mutateImage)
+			if err != nil {
+				return err
+			}
 		}
-		// then use user specified field specs
-		err = filtersutil.ApplyToJSON(imagetag.Filter{
-			ImageTag: p.ImageTag,
-			FsSlice:  p.FieldSpecs,
-		}, r)
-		if err != nil {
+		// Kept for backward compatibility
+		if err := p.findAndReplaceImage(r.Map()); err != nil && r.OrgId().Kind != `CustomResourceDefinition` {
 			return err
 		}
 	}

api/builtins/LabelTransformer.go

@@ -29,7 +29,7 @@ func (p *LabelTransformerPlugin) Transform(m resmap.ResMap) error {
 		err := filtersutil.ApplyToJSON(labels.Filter{
 			Labels:  p.Labels,
 			FsSlice: p.FieldSpecs,
-		}, r)
+		}, r.Kunstructured)
 		if err != nil {
 			return err
 		}

api/builtins/NamespaceTransformer.go

@@ -10,6 +10,7 @@ import (
 	"sigs.k8s.io/kustomize/api/resid"
 	"sigs.k8s.io/kustomize/api/resmap"
 	"sigs.k8s.io/kustomize/api/resource"
+	"sigs.k8s.io/kustomize/api/transform"
 	"sigs.k8s.io/kustomize/api/types"
 	"sigs.k8s.io/kustomize/kyaml/filtersutil"
 	"sigs.k8s.io/yaml"
@@ -19,6 +20,11 @@ import (
 type NamespaceTransformerPlugin struct {
 	types.ObjectMeta `json:"metadata,omitempty" yaml:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 	FieldSpecs       []types.FieldSpec `json:"fieldSpecs,omitempty" yaml:"fieldSpecs,omitempty"`
+
+	// YAMLSupport can be set to true to use the kyaml filter instead of the
+	// kunstruct transformer.
+	// TODO: change the default to use kyaml when it is stable
+	YAMLSupport bool `json:"yamlSupport,omitempty" yaml:"yamlSupport,omitempty"`
 }
 
 func (p *NamespaceTransformerPlugin) Config(
@@ -37,13 +43,31 @@ func (p *NamespaceTransformerPlugin) Transform(m resmap.ResMap) error {
 			// Don't mutate empty objects?
 			continue
 		}
-		err := filtersutil.ApplyToJSON(namespace.Filter{
-			Namespace: p.Namespace,
-			FsSlice:   p.FieldSpecs,
-		}, r)
-		if err != nil {
-			return err
+
+		id := r.OrgId()
+
+		if p.YAMLSupport {
+			// use the new style transform
+			err := filtersutil.ApplyToJSON(namespace.Filter{
+				Namespace: p.Namespace,
+				FsSlice:   p.FieldSpecs,
+			}, r.Kunstructured)
+			if err != nil {
+				return err
+			}
+		} else {
+			// use the old style transform
+			applicableFs := p.applicableFieldSpecs(id)
+			for _, fs := range applicableFs {
+				err := transform.MutateField(
+					r.Map(), fs.PathSlice(), fs.CreateIfNotPresent,
+					p.changeNamespace(r))
+				if err != nil {
+					return err
+				}
+			}
 		}
+
 		matches := m.GetMatchingResourcesByCurrentId(r.CurId().Equals)
 		if len(matches) != 1 {
 			return fmt.Errorf(

api/builtins/PatchJson6902Transformer.go

@@ -23,6 +23,8 @@ type PatchJson6902TransformerPlugin struct {
 	Target       types.PatchTarget `json:"target,omitempty" yaml:"target,omitempty"`
 	Path         string            `json:"path,omitempty" yaml:"path,omitempty"`
 	JsonOp       string            `json:"jsonOp,omitempty" yaml:"jsonOp,omitempty"`
+
+	YAMLSupport bool `json:"yamlSupport,omitempty" yaml:"yamlSupport,omitempty"`
 }
 
 func (p *PatchJson6902TransformerPlugin) Config(
@@ -85,9 +87,22 @@ func (p *PatchJson6902TransformerPlugin) Transform(m resmap.ResMap) error {
 	if err != nil {
 		return err
 	}
-	return filtersutil.ApplyToJSON(patchjson6902.Filter{
-		Patch: p.JsonOp,
-	}, obj)
+	if !p.YAMLSupport {
+		rawObj, err := obj.MarshalJSON()
+		if err != nil {
+			return err
+		}
+		modifiedObj, err := p.decodedPatch.Apply(rawObj)
+		if err != nil {
+			return errors.Wrapf(
+				err, "failed to apply json patch '%s'", p.JsonOp)
+		}
+		return obj.UnmarshalJSON(modifiedObj)
+	} else {
+		return filtersutil.ApplyToJSON(patchjson6902.Filter{
+			Patch: p.JsonOp,
+		}, obj.Kunstructured)
+	}
 }
 
 func NewPatchJson6902TransformerPlugin() resmap.TransformerPlugin {

api/builtins/PatchStrategicMergeTransformer.go

@@ -4,10 +4,11 @@
 package builtins
 
 import (
+	"encoding/json"
 	"fmt"
-	"strings"
 
-	"github.com/pkg/errors"
+	kyaml "sigs.k8s.io/kustomize/kyaml/yaml"
+
 	"sigs.k8s.io/kustomize/api/filters/patchstrategicmerge"
 	"sigs.k8s.io/kustomize/api/resmap"
 	"sigs.k8s.io/kustomize/api/resource"
@@ -21,6 +22,8 @@ type PatchStrategicMergeTransformerPlugin struct {
 	loadedPatches []*resource.Resource
 	Paths         []types.PatchStrategicMerge `json:"paths,omitempty" yaml:"paths,omitempty"`
 	Patches       string                      `json:"patches,omitempty" yaml:"patches,omitempty"`
+
+	YAMLSupport bool `json:"yamlSupport,omitempty" yaml:"yamlSupport,omitempty"`
 }
 
 func (p *PatchStrategicMergeTransformerPlugin) Config(
@@ -64,7 +67,7 @@ func (p *PatchStrategicMergeTransformerPlugin) Config(
 }
 
 func (p *PatchStrategicMergeTransformerPlugin) Transform(m resmap.ResMap) error {
-	patches, err := p.h.ResmapFactory().Merge(p.loadedPatches)
+	patches, err := p.h.ResmapFactory().MergePatches(p.loadedPatches)
 	if err != nil {
 		return err
 	}
@@ -73,48 +76,42 @@ func (p *PatchStrategicMergeTransformerPlugin) Transform(m resmap.ResMap) error
 		if err != nil {
 			return err
 		}
-		patchCopy := patch.DeepCopy()
-		patchCopy.SetName(target.GetName())
-		patchCopy.SetNamespace(target.GetNamespace())
-		patchCopy.SetGvk(target.GetGvk())
-		node, err := filtersutil.GetRNode(patchCopy)
-		if err != nil {
-			return err
-		}
-		err = filtersutil.ApplyToJSON(patchstrategicmerge.Filter{
-			Patch: node,
-		}, target)
-		if err != nil {
-			// Check for an error string from UnmarshalJSON that's indicative
-			// of an object that's missing basic KRM fields, and thus may have been
-			// entirely deleted (an acceptable outcome).  This error handling should
-			// be deleted along with use of ResMap and apimachinery functions like
-			// UnmarshalJSON.
-			if !strings.Contains(err.Error(), "Object 'Kind' is missing") {
-				// Some unknown error, let it through.
-				return err
-			}
-			if len(target.Map()) != 0 {
-				return errors.Wrapf(
-					err, "with unexpectedly non-empty object map of size %d",
-					len(target.Map()))
-			}
-			// Fall through to handle deleted object.
-		}
-		if len(target.Map()) == 0 {
-			// This means all fields have been removed from the object.
-			// This can happen if a patch required deletion of the
-			// entire resource (not just a part of it).  This means
-			// the overall resmap must shrink by one.
-			err = m.Remove(target.CurId())
+		if !p.YAMLSupport {
+			err = target.Patch(patch.Kunstructured)
 			if err != nil {
 				return err
 			}
+			// remove the resource from resmap
+			// when the patch is to $patch: delete that target
+			if len(target.Map()) == 0 {
+				err = m.Remove(target.CurId())
+				if err != nil {
+					return err
+				}
+			}
+		} else {
+			node, err := getRNode(patch)
+			if err != nil {
+				return err
+			}
+			err = filtersutil.ApplyToJSON(patchstrategicmerge.Filter{
+				Patch: node,
+			}, target.Kunstructured)
 		}
 	}
 	return nil
 }
 
+//TODO: Remove this once the next version of kyaml is released which
+// exposes GetRNode from the filutersutil package.
+func getRNode(k json.Marshaler) (*kyaml.RNode, error) {
+	j, err := k.MarshalJSON()
+	if err != nil {
+		return nil, err
+	}
+	return kyaml.Parse(string(j))
+}
+
 func NewPatchStrategicMergeTransformerPlugin() resmap.TransformerPlugin {
 	return &PatchStrategicMergeTransformerPlugin{}
 }

api/builtins/PatchTransformer.go

@@ -8,6 +8,7 @@ import (
 	"strings"
 
 	jsonpatch "github.com/evanphx/json-patch"
+	"github.com/pkg/errors"
 	"sigs.k8s.io/kustomize/api/filters/patchjson6902"
 	"sigs.k8s.io/kustomize/api/filters/patchstrategicmerge"
 	"sigs.k8s.io/kustomize/api/resmap"
@@ -23,6 +24,8 @@ type PatchTransformerPlugin struct {
 	Path         string          `json:"path,omitempty" yaml:"path,omitempty"`
 	Patch        string          `json:"patch,omitempty" yaml:"patch,omitempty"`
 	Target       *types.Selector `json:"target,omitempty" yaml:"target,omitempty"`
+
+	YAMLSupport bool `json:"yamlSupport,omitempty" yaml:"yamlSupport,omitempty"`
 }
 
 func (p *PatchTransformerPlugin) Config(
@@ -70,11 +73,11 @@ func (p *PatchTransformerPlugin) Config(
 }
 
 func (p *PatchTransformerPlugin) Transform(m resmap.ResMap) error {
-	if p.loadedPatch == nil {
-		return p.transformJson6902(m, p.decodedPatch)
-	} else {
+	if p.loadedPatch != nil {
 		// The patch was a strategic merge patch
 		return p.transformStrategicMerge(m, p.loadedPatch)
+	} else {
+		return p.transformJson6902(m, p.decodedPatch)
 	}
 }
 
@@ -108,15 +111,20 @@ func (p *PatchTransformerPlugin) transformStrategicMerge(m resmap.ResMap, patch
 }
 
 // applySMPatch applies the provided strategic merge patch to the
-// given resource.
+// given resource. Depending on the value of YAMLSupport, it will either
+// use the legacy implementation or the kyaml-based solution.
 func (p *PatchTransformerPlugin) applySMPatch(resource, patch *resource.Resource) error {
-	node, err := filtersutil.GetRNode(patch)
-	if err != nil {
-		return err
+	if !p.YAMLSupport {
+		return resource.Patch(patch.Kunstructured)
+	} else {
+		node, err := filtersutil.GetRNode(patch)
+		if err != nil {
+			return err
+		}
+		return filtersutil.ApplyToJSON(patchstrategicmerge.Filter{
+			Patch: node,
+		}, resource.Kunstructured)
 	}
-	return filtersutil.ApplyToJSON(patchstrategicmerge.Filter{
-		Patch: node,
-	}, resource)
 }
 
 // transformJson6902 applies the provided json6902 patch
@@ -125,14 +133,13 @@ func (p *PatchTransformerPlugin) transformJson6902(m resmap.ResMap, patch jsonpa
 	if p.Target == nil {
 		return fmt.Errorf("must specify a target for patch %s", p.Patch)
 	}
+
 	resources, err := m.Select(*p.Target)
 	if err != nil {
 		return err
 	}
 	for _, res := range resources {
-		err = filtersutil.ApplyToJSON(patchjson6902.Filter{
-			Patch: p.Patch,
-		}, res)
+		err = p.applyJson6902Patch(res, patch)
 		if err != nil {
 			return err
 		}
@@ -140,6 +147,28 @@ func (p *PatchTransformerPlugin) transformJson6902(m resmap.ResMap, patch jsonpa
 	return nil
 }
 
+// applyJson6902Patch applies the provided patch to the given resource.
+// Depending on the value of YAMLSupport, it will either
+// use the legacy implementation or the kyaml-based solution.
+func (p *PatchTransformerPlugin) applyJson6902Patch(resource *resource.Resource, patch jsonpatch.Patch) error {
+	if !p.YAMLSupport {
+		rawObj, err := resource.MarshalJSON()
+		if err != nil {
+			return err
+		}
+		modifiedObj, err := patch.Apply(rawObj)
+		if err != nil {
+			return errors.Wrapf(
+				err, "failed to apply json patch '%s'", p.Patch)
+		}
+		return resource.UnmarshalJSON(modifiedObj)
+	} else {
+		return filtersutil.ApplyToJSON(patchjson6902.Filter{
+			Patch: p.Patch,
+		}, resource.Kunstructured)
+	}
+}
+
 // jsonPatchFromBytes loads a Json 6902 patch from
 // a bytes input
 func jsonPatchFromBytes(

api/builtins/PrefixSuffixTransformer.go

@@ -5,28 +5,31 @@ package builtins
 
 import (
 	"errors"
+	"fmt"
+
+	"sigs.k8s.io/kustomize/api/transform"
+	"sigs.k8s.io/kustomize/api/types"
 
-	"sigs.k8s.io/kustomize/api/filters/prefixsuffix"
 	"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"
 )
 
 // Add the given prefix and suffix to the field.
 type PrefixSuffixTransformerPlugin struct {
-	Prefix     string        `json:"prefix,omitempty" yaml:"prefix,omitempty"`
-	Suffix     string        `json:"suffix,omitempty" yaml:"suffix,omitempty"`
-	FieldSpecs types.FsSlice `json:"fieldSpecs,omitempty" yaml:"fieldSpecs,omitempty"`
+	Prefix     string            `json:"prefix,omitempty" yaml:"prefix,omitempty"`
+	Suffix     string            `json:"suffix,omitempty" yaml:"suffix,omitempty"`
+	FieldSpecs []types.FieldSpec `json:"fieldSpecs,omitempty" yaml:"fieldSpecs,omitempty"`
 }
 
-// A Gvk skip list for prefix/suffix modification.
-// hard coded for now - eventually should be part of config.
-var prefixSuffixFieldSpecsToSkip = types.FsSlice{
-	{Gvk: resid.Gvk{Kind: "CustomResourceDefinition"}},
-	{Gvk: resid.Gvk{Group: "apiregistration.k8s.io", Kind: "APIService"}},
-	{Gvk: resid.Gvk{Kind: "Namespace"}},
+// Not placed in a file yet due to lack of demand.
+var prefixSuffixFieldSpecsToSkip = []types.FieldSpec{
+	{
+		Gvk: resid.Gvk{Kind: "CustomResourceDefinition"},
+	},
+	{
+		Gvk: resid.Gvk{Group: "apiregistration.k8s.io", Kind: "APIService"},
+	},
 }
 
 func (p *PrefixSuffixTransformerPlugin) Config(
@@ -45,24 +48,29 @@ func (p *PrefixSuffixTransformerPlugin) Config(
 }
 
 func (p *PrefixSuffixTransformerPlugin) Transform(m resmap.ResMap) error {
+
 	// Even if both the Prefix and Suffix are empty we want
 	// to proceed with the transformation. This allows to add contextual
 	// information to the resources (AddNamePrefix and AddNameSuffix).
+
 	for _, r := range m.Resources() {
-		// TODO: move this test into the filter (i.e. make a better filter)
 		if p.shouldSkip(r.OrgId()) {
+			// Don't change the actual definition
+			// of a CRD.
 			continue
 		}
 		id := r.OrgId()
 		// current default configuration contains
 		// only one entry: "metadata/name" with no GVK
-		for _, fs := range p.FieldSpecs {
-			// TODO: this is redundant to filter (but needed for now)
-			if !id.IsSelected(&fs.Gvk) {
+		for _, path := range p.FieldSpecs {
+			if !id.IsSelected(&path.Gvk) {
+				// With the currrent default configuration,
+				// because no Gvk is specified, so a wild
+				// card
 				continue
 			}
-			// TODO: move this test into the filter.
-			if smellsLikeANameChange(&fs) {
+
+			if smellsLikeANameChange(&path) {
 				// "metadata/name" is the only field.
 				// this will add a prefix and a suffix
 				// to the resource even if those are
@@ -70,11 +78,15 @@ func (p *PrefixSuffixTransformerPlugin) Transform(m resmap.ResMap) error {
 				r.AddNamePrefix(p.Prefix)
 				r.AddNameSuffix(p.Suffix)
 			}
-			err := filtersutil.ApplyToJSON(prefixsuffix.Filter{
-				Prefix:    p.Prefix,
-				Suffix:    p.Suffix,
-				FieldSpec: fs,
-			}, r)
+
+			// the addPrefixSuffix method will not
+			// change the name if both the prefix and suffix
+			// are empty.
+			err := transform.MutateField(
+				r.Map(),
+				path.PathSlice(),
+				path.CreateIfNotPresent,
+				p.addPrefixSuffix)
 			if err != nil {
 				return err
 			}
@@ -87,7 +99,8 @@ func smellsLikeANameChange(fs *types.FieldSpec) bool {
 	return fs.Path == "metadata/name"
 }
 
-func (p *PrefixSuffixTransformerPlugin) shouldSkip(id resid.ResId) bool {
+func (p *PrefixSuffixTransformerPlugin) shouldSkip(
+	id resid.ResId) bool {
 	for _, path := range prefixSuffixFieldSpecsToSkip {
 		if id.IsSelected(&path.Gvk) {
 			return true
@@ -96,6 +109,15 @@ func (p *PrefixSuffixTransformerPlugin) shouldSkip(id resid.ResId) bool {
 	return false
 }
 
+func (p *PrefixSuffixTransformerPlugin) addPrefixSuffix(
+	in interface{}) (interface{}, error) {
+	s, ok := in.(string)
+	if !ok {
+		return nil, fmt.Errorf("%#v is expected to be %T", in, s)
+	}
+	return fmt.Sprintf("%s%s%s", p.Prefix, s, p.Suffix), nil
+}
+
 func NewPrefixSuffixTransformerPlugin() resmap.TransformerPlugin {
 	return &PrefixSuffixTransformerPlugin{}
 }

api/builtins/ReplicaCountTransformer.go

@@ -6,8 +6,7 @@ package builtins
 import (
 	"fmt"
 
-	"sigs.k8s.io/kustomize/api/filters/replicacount"
-	"sigs.k8s.io/kustomize/kyaml/filtersutil"
+	"sigs.k8s.io/kustomize/api/transform"
 
 	"sigs.k8s.io/kustomize/api/resid"
 	"sigs.k8s.io/kustomize/api/resmap"
@@ -31,24 +30,18 @@ func (p *ReplicaCountTransformerPlugin) Config(
 
 func (p *ReplicaCountTransformerPlugin) Transform(m resmap.ResMap) error {
 	found := false
-	for _, fs := range p.FieldSpecs {
-		matcher := p.createMatcher(fs)
+	for i, replicaSpec := range p.FieldSpecs {
+		matcher := p.createMatcher(i)
 		matchOriginal := m.GetMatchingResourcesByOriginalId(matcher)
-		resList := append(
-			matchOriginal, m.GetMatchingResourcesByCurrentId(matcher)...)
-		if len(resList) > 0 {
+		matchCurrent := m.GetMatchingResourcesByCurrentId(matcher)
+
+		for _, res := range append(matchOriginal, matchCurrent...) {
 			found = true
-			for _, r := range resList {
-				// 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{
-					Replica:   p.Replica,
-					FieldSpec: fs,
-				}, r)
-				if err != nil {
-					return err
-				}
+			err := transform.MutateField(
+				res.Map(), replicaSpec.PathSlice(),
+				replicaSpec.CreateIfNotPresent, p.addReplicas)
+			if err != nil {
+				return err
 			}
 		}
 	}
@@ -66,12 +59,30 @@ func (p *ReplicaCountTransformerPlugin) Transform(m resmap.ResMap) error {
 }
 
 // Match Replica.Name and FieldSpec
-func (p *ReplicaCountTransformerPlugin) createMatcher(fs types.FieldSpec) resmap.IdMatcher {
+func (p *ReplicaCountTransformerPlugin) createMatcher(i int) resmap.IdMatcher {
 	return func(r resid.ResId) bool {
-		return r.Name == p.Replica.Name && r.Gvk.IsSelected(&fs.Gvk)
+		return r.Name == p.Replica.Name &&
+			r.Gvk.IsSelected(&p.FieldSpecs[i].Gvk)
 	}
 }
 
+func (p *ReplicaCountTransformerPlugin) addReplicas(in interface{}) (interface{}, error) {
+	switch m := in.(type) {
+	case int64:
+		// Was already in the field.
+	case map[string]interface{}:
+		if len(m) != 0 {
+			// A map was already in the replicas field, don't want to
+			// discard this data silently.
+			return nil, fmt.Errorf("%#v is expected to be %T", in, m)
+		}
+		// Just got added, default type is map, but we can return anything.
+	default:
+		return nil, fmt.Errorf("%#v is expected to be %T", in, m)
+	}
+	return p.Replica.Count, nil
+}
+
 func NewReplicaCountTransformerPlugin() resmap.TransformerPlugin {
 	return &ReplicaCountTransformerPlugin{}
 }

api/builtins/ValueAddTransformer.go

@@ -121,13 +121,13 @@ func (p *ValueAddTransformerPlugin) Transform(m resmap.ResMap) (err error) {
 			if t.FieldPath == types.MetadataNamespacePath {
 				err = filtersutil.ApplyToJSON(namespace.Filter{
 					Namespace: p.Value,
-				}, res)
+				}, res.Kunstructured)
 			} else {
 				err = filtersutil.ApplyToJSON(valueadd.Filter{
 					Value:            p.Value,
 					FieldPath:        t.FieldPath,
 					FilePathPosition: t.FilePathPosition,
-				}, res)
+				}, res.Kunstructured)
 			}
 			if err != nil {
 				return err

api/filters/annotations/annotations.go

@@ -29,11 +29,10 @@ func (f Filter) Filter(nodes []*yaml.RNode) ([]*yaml.RNode, error) {
 		func(node *yaml.RNode) (*yaml.RNode, error) {
 			for _, k := range keys {
 				if err := node.PipeE(fsslice.Filter{
-					FsSlice: f.FsSlice,
-					SetValue: filtersutil.SetEntry(
-						k, f.Annotations[k], yaml.NodeTagString),
+					FsSlice:    f.FsSlice,
+					SetValue:   fsslice.SetEntry(k, f.Annotations[k], yaml.StringTag),
 					CreateKind: yaml.MappingNode, // Annotations are MappingNodes.
-					CreateTag:  yaml.NodeTagMap,
+					CreateTag:  "!!map",
 				}); err != nil {
 					return nil, err
 				}

api/filters/fieldspec/doc.go

@@ -1,6 +0,0 @@
-// Copyright 2020 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-// Package fieldspec contains a yaml.Filter to modify a resource
-// that matches the FieldSpec.
-package fieldspec

api/filters/fieldspec/example_test.go

@@ -1,61 +0,0 @@
-// Copyright 2020 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package fieldspec_test
-
-import (
-	"bytes"
-	"log"
-	"os"
-
-	. "sigs.k8s.io/kustomize/api/filters/fieldspec"
-	"sigs.k8s.io/kustomize/api/filters/filtersutil"
-	"sigs.k8s.io/kustomize/api/types"
-	"sigs.k8s.io/kustomize/kyaml/kio"
-	"sigs.k8s.io/kustomize/kyaml/yaml"
-)
-
-func ExampleFilter() {
-	in := &kio.ByteReader{
-		Reader: bytes.NewBufferString(`
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: instance
----
-apiVersion: example.com/v1
-kind: Bar
-metadata:
-  name: instance
-`),
-	}
-	fltr := Filter{
-		CreateKind: yaml.ScalarNode,
-		SetValue:   filtersutil.SetScalar("green"),
-		FieldSpec:  types.FieldSpec{Path: "a/b", CreateIfNotPresent: true},
-	}
-
-	err := kio.Pipeline{
-		Inputs:  []kio.Reader{in},
-		Filters: []kio.Filter{kio.FilterAll(fltr)},
-		Outputs: []kio.Writer{kio.ByteWriter{Writer: os.Stdout}},
-	}.Execute()
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	// Output:
-	// apiVersion: example.com/v1
-	// kind: Foo
-	// metadata:
-	//   name: instance
-	// a:
-	//   b: green
-	// ---
-	// apiVersion: example.com/v1
-	// kind: Bar
-	// metadata:
-	//   name: instance
-	// a:
-	//   b: green
-}

api/filters/fieldspec/fieldspec_test.go

@@ -1,535 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package fieldspec_test
-
-import (
-	"bytes"
-	"strings"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"sigs.k8s.io/kustomize/api/filters/fieldspec"
-	"sigs.k8s.io/kustomize/api/filters/filtersutil"
-	"sigs.k8s.io/kustomize/kyaml/kio"
-	"sigs.k8s.io/kustomize/kyaml/yaml"
-)
-
-type TestCase struct {
-	name      string
-	input     string
-	expected  string
-	filter    fieldspec.Filter
-	fieldSpec string
-	error     string
-}
-
-var tests = []TestCase{
-	{
-		name: "update",
-		fieldSpec: `
-path: a/b
-group: foo
-kind: Bar
-`,
-		input: `
-apiVersion: foo/v1beta1
-kind: Bar
-a:
-  b: c
-`,
-		expected: `
-apiVersion: foo/v1beta1
-kind: Bar
-a:
-  b: e
-`,
-		filter: fieldspec.Filter{
-			SetValue: filtersutil.SetScalar("e"),
-		},
-	},
-
-	{
-		name: "update-kind-not-match",
-		fieldSpec: `
-path: a/b
-group: foo
-kind: Bar1
-`,
-		input: `
-apiVersion: foo/v1beta1
-kind: Bar2
-a:
-  b: c
-`,
-		expected: `
-apiVersion: foo/v1beta1
-kind: Bar2
-a:
-  b: c
-`,
-		filter: fieldspec.Filter{
-			SetValue: filtersutil.SetScalar("e"),
-		},
-	},
-
-	{
-		name: "update-group-not-match",
-		fieldSpec: `
-path: a/b
-group: foo1
-kind: Bar
-`,
-		input: `
-apiVersion: foo2/v1beta1
-kind: Bar
-a:
-  b: c
-`,
-		expected: `
-apiVersion: foo2/v1beta1
-kind: Bar
-a:
-  b: c
-`,
-		filter: fieldspec.Filter{
-			SetValue: filtersutil.SetScalar("e"),
-		},
-	},
-
-	{
-		name: "update-version-not-match",
-		fieldSpec: `
-path: a/b
-group: foo
-version: v1beta1
-kind: Bar
-`,
-		input: `
-apiVersion: foo/v1beta2
-kind: Bar
-a:
-  b: c
-`,
-		expected: `
-apiVersion: foo/v1beta2
-kind: Bar
-a:
-  b: c
-`,
-		filter: fieldspec.Filter{
-			SetValue: filtersutil.SetScalar("e"),
-		},
-	},
-
-	{
-		name: "bad-version",
-		fieldSpec: `
-path: a/b
-group: foo
-version: v1beta1
-kind: Bar
-`,
-		input: `
-apiVersion: foo/v1beta2/something
-kind: Bar
-a:
-  b: c
-`,
-		expected: `
-apiVersion: foo/v1beta2/something
-kind: Bar
-a:
-  b: c
-`,
-		filter: fieldspec.Filter{
-			SetValue: filtersutil.SetScalar("e"),
-		},
-	},
-
-	{
-		name: "bad-meta",
-		fieldSpec: `
-path: a/b
-group: foo
-version: v1beta1
-kind: Bar
-`,
-		input: `
-a:
-  b: c
-`,
-		filter: fieldspec.Filter{
-			SetValue: filtersutil.SetScalar("e"),
-		},
-		error: "missing Resource metadata",
-	},
-
-	{
-		name: "miss-match-type",
-		fieldSpec: `
-path: a/b/c
-kind: Bar
-`,
-		input: `
-kind: Bar
-a:
-  b: a
-`,
-		error: "obj 'kind: Bar\na:\n  b: a\n' at path 'a/b/c': " +
-			"expected sequence or mapping node",
-		filter: fieldspec.Filter{
-			SetValue: filtersutil.SetScalar("e"),
-		},
-	},
-
-	{
-		name: "add",
-		fieldSpec: `
-path: a/b/c/d
-group: foo
-create: true
-kind: Bar
-`,
-		input: `
-apiVersion: foo/v1beta1
-kind: Bar
-a: {}
-`,
-		expected: `
-apiVersion: foo/v1beta1
-kind: Bar
-a: {b: {c: {d: e}}}
-`,
-		filter: fieldspec.Filter{
-			SetValue:   filtersutil.SetScalar("e"),
-			CreateKind: yaml.ScalarNode,
-		},
-	},
-
-	{
-		name: "update-in-sequence",
-		fieldSpec: `
-path: a/b[]/c/d
-group: foo
-kind: Bar
-`,
-		input: `
-apiVersion: foo/v1beta1
-kind: Bar
-a:
-  b:
-  - c:
-      d: a
-`,
-		expected: `
-apiVersion: foo/v1beta1
-kind: Bar
-a:
-  b:
-  - c:
-      d: e
-`,
-		filter: fieldspec.Filter{
-			SetValue: filtersutil.SetScalar("e"),
-		},
-	},
-
-	// Don't create a sequence
-	{
-		name: "empty-sequence-no-create",
-		fieldSpec: `
-path: a/b[]/c/d
-group: foo
-create: true
-kind: Bar
-`,
-		input: `
-apiVersion: foo/v1beta1
-kind: Bar
-a: {}
-`,
-		expected: `
-apiVersion: foo/v1beta1
-kind: Bar
-a: {}
-`,
-		filter: fieldspec.Filter{
-			SetValue:   filtersutil.SetScalar("e"),
-			CreateKind: yaml.ScalarNode,
-		},
-	},
-
-	// Create a new field for an element in a sequence
-	{
-		name: "empty-sequence-create",
-		fieldSpec: `
-path: a/b[]/c/d
-group: foo
-create: true
-kind: Bar
-`,
-		input: `
-apiVersion: foo/v1beta1
-kind: Bar
-a:
-  b:
-  - c: {}
-`,
-		expected: `
-apiVersion: foo/v1beta1
-kind: Bar
-a:
-  b:
-  - c: {d: e}
-`,
-		filter: fieldspec.Filter{
-			SetValue:   filtersutil.SetScalar("e"),
-			CreateKind: yaml.ScalarNode,
-		},
-	},
-
-	{
-		name: "group v1",
-		fieldSpec: `
-path: a/b
-group: v1
-create: true
-kind: Bar
-`,
-		input: `
-apiVersion: v1
-kind: Bar
-`,
-		expected: `
-apiVersion: v1
-kind: Bar
-`,
-		filter: fieldspec.Filter{
-			SetValue:   filtersutil.SetScalar("e"),
-			CreateKind: yaml.ScalarNode,
-		},
-	},
-
-	{
-		name: "version v1",
-		fieldSpec: `
-path: a/b
-version: v1
-create: true
-kind: Bar
-`,
-		input: `
-apiVersion: v1
-kind: Bar
-`,
-		expected: `
-apiVersion: v1
-kind: Bar
-a:
-  b: e
-`,
-		filter: fieldspec.Filter{
-			SetValue:   filtersutil.SetScalar("e"),
-			CreateKind: yaml.ScalarNode,
-		},
-	},
-	{
-		name: "successfully set field on array entry no sequence hint",
-		fieldSpec: `
-path: spec/containers/image
-version: v1
-kind: Bar
-`,
-		input: `
-apiVersion: v1
-kind: Bar
-spec:
-  containers:
-  - image: foo
-`,
-		expected: `
-apiVersion: v1
-kind: Bar
-spec:
-  containers:
-  - image: bar
-`,
-		filter: fieldspec.Filter{
-			SetValue:   filtersutil.SetScalar("bar"),
-			CreateKind: yaml.ScalarNode,
-		},
-	},
-	{
-		name: "successfully set field on array entry with sequence hint",
-		fieldSpec: `
-path: spec/containers[]/image
-version: v1
-kind: Bar
-`,
-		input: `
-apiVersion: v1
-kind: Bar
-spec:
-  containers:
-  - image: foo
-`,
-		expected: `
-apiVersion: v1
-kind: Bar
-spec:
-  containers:
-  - image: bar
-`,
-		filter: fieldspec.Filter{
-			SetValue:   filtersutil.SetScalar("bar"),
-			CreateKind: yaml.ScalarNode,
-		},
-	},
-	{
-		name: "failure to set field on array entry with sequence hint in path",
-		fieldSpec: `
-path: spec/containers[]/image
-version: v1
-kind: Bar
-`,
-		input: `
-apiVersion: v1
-kind: Bar
-spec:
-  containers:
-`,
-		expected: `
-apiVersion: v1
-kind: Bar
-spec:
-  containers: []
-`,
-		filter: fieldspec.Filter{
-			SetValue:   filtersutil.SetScalar("bar"),
-			CreateKind: yaml.ScalarNode,
-		},
-	},
-	{
-		name: "failure to set field on array entry, no sequence hint in path",
-		fieldSpec: `
-path: spec/containers/image
-version: v1
-kind: Bar
-`,
-		input: `
-apiVersion: v1
-kind: Bar
-spec:
-  containers:
-`,
-		expected: `
-apiVersion: v1
-kind: Bar
-spec:
-  containers:
-`,
-		filter: fieldspec.Filter{
-			SetValue:   filtersutil.SetScalar("bar"),
-			CreateKind: yaml.ScalarNode,
-		},
-	},
-	{
-		name: "filedname with slash '/'",
-		fieldSpec: `
-path: a/b\/c/d
-version: v1
-kind: Bar
-`,
-		input: `
-apiVersion: v1
-kind: Bar
-a:
-  b/c:
-    d: foo
-`,
-		expected: `
-apiVersion: v1
-kind: Bar
-a:
-  b/c:
-    d: bar
-`,
-		filter: fieldspec.Filter{
-			SetValue:   filtersutil.SetScalar("bar"),
-			CreateKind: yaml.ScalarNode,
-		},
-	},
-	{
-		name: "filedname with multiple '/'",
-		fieldSpec: `
-path: a/b\/c/d\/e/f
-version: v1
-kind: Bar
-`,
-		input: `
-apiVersion: v1
-kind: Bar
-a:
-  b/c:
-    d/e:
-      f: foo
-`,
-		expected: `
-apiVersion: v1
-kind: Bar
-a:
-  b/c:
-    d/e:
-      f: bar
-`,
-		filter: fieldspec.Filter{
-			SetValue:   filtersutil.SetScalar("bar"),
-			CreateKind: yaml.ScalarNode,
-		},
-	},
-}
-
-func TestFilter_Filter(t *testing.T) {
-	for i := range tests {
-		test := tests[i]
-		t.Run(test.name, func(t *testing.T) {
-			err := yaml.Unmarshal([]byte(test.fieldSpec), &test.filter.FieldSpec)
-			if !assert.NoError(t, err) {
-				t.FailNow()
-			}
-
-			out := &bytes.Buffer{}
-			rw := &kio.ByteReadWriter{
-				Reader:                bytes.NewBufferString(test.input),
-				Writer:                out,
-				OmitReaderAnnotations: true,
-			}
-
-			// run the filter
-			err = kio.Pipeline{
-				Inputs:  []kio.Reader{rw},
-				Filters: []kio.Filter{kio.FilterAll(test.filter)},
-				Outputs: []kio.Writer{rw},
-			}.Execute()
-			if test.error != "" {
-				if !assert.EqualError(t, err, test.error) {
-					t.FailNow()
-				}
-				// stop rest of test
-				return
-			}
-
-			if !assert.NoError(t, err) {
-				t.FailNow()
-			}
-
-			// check results
-			if !assert.Equal(t,
-				strings.TrimSpace(test.expected),
-				strings.TrimSpace(out.String())) {
-				t.FailNow()
-			}
-		})
-	}
-}

api/filters/filtersutil/setters.go

@@ -1,33 +0,0 @@
-package filtersutil
-
-import (
-	"sigs.k8s.io/kustomize/kyaml/yaml"
-)
-
-// SetFn is a function that accepts an RNode to possibly modify.
-type SetFn func(*yaml.RNode) error
-
-// SetScalar returns a SetFn to set a scalar value
-func SetScalar(value string) SetFn {
-	return func(node *yaml.RNode) error {
-		return node.PipeE(yaml.FieldSetter{StringValue: value})
-	}
-}
-
-// SetEntry returns a SetFn to set an entry in a map
-func SetEntry(key, value, tag string) SetFn {
-	n := &yaml.Node{
-		Kind:  yaml.ScalarNode,
-		Value: value,
-		Tag:   tag,
-	}
-	if tag == yaml.NodeTagString && yaml.IsYaml1_1NonString(n) {
-		n.Style = yaml.DoubleQuotedStyle
-	}
-	return func(node *yaml.RNode) error {
-		return node.PipeE(yaml.FieldSetter{
-			Name:  key,
-			Value: yaml.NewRNode(n),
-		})
-	}
-}

api/filters/fsslice/doc.go

@@ -1,6 +1,6 @@
 // Copyright 2020 The Kubernetes Authors.
 // SPDX-License-Identifier: Apache-2.0
 
-// Package fsslice contains a yaml.Filter to modify a resource if
-// it matches one or more FieldSpec entries.
+// Package fsslice contains a yaml.Filter to modify a resource using an
+// FsSlice to identify fields to be updated within the resource.
 package fsslice

api/filters/fsslice/example_test.go

@@ -8,7 +8,6 @@ import (
 	"log"
 	"os"
 
-	"sigs.k8s.io/kustomize/api/filters/filtersutil"
 	"sigs.k8s.io/kustomize/api/filters/fsslice"
 	"sigs.k8s.io/kustomize/api/types"
 	"sigs.k8s.io/kustomize/kyaml/kio"
@@ -31,7 +30,7 @@ metadata:
 	}
 	fltr := fsslice.Filter{
 		CreateKind: yaml.ScalarNode,
-		SetValue:   filtersutil.SetScalar("green"),
+		SetValue:   fsslice.SetScalar("green"),
 		FsSlice: []types.FieldSpec{
 			{Path: "a/b", CreateIfNotPresent: true},
 		},

api/filters/fsslice/fieldspec_filter.go

@@ -1,27 +1,24 @@
 // Copyright 2019 The Kubernetes Authors.
 // SPDX-License-Identifier: Apache-2.0
 
-package fieldspec
+package fsslice
 
 import (
 	"strings"
 
-	"sigs.k8s.io/kustomize/api/filters/filtersutil"
 	"sigs.k8s.io/kustomize/api/types"
 	"sigs.k8s.io/kustomize/kyaml/errors"
 	"sigs.k8s.io/kustomize/kyaml/yaml"
 )
 
-var _ yaml.Filter = Filter{}
-
-// Filter applies a single fieldSpec to a single object
-// Filter stores internal state and should not be reused
-type Filter struct {
+// fieldSpecFilter applies a single fieldSpec to a single object
+// fieldSpecFilter stores internal state and should not be reused
+type fieldSpecFilter struct {
 	// FieldSpec contains the path to the value to set.
 	FieldSpec types.FieldSpec `yaml:"fieldSpec"`
 
 	// Set the field using this function
-	SetValue filtersutil.SetFn
+	SetValue SetFn
 
 	// CreateKind defines the type of node to create if the field is not found
 	CreateKind yaml.Kind
@@ -32,54 +29,48 @@ type Filter struct {
 	path []string
 }
 
-func (fltr Filter) Filter(obj *yaml.RNode) (*yaml.RNode, error) {
+func (fltr fieldSpecFilter) Filter(obj *yaml.RNode) (*yaml.RNode, error) {
 	// check if the FieldSpec applies to the object
 	if match, err := isMatchGVK(fltr.FieldSpec, obj); !match || err != nil {
 		return obj, errors.Wrap(err)
 	}
-	fltr.path = splitPath(fltr.FieldSpec.Path)
+	fltr.path = strings.Split(fltr.FieldSpec.Path, "/")
 	if err := fltr.filter(obj); err != nil {
 		s, _ := obj.String()
 		return nil, errors.WrapPrefixf(err,
-			"obj '%s' at path '%v'", s, fltr.FieldSpec.Path)
+			"obj %v at path %v", s, fltr.FieldSpec.Path)
 	}
 	return obj, nil
 }
 
-func (fltr Filter) filter(obj *yaml.RNode) error {
+func (fltr fieldSpecFilter) filter(obj *yaml.RNode) error {
 	if len(fltr.path) == 0 {
 		// found the field -- set its value
 		return fltr.SetValue(obj)
 	}
-	if obj.IsTaggedNull() {
-		return nil
-	}
 	switch obj.YNode().Kind {
 	case yaml.SequenceNode:
 		return fltr.seq(obj)
 	case yaml.MappingNode:
 		return fltr.field(obj)
-	default:
-		return errors.Errorf("expected sequence or mapping node")
 	}
+	// not found -- this might be an error since the type doesn't match
+
+	return errors.Errorf("unsupported yaml node")
 }
 
 // field calls filter on the field matching the next path element
-func (fltr Filter) field(obj *yaml.RNode) error {
+func (fltr fieldSpecFilter) field(obj *yaml.RNode) error {
 	fieldName, isSeq := isSequenceField(fltr.path[0])
+
 	// lookup the field matching the next path element
 	var lookupField yaml.Filter
 	var kind yaml.Kind
-	tag := yaml.NodeTagEmpty
+	var tag string
 	switch {
 	case !fltr.FieldSpec.CreateIfNotPresent || fltr.CreateKind == 0 || isSeq:
 		// dont' create the field if we don't find it
 		lookupField = yaml.Lookup(fieldName)
-		if isSeq {
-			// The query path thinks this field should be a sequence;
-			// accept this hint for use later if the tag is NodeTagNull.
-			kind = yaml.SequenceNode
-		}
 	case len(fltr.path) <= 1:
 		// create the field if it is missing: use the provided node kind
 		lookupField = yaml.LookupCreate(fltr.CreateKind, fieldName)
@@ -89,7 +80,7 @@ func (fltr Filter) field(obj *yaml.RNode) error {
 		// create the field if it is missing: must be a mapping node
 		lookupField = yaml.LookupCreate(yaml.MappingNode, fieldName)
 		kind = yaml.MappingNode
-		tag = yaml.NodeTagMap
+		tag = "!!map"
 	}
 
 	// locate (or maybe create) the field
@@ -98,10 +89,9 @@ func (fltr Filter) field(obj *yaml.RNode) error {
 		return errors.WrapPrefixf(err, "fieldName: %s", fieldName)
 	}
 
-	// if the value exists, but is null and kind is set,
-	// then change it to the creation type
+	// if the value exists, but is null, then change it to the creation type
 	// TODO: update yaml.LookupCreate to support this
-	if field.YNode().Tag == yaml.NodeTagNull && yaml.IsCreate(kind) {
+	if field.YNode().Tag == "!!null" {
 		field.YNode().Kind = kind
 		field.YNode().Tag = tag
 	}
@@ -114,9 +104,9 @@ func (fltr Filter) field(obj *yaml.RNode) error {
 }
 
 // seq calls filter on all sequence elements
-func (fltr Filter) seq(obj *yaml.RNode) error {
+func (fltr fieldSpecFilter) seq(obj *yaml.RNode) error {
 	if err := obj.VisitElements(func(node *yaml.RNode) error {
-		// recurse on each element -- re-allocating a Filter is
+		// recurse on each element -- re-allocating a fieldSpecFilter is
 		// not strictly required, but is more consistent with field
 		// and less likely to have side effects
 		// keep the entire path -- it does not contain parts for sequences
@@ -163,18 +153,3 @@ func isMatchGVK(fs types.FieldSpec, obj *yaml.RNode) (bool, error) {
 
 	return true, nil
 }
-
-func splitPath(path string) []string {
-	ps := strings.Split(path, "/")
-	var res []string
-	res = append(res, ps[0])
-	for i := 1; i < len(ps); i++ {
-		lastIndex := len(res) - 1
-		if strings.HasSuffix(res[lastIndex], "\\") {
-			res[lastIndex] = strings.TrimSuffix(res[lastIndex], "\\") + "/" + ps[i]
-		} else {
-			res = append(res, ps[i])
-		}
-	}
-	return res
-}

api/filters/fsslice/fsslice.go

@@ -4,22 +4,48 @@
 package fsslice
 
 import (
-	"sigs.k8s.io/kustomize/api/filters/fieldspec"
-	"sigs.k8s.io/kustomize/api/filters/filtersutil"
 	"sigs.k8s.io/kustomize/api/types"
 	"sigs.k8s.io/kustomize/kyaml/yaml"
 )
 
+// SetFn sets a value
+type SetFn func(*yaml.RNode) error
+
+// SetScalar returns a SetFn to set a scalar value
+func SetScalar(value string) SetFn {
+	return func(node *yaml.RNode) error {
+		return node.PipeE(yaml.FieldSetter{StringValue: value})
+	}
+}
+
+// SetEntry returns a SetFn to set an entry in a map
+func SetEntry(key, value, tag string) SetFn {
+	n := &yaml.Node{
+		Kind:  yaml.ScalarNode,
+		Value: value,
+		Tag:   tag,
+	}
+	if tag == yaml.StringTag && yaml.IsYaml1_1NonString(n) {
+		n.Style = yaml.DoubleQuotedStyle
+	}
+	return func(node *yaml.RNode) error {
+		return node.PipeE(yaml.FieldSetter{
+			Name:  key,
+			Value: yaml.NewRNode(n),
+		})
+	}
+
+}
+
 var _ yaml.Filter = Filter{}
 
-// Filter ranges over an FsSlice to modify fields on a single object.
-// An FsSlice is a range of FieldSpecs. A FieldSpec is a GVK plus a path.
+// Filter uses an FsSlice to modify fields on a single object
 type Filter struct {
 	// FieldSpecList list of FieldSpecs to set
 	FsSlice types.FsSlice `yaml:"fsSlice"`
 
 	// SetValue is called on each field that matches one of the FieldSpecs
-	SetValue filtersutil.SetFn
+	SetValue SetFn
 
 	// CreateKind is used to create fields that do not exist
 	CreateKind yaml.Kind
@@ -33,7 +59,7 @@ func (fltr Filter) Filter(obj *yaml.RNode) (*yaml.RNode, error) {
 		// apply this FieldSpec
 		// create a new filter for each iteration because they
 		// store internal state about the field paths
-		_, err := (&fieldspec.Filter{
+		_, err := (&fieldSpecFilter{
 			FieldSpec:  fltr.FsSlice[i],
 			SetValue:   fltr.SetValue,
 			CreateKind: fltr.CreateKind,

api/filters/fsslice/fsslice_test.go

@@ -9,77 +9,335 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"sigs.k8s.io/kustomize/api/filters/filtersutil"
-	. "sigs.k8s.io/kustomize/api/filters/fsslice"
+	"sigs.k8s.io/kustomize/api/filters/fsslice"
 	"sigs.k8s.io/kustomize/kyaml/kio"
 	"sigs.k8s.io/kustomize/kyaml/yaml"
 )
 
 type TestCase struct {
+	name     string
 	input    string
 	expected string
-	filter   Filter
+	filter   fsslice.Filter
 	fsSlice  string
 	error    string
 }
 
-var tests = map[string]TestCase{
-	"empty": {
-		fsSlice: `
-`,
-		input: `
-apiVersion: foo/v1
-kind: Bar
-`,
-		expected: `
-apiVersion: foo/v1
-kind: Bar
-`,
-		filter: Filter{
-			SetValue:   filtersutil.SetScalar("e"),
-			CreateKind: yaml.ScalarNode,
-		},
-	},
-	"two": {
+var tests = []TestCase{
+	{
+		name: "update",
 		fsSlice: `
 - path: a/b
   group: foo
-  version: v1
+  kind: Bar
+`,
+		input: `
+apiVersion: foo/v1beta1
+kind: Bar
+a:
+  b: c
+`,
+		expected: `
+apiVersion: foo/v1beta1
+kind: Bar
+a:
+  b: e
+`,
+		filter: fsslice.Filter{
+			SetValue: fsslice.SetScalar("e"),
+		},
+	},
+
+	{
+		name: "update-kind-not-match",
+		fsSlice: `
+- path: a/b
+  group: foo
+  kind: Bar1
+`,
+		input: `
+apiVersion: foo/v1beta1
+kind: Bar2
+a:
+  b: c
+`,
+		expected: `
+apiVersion: foo/v1beta1
+kind: Bar2
+a:
+  b: c
+`,
+		filter: fsslice.Filter{
+			SetValue: fsslice.SetScalar("e"),
+		},
+	},
+
+	{
+		name: "update-group-not-match",
+		fsSlice: `
+- path: a/b
+  group: foo1
+  kind: Bar
+`,
+		input: `
+apiVersion: foo2/v1beta1
+kind: Bar
+a:
+  b: c
+`,
+		expected: `
+apiVersion: foo2/v1beta1
+kind: Bar
+a:
+  b: c
+`,
+		filter: fsslice.Filter{
+			SetValue: fsslice.SetScalar("e"),
+		},
+	},
+
+	{
+		name: "update-version-not-match",
+		fsSlice: `
+- path: a/b
+  group: foo
+  version: v1beta1
+  kind: Bar
+`,
+		input: `
+apiVersion: foo/v1beta2
+kind: Bar
+a:
+  b: c
+`,
+		expected: `
+apiVersion: foo/v1beta2
+kind: Bar
+a:
+  b: c
+`,
+		filter: fsslice.Filter{
+			SetValue: fsslice.SetScalar("e"),
+		},
+	},
+
+	{
+		name: "bad-version",
+		fsSlice: `
+- path: a/b
+  group: foo
+  version: v1beta1
+  kind: Bar
+`,
+		input: `
+apiVersion: foo/v1beta2/something
+kind: Bar
+a:
+  b: c
+`,
+		expected: `
+apiVersion: foo/v1beta2/something
+kind: Bar
+a:
+  b: c
+`,
+		filter: fsslice.Filter{
+			SetValue: fsslice.SetScalar("e"),
+		},
+	},
+
+	{
+		name: "bad-meta",
+		fsSlice: `
+- path: a/b
+  group: foo
+  version: v1beta1
+  kind: Bar
+`,
+		input: `
+a:
+  b: c
+`,
+		filter: fsslice.Filter{
+			SetValue: fsslice.SetScalar("e"),
+		},
+		error: "missing Resource metadata",
+	},
+
+	{
+		name: "miss-match-type",
+		fsSlice: `
+- path: a/b/c
+  kind: Bar
+`,
+		input: `
+kind: Bar
+a:
+  b: a
+`,
+		error: "obj kind: Bar\na:\n  b: a\n at path a/b/c: unsupported yaml node",
+		filter: fsslice.Filter{
+			SetValue: fsslice.SetScalar("e"),
+		},
+	},
+
+	{
+		name: "add",
+		fsSlice: `
+- path: a/b/c/d
+  group: foo
   create: true
   kind: Bar
-- path: q/r[]/s/t
+`,
+		input: `
+apiVersion: foo/v1beta1
+kind: Bar
+a: {}
+`,
+		expected: `
+apiVersion: foo/v1beta1
+kind: Bar
+a: {b: {c: {d: e}}}
+`,
+		filter: fsslice.Filter{
+			SetValue:   fsslice.SetScalar("e"),
+			CreateKind: yaml.ScalarNode,
+		},
+	},
+
+	{
+		name: "update-in-sequence",
+		fsSlice: `
+- path: a/b[]/c/d
   group: foo
+  kind: Bar
+`,
+		input: `
+apiVersion: foo/v1beta1
+kind: Bar
+a:
+  b:
+  - c:
+      d: a
+`,
+		expected: `
+apiVersion: foo/v1beta1
+kind: Bar
+a:
+  b:
+  - c:
+      d: e
+`,
+		filter: fsslice.Filter{
+			SetValue: fsslice.SetScalar("e"),
+		},
+	},
+
+	// Don't create a sequence
+	{
+		name: "empty-sequence-no-create",
+		fsSlice: `
+- path: a/b[]/c/d
+  group: foo
+  create: true
+  kind: Bar
+`,
+		input: `
+apiVersion: foo/v1beta1
+kind: Bar
+a: {}
+`,
+		expected: `
+apiVersion: foo/v1beta1
+kind: Bar
+a: {}
+`,
+		filter: fsslice.Filter{
+			SetValue:   fsslice.SetScalar("e"),
+			CreateKind: yaml.ScalarNode,
+		},
+	},
+
+	// Create a new field for an element in a sequence
+	{
+		name: "empty-sequence-create",
+		fsSlice: `
+- path: a/b[]/c/d
+  group: foo
+  create: true
+  kind: Bar
+`,
+		input: `
+apiVersion: foo/v1beta1
+kind: Bar
+a:
+  b:
+  - c: {}
+`,
+		expected: `
+apiVersion: foo/v1beta1
+kind: Bar
+a:
+  b:
+  - c: {d: e}
+`,
+		filter: fsslice.Filter{
+			SetValue:   fsslice.SetScalar("e"),
+			CreateKind: yaml.ScalarNode,
+		},
+	},
+
+	{
+		name: "group v1",
+		fsSlice: `
+- path: a/b
+  group: v1
+  create: true
+  kind: Bar
+`,
+		input: `
+apiVersion: v1
+kind: Bar
+`,
+		expected: `
+apiVersion: v1
+kind: Bar
+`,
+		filter: fsslice.Filter{
+			SetValue:   fsslice.SetScalar("e"),
+			CreateKind: yaml.ScalarNode,
+		},
+	},
+
+	{
+		name: "version v1",
+		fsSlice: `
+- path: a/b
   version: v1
   create: true
   kind: Bar
 `,
 		input: `
-apiVersion: foo/v1
+apiVersion: v1
 kind: Bar
-q:
-  r:
-  - s: {}
 `,
 		expected: `
-apiVersion: foo/v1
+apiVersion: v1
 kind: Bar
-q:
-  r:
-  - s: {t: e}
 a:
   b: e
 `,
-		filter: Filter{
-			SetValue:   filtersutil.SetScalar("e"),
+		filter: fsslice.Filter{
+			SetValue:   fsslice.SetScalar("e"),
 			CreateKind: yaml.ScalarNode,
 		},
 	},
 }
 
-func TestFilter(t *testing.T) {
-	for name := range tests {
-		test := tests[name]
-		t.Run(name, func(t *testing.T) {
+func TestFilter_Filter(t *testing.T) {
+	for i := range tests {
+		test := tests[i]
+		t.Run(test.name, func(t *testing.T) {
 			err := yaml.Unmarshal([]byte(test.fsSlice), &test.filter.FsSlice)
 			if !assert.NoError(t, err) {
 				t.FailNow()

api/filters/fsslice/gvk.go

@@ -1,6 +1,6 @@
 // Copyright 2019 The Kubernetes Authors.
 // SPDX-License-Identifier: Apache-2.0
-package fieldspec
+package fsslice
 
 import (
 	"strings"

api/filters/fsslice/gvk_test.go

@@ -1,6 +1,6 @@
 // Copyright 2019 The Kubernetes Authors.
 // SPDX-License-Identifier: Apache-2.0
-package fieldspec
+package fsslice
 
 import (
 	"strings"

api/filters/imagetag/imagetag.go

@@ -4,24 +4,17 @@
 package imagetag
 
 import (
-	"sigs.k8s.io/kustomize/api/filters/filtersutil"
 	"sigs.k8s.io/kustomize/api/filters/fsslice"
 	"sigs.k8s.io/kustomize/api/types"
 	"sigs.k8s.io/kustomize/kyaml/kio"
 	"sigs.k8s.io/kustomize/kyaml/yaml"
 )
 
-// Filter modifies an "image tag", the value used to specify the
-// name, tag, version digest etc. of (docker) container images
-// used by a pod template.
 type Filter struct {
 	// imageTag is the tag we want to apply to the inputs
-	// The name of the image is used as a key, and other fields
-	// can specify a new name, tag, etc.
 	ImageTag types.Image `json:"imageTag,omitempty" yaml:"imageTag,omitempty"`
 
-	// FsSlice contains the FieldSpecs to locate an image field,
-	// e.g. Path: "spec/myContainers[]/image"
+	// FsSlice contains the FieldSpecs to locate the namespace field
 	FsSlice types.FsSlice `json:"fieldSpecs,omitempty" yaml:"fieldSpecs,omitempty"`
 }
 
@@ -33,12 +26,6 @@ func (f Filter) Filter(nodes []*yaml.RNode) ([]*yaml.RNode, error) {
 }
 
 func (f Filter) filter(node *yaml.RNode) (*yaml.RNode, error) {
-	// FsSlice is an allowlist, not a denyList, so to deny
-	// something via configuration a new config mechanism is
-	// needed. Until then, hardcode it.
-	if f.isOnDenyList(node) {
-		return node, nil
-	}
 	if err := node.PipeE(fsslice.Filter{
 		FsSlice:  f.FsSlice,
 		SetValue: updateImageTagFn(f.ImageTag),
@@ -48,19 +35,7 @@ func (f Filter) filter(node *yaml.RNode) (*yaml.RNode, error) {
 	return node, nil
 }
 
-func (f Filter) isOnDenyList(node *yaml.RNode) bool {
-	meta, err := node.GetMeta()
-	if err != nil {
-		// A missing 'meta' field will cause problems elsewhere;
-		// ignore it here to keep the signature simple.
-		return false
-	}
-	// Ignore CRDs
-	// https://github.com/kubernetes-sigs/kustomize/issues/890
-	return meta.Kind == `CustomResourceDefinition`
-}
-
-func updateImageTagFn(imageTag types.Image) filtersutil.SetFn {
+func updateImageTagFn(imageTag types.Image) fsslice.SetFn {
 	return func(node *yaml.RNode) error {
 		return node.PipeE(imageTagUpdater{
 			ImageTag: imageTag,

api/filters/imagetag/imagetag_test.go

@@ -19,162 +19,6 @@ func TestImageTagUpdater_Filter(t *testing.T) {
 		filter         Filter
 		fsSlice        types.FsSlice
 	}{
-		"ignore CustomResourceDefinition": {
-			input: `
-apiVersion: apiextensions.k8s.io/v1beta1
-kind: CustomResourceDefinition
-metadata:
-  name: whatever
-spec:
-  containers:
-  - image: whatever
-`,
-			expectedOutput: `
-apiVersion: apiextensions.k8s.io/v1beta1
-kind: CustomResourceDefinition
-metadata:
-  name: whatever
-spec:
-  containers:
-  - image: whatever
-`,
-			filter: Filter{
-				ImageTag: types.Image{
-					Name:    "whatever",
-					NewName: "theImageShouldNotChangeInACrd",
-				},
-			},
-			fsSlice: []types.FieldSpec{
-				{
-					Path: "spec/containers/image",
-				},
-			},
-		},
-
-		"legacy multiple images in containers": {
-			input: `
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: instance
-spec:
-  containers:
-  - image: nginx:1.2.1
-  - image: nginx:2.1.2
-`,
-			expectedOutput: `
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: instance
-spec:
-  containers:
-  - image: apache@12345
-  - image: apache@12345
-`,
-			filter: Filter{
-				ImageTag: types.Image{
-					Name:    "nginx",
-					NewName: "apache",
-					Digest:  "12345",
-				},
-			},
-			fsSlice: []types.FieldSpec{
-				{
-					Path: "spec/containers/image",
-				},
-			},
-		},
-		"legacy both containers and initContainers": {
-			input: `
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: instance
-spec:
-  containers:
-  - image: nginx:1.2.1
-  - image: tomcat:1.2.3
-  initContainers:
-  - image: nginx:1.2.1
-  - image: apache:1.2.3
-`,
-			expectedOutput: `
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: instance
-spec:
-  containers:
-  - image: apache:3.2.1
-  - image: tomcat:1.2.3
-  initContainers:
-  - image: apache:3.2.1
-  - image: apache:1.2.3
-`,
-			filter: Filter{
-				ImageTag: types.Image{
-					Name:    "nginx",
-					NewName: "apache",
-					NewTag:  "3.2.1",
-				},
-			},
-			fsSlice: []types.FieldSpec{
-				{
-					Path: "spec/containers/image",
-				},
-				{
-					Path: "spec/initContainers/image",
-				},
-			},
-		},
-		"legacy updates at multiple depths": {
-			input: `
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: instance
-spec:
-  containers:
-  - image: nginx:1.2.1
-  - image: tomcat:1.2.3
-  template:
-    spec:
-      initContainers:
-      - image: nginx:1.2.1
-      - image: apache:1.2.3
-`,
-			expectedOutput: `
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: instance
-spec:
-  containers:
-  - image: apache:3.2.1
-  - image: tomcat:1.2.3
-  template:
-    spec:
-      initContainers:
-      - image: apache:3.2.1
-      - image: apache:1.2.3
-`,
-			filter: Filter{
-				ImageTag: types.Image{
-					Name:    "nginx",
-					NewName: "apache",
-					NewTag:  "3.2.1",
-				},
-			},
-			fsSlice: []types.FieldSpec{
-				{
-					Path: "spec/containers/image",
-				},
-				{
-					Path: "spec/template/spec/initContainers/image",
-				},
-			},
-		},
 		"update with digest": {
 			input: `
 apiVersion: example.com/v1
@@ -205,7 +49,6 @@ spec:
 				},
 			},
 		},
-
 		"multiple matches in sequence": {
 			input: `
 apiVersion: example.com/v1
@@ -242,422 +85,6 @@ spec:
 				},
 			},
 		},
-
-		"new Tag": {
-			input: `
-group: apps
-apiVersion: v1
-kind: Deployment
-metadata:
-  name: deploy1
-spec:
-  template:
-    spec:
-      containers:
-      - image: nginx:1.7.9
-        name: nginx-tagged
-      - image: nginx:latest
-        name: nginx-latest
-      - image: foobar:1
-        name: replaced-with-digest
-      - image: postgres:1.8.0
-        name: postgresdb
-      initContainers:
-      - image: nginx
-        name: nginx-notag
-      - image: nginx@sha256:111111111111111111
-        name: nginx-sha256
-      - image: alpine:1.8.0
-        name: init-alpine`,
-			expectedOutput: `
-group: apps
-apiVersion: v1
-kind: Deployment
-metadata:
-  name: deploy1
-spec:
-  template:
-    spec:
-      containers:
-      - image: nginx:v2
-        name: nginx-tagged
-      - image: nginx:v2
-        name: nginx-latest
-      - image: foobar:1
-        name: replaced-with-digest
-      - image: postgres:1.8.0
-        name: postgresdb
-      initContainers:
-      - image: nginx:v2
-        name: nginx-notag
-      - image: nginx:v2
-        name: nginx-sha256
-      - image: alpine:1.8.0
-        name: init-alpine
-`,
-			filter: Filter{
-				ImageTag: types.Image{
-					Name:   "nginx",
-					NewTag: "v2",
-				},
-			},
-			fsSlice: []types.FieldSpec{
-				{
-					Path: "spec/template/spec/containers[]/image",
-				},
-				{
-					Path: "spec/template/spec/initContainers[]/image",
-				},
-			},
-		},
-		"newImage": {
-			input: `
-group: apps
-apiVersion: v1
-kind: Deployment
-metadata:
-  name: deploy1
-spec:
-  template:
-    spec:
-      containers:
-      - image: nginx:1.7.9
-        name: nginx-tagged
-      - image: nginx:latest
-        name: nginx-latest
-      - image: foobar:1
-        name: replaced-with-digest
-      - image: postgres:1.8.0
-        name: postgresdb
-      initContainers:
-      - image: nginx
-        name: nginx-notag
-      - image: nginx@sha256:111111111111111111
-        name: nginx-sha256
-      - image: alpine:1.8.0
-        name: init-alpine
-`,
-			expectedOutput: `
-group: apps
-apiVersion: v1
-kind: Deployment
-metadata:
-  name: deploy1
-spec:
-  template:
-    spec:
-      containers:
-      - image: busybox:1.7.9
-        name: nginx-tagged
-      - image: busybox:latest
-        name: nginx-latest
-      - image: foobar:1
-        name: replaced-with-digest
-      - image: postgres:1.8.0
-        name: postgresdb
-      initContainers:
-      - image: busybox
-        name: nginx-notag
-      - image: busybox@sha256:111111111111111111
-        name: nginx-sha256
-      - image: alpine:1.8.0
-        name: init-alpine
-`,
-			filter: Filter{
-				ImageTag: types.Image{
-					Name:    "nginx",
-					NewName: "busybox",
-				},
-			},
-			fsSlice: []types.FieldSpec{
-				{
-					Path: "spec/template/spec/containers[]/image",
-				},
-				{
-					Path: "spec/template/spec/initContainers[]/image",
-				},
-			},
-		},
-		"newImageAndTag": {
-			input: `
-group: apps
-apiVersion: v1
-kind: Deployment
-metadata:
-  name: deploy1
-spec:
-  template:
-    spec:
-      containers:
-      - image: nginx:1.7.9
-        name: nginx-tagged
-      - image: nginx:latest
-        name: nginx-latest
-      - image: foobar:1
-        name: replaced-with-digest
-      - image: postgres:1.8.0
-        name: postgresdb
-      initContainers:
-      - image: nginx
-        name: nginx-notag
-      - image: nginx@sha256:111111111111111111
-        name: nginx-sha256
-      - image: alpine:1.8.0
-        name: init-alpine
-`,
-			expectedOutput: `
-group: apps
-apiVersion: v1
-kind: Deployment
-metadata:
-  name: deploy1
-spec:
-  template:
-    spec:
-      containers:
-      - image: busybox:v3
-        name: nginx-tagged
-      - image: busybox:v3
-        name: nginx-latest
-      - image: foobar:1
-        name: replaced-with-digest
-      - image: postgres:1.8.0
-        name: postgresdb
-      initContainers:
-      - image: busybox:v3
-        name: nginx-notag
-      - image: busybox:v3
-        name: nginx-sha256
-      - image: alpine:1.8.0
-        name: init-alpine
-`,
-			filter: Filter{
-				ImageTag: types.Image{
-					Name:    "nginx",
-					NewName: "busybox",
-					NewTag:  "v3",
-				},
-			},
-			fsSlice: []types.FieldSpec{
-				{
-					Path: "spec/template/spec/containers[]/image",
-				},
-				{
-					Path: "spec/template/spec/initContainers[]/image",
-				},
-			},
-		},
-		"newDigest": {
-			input: `
-group: apps
-apiVersion: v1
-kind: Deployment
-metadata:
-  name: deploy1
-spec:
-  template:
-    spec:
-      containers:
-      - image: nginx:1.7.9
-        name: nginx-tagged
-      - image: nginx:latest
-        name: nginx-latest
-      - image: foobar:1
-        name: replaced-with-digest
-      - image: postgres:1.8.0
-        name: postgresdb
-      initContainers:
-      - image: nginx
-        name: nginx-notag
-      - image: nginx@sha256:111111111111111111
-        name: nginx-sha256
-      - image: alpine:1.8.0
-        name: init-alpine
-`,
-			expectedOutput: `
-group: apps
-apiVersion: v1
-kind: Deployment
-metadata:
-  name: deploy1
-spec:
-  template:
-    spec:
-      containers:
-      - image: nginx@sha256:222222222222222222
-        name: nginx-tagged
-      - image: nginx@sha256:222222222222222222
-        name: nginx-latest
-      - image: foobar:1
-        name: replaced-with-digest
-      - image: postgres:1.8.0
-        name: postgresdb
-      initContainers:
-      - image: nginx@sha256:222222222222222222
-        name: nginx-notag
-      - image: nginx@sha256:222222222222222222
-        name: nginx-sha256
-      - image: alpine:1.8.0
-        name: init-alpine
-`,
-			filter: Filter{
-				ImageTag: types.Image{
-					Name:   "nginx",
-					Digest: "sha256:222222222222222222",
-				},
-			},
-			fsSlice: []types.FieldSpec{
-				{
-					Path: "spec/template/spec/containers/image",
-				},
-				{
-					Path: "spec/template/spec/initContainers/image",
-				},
-			},
-		},
-		"newImageAndDigest": {
-			input: `
-group: apps
-apiVersion: v1
-kind: Deployment
-metadata:
-  name: deploy1
-spec:
-  template:
-    spec:
-      containers:
-      - image: nginx:1.7.9
-        name: nginx-tagged
-      - image: nginx:latest
-        name: nginx-latest
-      - image: foobar:1
-        name: replaced-with-digest
-      - image: postgres:1.8.0
-        name: postgresdb
-      initContainers:
-      - image: nginx
-        name: nginx-notag
-      - image: nginx@sha256:111111111111111111
-        name: nginx-sha256
-      - image: alpine:1.8.0
-        name: init-alpine
-`,
-			expectedOutput: `
-group: apps
-apiVersion: v1
-kind: Deployment
-metadata:
-  name: deploy1
-spec:
-  template:
-    spec:
-      containers:
-      - image: busybox@sha256:222222222222222222
-        name: nginx-tagged
-      - image: busybox@sha256:222222222222222222
-        name: nginx-latest
-      - image: foobar:1
-        name: replaced-with-digest
-      - image: postgres:1.8.0
-        name: postgresdb
-      initContainers:
-      - image: busybox@sha256:222222222222222222
-        name: nginx-notag
-      - image: busybox@sha256:222222222222222222
-        name: nginx-sha256
-      - image: alpine:1.8.0
-        name: init-alpine
-`,
-			filter: Filter{
-				ImageTag: types.Image{
-					Name:    "nginx",
-					NewName: "busybox",
-					Digest:  "sha256:222222222222222222",
-				},
-			},
-			fsSlice: []types.FieldSpec{
-				{
-					Path: "spec/template/spec/containers[]/image",
-				},
-				{
-					Path: "spec/template/spec/initContainers[]/image",
-				},
-			},
-		},
-		"emptyContainers": {
-			input: `
-group: apps
-apiVersion: v1
-kind: Deployment
-metadata:
-  name: deploy1
-spec:
-  containers:
-`,
-			expectedOutput: `
-group: apps
-apiVersion: v1
-kind: Deployment
-metadata:
-  name: deploy1
-spec:
-  containers: []
-`,
-			filter: Filter{
-				ImageTag: types.Image{
-					Name:   "nginx",
-					NewTag: "v2",
-				},
-			},
-			fsSlice: []types.FieldSpec{
-				{
-					Path: "spec/containers[]/image",
-					//					CreateIfNotPresent: true,
-				},
-			},
-		},
-		"tagWithBraces": {
-			input: `
-group: apps
-apiVersion: v1
-kind: Deployment
-metadata:
-  name: deploy1
-spec:
-  template:
-    spec:
-      containers:
-      - image: some.registry.io/my-image:{GENERATED_TAG}
-        name: my-image
-`,
-			expectedOutput: `
-group: apps
-apiVersion: v1
-kind: Deployment
-metadata:
-  name: deploy1
-spec:
-  template:
-    spec:
-      containers:
-      - image: some.registry.io/my-image:my-fixed-tag
-        name: my-image
-`,
-			filter: Filter{
-				ImageTag: types.Image{
-					Name:   "some.registry.io/my-image",
-					NewTag: "my-fixed-tag",
-				},
-			},
-			fsSlice: []types.FieldSpec{
-				{
-					Path: "spec/template/spec/containers[]/image",
-				},
-				{
-					Path: "spec/template/spec/initContainers[]/image",
-				},
-			},
-		},
 	}
 
 	for tn, tc := range testCases {

api/filters/labels/labels.go

@@ -30,11 +30,10 @@ func (f Filter) Filter(nodes []*yaml.RNode) ([]*yaml.RNode, error) {
 		func(node *yaml.RNode) (*yaml.RNode, error) {
 			for _, k := range keys {
 				if err := node.PipeE(fsslice.Filter{
-					FsSlice: f.FsSlice,
-					SetValue: filtersutil.SetEntry(
-						k, f.Labels[k], yaml.NodeTagString),
+					FsSlice:    f.FsSlice,
+					SetValue:   fsslice.SetEntry(k, f.Labels[k], yaml.StringTag),
 					CreateKind: yaml.MappingNode, // Labels are MappingNodes.
-					CreateTag:  yaml.NodeTagMap,
+					CreateTag:  "!!map",
 				}); err != nil {
 					return nil, err
 				}

api/filters/nameref/doc.go

@@ -1,3 +0,0 @@
-// Package nameref contains a kio.Filter implementation of the kustomize
-// name reference transformer.
-package nameref

api/filters/nameref/nameref.go

@@ -1,233 +0,0 @@
-package nameref
-
-import (
-	"fmt"
-
-	"sigs.k8s.io/kustomize/api/filters/fieldspec"
-	"sigs.k8s.io/kustomize/api/filters/filtersutil"
-	"sigs.k8s.io/kustomize/api/resid"
-	"sigs.k8s.io/kustomize/api/resmap"
-	"sigs.k8s.io/kustomize/api/resource"
-	"sigs.k8s.io/kustomize/api/types"
-	"sigs.k8s.io/kustomize/kyaml/kio"
-	"sigs.k8s.io/kustomize/kyaml/yaml"
-)
-
-// Filter will update the name reference
-type Filter struct {
-	FieldSpec          types.FieldSpec `json:"fieldSpec,omitempty" yaml:"fieldSpec,omitempty"`
-	Referrer           *resource.Resource
-	Target             resid.Gvk
-	ReferralCandidates resmap.ResMap
-}
-
-func (f Filter) Filter(nodes []*yaml.RNode) ([]*yaml.RNode, error) {
-	return kio.FilterAll(yaml.FilterFunc(f.run)).Filter(nodes)
-}
-
-func (f Filter) run(node *yaml.RNode) (*yaml.RNode, error) {
-	err := node.PipeE(fieldspec.Filter{
-		FieldSpec: f.FieldSpec,
-		SetValue:  f.set,
-	})
-	return node, err
-}
-
-func (f Filter) set(node *yaml.RNode) error {
-	if yaml.IsMissingOrNull(node) {
-		return nil
-	}
-	switch node.YNode().Kind {
-	case yaml.ScalarNode:
-		return f.setScalar(node)
-	case yaml.MappingNode:
-		// Kind: ValidatingWebhookConfiguration
-		// FieldSpec is webhooks/clientConfig/service
-		return f.setMapping(node)
-	case yaml.SequenceNode:
-		return f.setSequence(node)
-	default:
-		return fmt.Errorf(
-			"node is expected to be either a string or a slice of string or a map of string")
-	}
-}
-
-func (f Filter) setSequence(node *yaml.RNode) error {
-	return applyFilterToSeq(seqFilter{
-		setScalarFn:  f.setScalar,
-		setMappingFn: f.setMapping,
-	}, node)
-}
-
-func (f Filter) setMapping(node *yaml.RNode) error {
-	return setNameAndNs(
-		node,
-		f.Referrer,
-		f.Target,
-		f.ReferralCandidates,
-	)
-}
-
-func (f Filter) setScalar(node *yaml.RNode) error {
-	newValue, err := getSimpleNameField(
-		node.YNode().Value,
-		f.Referrer,
-		f.Target,
-		f.ReferralCandidates,
-		f.ReferralCandidates.Resources(),
-	)
-	if err != nil {
-		return err
-	}
-	err = filtersutil.SetScalar(newValue)(node)
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-func filterReferralCandidates(
-	referrer *resource.Resource,
-	matches []*resource.Resource) []*resource.Resource {
-	var ret []*resource.Resource
-	for _, m := range matches {
-		if referrer.PrefixesSuffixesEquals(m) {
-			ret = append(ret, m)
-		}
-	}
-	return ret
-}
-
-// selectReferral picks the referral among a subset of candidates.
-// It returns the current name and namespace of the selected candidate.
-// Note that the content of the referricalCandidateSubset slice is most of the time
-// identical to the referralCandidates resmap. Still in some cases, such
-// as ClusterRoleBinding, the subset only contains the resources of a specific
-// namespace.
-func selectReferral(
-	oldName string,
-	referrer *resource.Resource,
-	target resid.Gvk,
-	referralCandidates resmap.ResMap,
-	referralCandidateSubset []*resource.Resource) (string, string, error) {
-
-	for _, res := range referralCandidateSubset {
-		id := res.OrgId()
-		if id.IsSelected(&target) && res.GetOriginalName() == oldName {
-			matches := referralCandidates.GetMatchingResourcesByOriginalId(id.Equals)
-			// If there's more than one match,
-			// filter the matches by prefix and suffix
-			if len(matches) > 1 {
-				filteredMatches := filterReferralCandidates(referrer, matches)
-				if len(filteredMatches) > 1 {
-					return "", "", fmt.Errorf(
-						"multiple matches for %s:\n  %v",
-						id, getIds(filteredMatches))
-				}
-				// Check is the match the resource we are working on
-				if len(filteredMatches) == 0 || res != filteredMatches[0] {
-					continue
-				}
-			}
-			// In the resource, note that it is referenced
-			// by the referrer.
-			res.AppendRefBy(referrer.CurId())
-			// Return transformed name of the object,
-			// complete with prefixes, hashes, etc.
-			return res.GetName(), res.GetNamespace(), nil
-		}
-	}
-
-	return oldName, "", nil
-}
-
-// utility function to replace a simple string by the new name
-func getSimpleNameField(
-	oldName string,
-	referrer *resource.Resource,
-	target resid.Gvk,
-	referralCandidates resmap.ResMap,
-	referralCandidateSubset []*resource.Resource) (string, error) {
-
-	newName, _, err := selectReferral(oldName, referrer, target,
-		referralCandidates, referralCandidateSubset)
-
-	return newName, err
-}
-
-func getIds(rs []*resource.Resource) []string {
-	var result []string
-	for _, r := range rs {
-		result = append(result, r.CurId().String()+"\n")
-	}
-	return result
-}
-
-// utility function to replace name field within a map RNode
-// and leverage the namespace field.
-func setNameAndNs(
-	in *yaml.RNode,
-	referrer *resource.Resource,
-	target resid.Gvk,
-	referralCandidates resmap.ResMap) error {
-
-	if in.YNode().Kind != yaml.MappingNode {
-		return fmt.Errorf("expect a mapping node")
-	}
-
-	// Get name field
-	nameNode, err := in.Pipe(yaml.FieldMatcher{
-		Name: "name",
-	})
-	if err != nil || nameNode == nil {
-		return fmt.Errorf("cannot find field 'name' in node")
-	}
-
-	// Get namespace field
-	namespaceNode, err := in.Pipe(yaml.FieldMatcher{
-		Name: "namespace",
-	})
-	if err != nil {
-		return fmt.Errorf("error when find field 'namespace'")
-	}
-
-	// check is namespace matched
-	// name will bot be updated if the namespace doesn't match
-	subset := referralCandidates.Resources()
-	if namespaceNode != nil {
-		namespace := namespaceNode.YNode().Value
-		bynamespace := referralCandidates.GroupedByOriginalNamespace()
-		if _, ok := bynamespace[namespace]; !ok {
-			return nil
-		}
-		subset = bynamespace[namespace]
-	}
-
-	oldName := nameNode.YNode().Value
-	newname, newnamespace, err := selectReferral(oldName, referrer, target,
-		referralCandidates, subset)
-	if err != nil {
-		return err
-	}
-
-	if (newname == oldName) && (newnamespace == "") {
-		// no candidate found.
-		return nil
-	}
-
-	// set name
-	in.Pipe(yaml.FieldSetter{
-		Name:        "name",
-		StringValue: newname,
-	})
-	if newnamespace != "" {
-		// We don't want value "" to replace value "default" since
-		// the empty string is handled as a wild card here not default namespace
-		// by kubernetes.
-		in.Pipe(yaml.FieldSetter{
-			Name:        "namespace",
-			StringValue: newnamespace,
-		})
-	}
-	return nil
-}

api/filters/nameref/nameref_test.go

@@ -1,781 +0,0 @@
-package nameref
-
-import (
-	"strings"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"sigs.k8s.io/kustomize/api/k8sdeps/kunstruct"
-	"sigs.k8s.io/kustomize/api/resid"
-	"sigs.k8s.io/kustomize/api/resmap"
-	"sigs.k8s.io/kustomize/api/resource"
-	filtertest_test "sigs.k8s.io/kustomize/api/testutils/filtertest"
-	"sigs.k8s.io/kustomize/api/types"
-)
-
-func TestNamerefFilter(t *testing.T) {
-	testCases := map[string]struct {
-		input         string
-		candidates    string
-		expected      string
-		filter        Filter
-		originalNames []string
-	}{
-		"simple scalar": {
-			input: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-ref:
-  name: oldName
-`,
-			candidates: `
-apiVersion: apps/v1
-kind: Secret
-metadata:
-  name: newName
----
-apiVersion: apps/v1
-kind: NotSecret
-metadata:
-  name: newName2
-`,
-			originalNames: []string{"oldName", ""},
-			expected: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-ref:
-  name: newName
-`,
-			filter: Filter{
-				FieldSpec: types.FieldSpec{Path: "ref/name"},
-				Target: resid.Gvk{
-					Group:   "apps",
-					Version: "v1",
-					Kind:    "Secret",
-				},
-			},
-		},
-		"sequence": {
-			input: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-seq:
-- oldName1
-- oldName2
-`,
-			candidates: `
-apiVersion: apps/v1
-kind: Secret
-metadata:
-  name: newName
----
-apiVersion: apps/v1
-kind: NotSecret
-metadata:
-  name: newName2
-`,
-			originalNames: []string{"oldName1", ""},
-			expected: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-seq:
-- newName
-- oldName2
-`,
-			filter: Filter{
-				FieldSpec: types.FieldSpec{Path: "seq"},
-				Target: resid.Gvk{
-					Group:   "apps",
-					Version: "v1",
-					Kind:    "Secret",
-				},
-			},
-		},
-		"mapping": {
-			input: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-map:
-  name: oldName
-`,
-			candidates: `
-apiVersion: apps/v1
-kind: Secret
-metadata:
-  name: newName
----
-apiVersion: apps/v1
-kind: NotSecret
-metadata:
-  name: newName2
-`,
-			originalNames: []string{"oldName", ""},
-			expected: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-map:
-  name: newName
-`,
-			filter: Filter{
-				FieldSpec: types.FieldSpec{Path: "map"},
-				Target: resid.Gvk{
-					Group:   "apps",
-					Version: "v1",
-					Kind:    "Secret",
-				},
-			},
-		},
-		"mapping with namespace": {
-			input: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-map:
-  name: oldName
-  namespace: oldNs
-`,
-			candidates: `
-apiVersion: apps/v1
-kind: Secret
-metadata:
-  name: newName
-  namespace: oldNs
----
-apiVersion: apps/v1
-kind: NotSecret
-metadata:
-  name: newName2
-`,
-			originalNames: []string{"oldName", ""},
-			expected: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-map:
-  name: newName
-  namespace: oldNs
-`,
-			filter: Filter{
-				FieldSpec: types.FieldSpec{Path: "map"},
-				Target: resid.Gvk{
-					Group:   "apps",
-					Version: "v1",
-					Kind:    "Secret",
-				},
-			},
-		},
-		"null value": {
-			input: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-map:
-  name: null
-`,
-			candidates: `
-apiVersion: apps/v1
-kind: Secret
-metadata:
-  name: newName
----
-apiVersion: apps/v1
-kind: NotSecret
-metadata:
-  name: newName2
-`,
-			originalNames: []string{"oldName", ""},
-			expected: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-map:
-  name: null
-`,
-			filter: Filter{
-				FieldSpec: types.FieldSpec{Path: "map"},
-				Target: resid.Gvk{
-					Group:   "apps",
-					Version: "v1",
-					Kind:    "Secret",
-				},
-			},
-		},
-	}
-
-	for tn, tc := range testCases {
-		t.Run(tn, func(t *testing.T) {
-			factory := resource.NewFactory(kunstruct.NewKunstructuredFactoryImpl())
-			referrer, err := factory.FromBytes([]byte(tc.input))
-			if err != nil {
-				t.Fatal(err)
-			}
-			tc.filter.Referrer = referrer
-
-			resMapFactory := resmap.NewFactory(factory, nil)
-			candidatesRes, err := factory.SliceFromBytesWithNames(
-				tc.originalNames, []byte(tc.candidates))
-			if err != nil {
-				t.Fatal(err)
-			}
-
-			candidates := resMapFactory.FromResourceSlice(candidatesRes)
-			tc.filter.ReferralCandidates = candidates
-
-			if !assert.Equal(t,
-				strings.TrimSpace(tc.expected),
-				strings.TrimSpace(
-					filtertest_test.RunFilter(t, tc.input, tc.filter))) {
-				t.FailNow()
-			}
-		})
-	}
-}
-
-func TestNamerefFilterUnhappy(t *testing.T) {
-	testCases := map[string]struct {
-		input         string
-		candidates    string
-		expected      string
-		filter        Filter
-		originalNames []string
-	}{
-		"multiple match": {
-			input: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-ref:
-  name: oldName
-`,
-			candidates: `
-apiVersion: apps/v1
-kind: Secret
-metadata:
-  name: newName
----
-apiVersion: apps/v1
-kind: Secret
-metadata:
-  name: newName2
-`,
-			originalNames: []string{"oldName", "oldName"},
-			expected:      "",
-			filter: Filter{
-				FieldSpec: types.FieldSpec{Path: "ref/name"},
-				Target: resid.Gvk{
-					Group:   "apps",
-					Version: "v1",
-					Kind:    "Secret",
-				},
-			},
-		},
-		"no name": {
-			input: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-ref:
-  notName: oldName
-`,
-			candidates: `
-apiVersion: apps/v1
-kind: Secret
-metadata:
-  name: newName
----
-apiVersion: apps/v1
-kind: Secret
-metadata:
-  name: newName2
-`,
-			originalNames: []string{"oldName", "oldName"},
-			expected:      "",
-			filter: Filter{
-				FieldSpec: types.FieldSpec{Path: "ref"},
-				Target: resid.Gvk{
-					Group:   "apps",
-					Version: "v1",
-					Kind:    "Secret",
-				},
-			},
-		},
-	}
-
-	for tn, tc := range testCases {
-		t.Run(tn, func(t *testing.T) {
-			factory := resource.NewFactory(kunstruct.NewKunstructuredFactoryImpl())
-			referrer, err := factory.FromBytes([]byte(tc.input))
-			if err != nil {
-				t.Fatal(err)
-			}
-			tc.filter.Referrer = referrer
-
-			resMapFactory := resmap.NewFactory(factory, nil)
-			candidatesRes, err := factory.SliceFromBytesWithNames(
-				tc.originalNames, []byte(tc.candidates))
-			if err != nil {
-				t.Fatal(err)
-			}
-
-			candidates := resMapFactory.FromResourceSlice(candidatesRes)
-			tc.filter.ReferralCandidates = candidates
-
-			_, err = filtertest_test.RunFilterE(t, tc.input, tc.filter)
-			if err == nil {
-				t.Fatalf("expect an error")
-			}
-			if tc.expected != "" && !assert.EqualError(t, err, tc.expected) {
-				t.FailNow()
-			}
-		})
-	}
-}
-
-func TestCandidatesWithDifferentPrefixSuffix(t *testing.T) {
-	testCases := map[string]struct {
-		input         string
-		candidates    string
-		expected      string
-		filter        Filter
-		originalNames []string
-		prefix        []string
-		suffix        []string
-		inputPrefix   string
-		inputSuffix   string
-		err           bool
-	}{
-		"prefix match": {
-			input: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-ref:
-  name: oldName
-`,
-			candidates: `
-apiVersion: apps/v1
-kind: Secret
-metadata:
-  name: newName
----
-apiVersion: apps/v1
-kind: Secret
-metadata:
-  name: newName2
-`,
-			originalNames: []string{"oldName", "oldName"},
-			prefix:        []string{"prefix1", "prefix2"},
-			suffix:        []string{"", "suffix2"},
-			inputPrefix:   "prefix1",
-			inputSuffix:   "",
-			expected: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-ref:
-  name: newName
-`,
-			filter: Filter{
-				FieldSpec: types.FieldSpec{Path: "ref/name"},
-				Target: resid.Gvk{
-					Group:   "apps",
-					Version: "v1",
-					Kind:    "Secret",
-				},
-			},
-			err: false,
-		},
-		"suffix match": {
-			input: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-ref:
-  name: oldName
-`,
-			candidates: `
-apiVersion: apps/v1
-kind: Secret
-metadata:
-  name: newName
----
-apiVersion: apps/v1
-kind: Secret
-metadata:
-  name: newName2
-`,
-			originalNames: []string{"oldName", "oldName"},
-			prefix:        []string{"", "prefix2"},
-			suffix:        []string{"suffix1", "suffix2"},
-			inputPrefix:   "",
-			inputSuffix:   "suffix1",
-			expected: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-ref:
-  name: newName
-`,
-			filter: Filter{
-				FieldSpec: types.FieldSpec{Path: "ref/name"},
-				Target: resid.Gvk{
-					Group:   "apps",
-					Version: "v1",
-					Kind:    "Secret",
-				},
-			},
-			err: false,
-		},
-		"prefix suffix both match": {
-			input: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-ref:
-  name: oldName
-`,
-			candidates: `
-apiVersion: apps/v1
-kind: Secret
-metadata:
-  name: newName
----
-apiVersion: apps/v1
-kind: Secret
-metadata:
-  name: newName2
-`,
-			originalNames: []string{"oldName", "oldName"},
-			prefix:        []string{"prefix1", "prefix2"},
-			suffix:        []string{"suffix1", "suffix2"},
-			inputPrefix:   "prefix1",
-			inputSuffix:   "suffix1",
-			expected: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-ref:
-  name: newName
-`,
-			filter: Filter{
-				FieldSpec: types.FieldSpec{Path: "ref/name"},
-				Target: resid.Gvk{
-					Group:   "apps",
-					Version: "v1",
-					Kind:    "Secret",
-				},
-			},
-			err: false,
-		},
-		"multiple match: both": {
-			input: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-ref:
-  name: oldName
-`,
-			candidates: `
-apiVersion: apps/v1
-kind: Secret
-metadata:
-  name: newName
----
-apiVersion: apps/v1
-kind: Secret
-metadata:
-  name: newName2
-`,
-			originalNames: []string{"oldName", "oldName"},
-			prefix:        []string{"prefix", "prefix"},
-			suffix:        []string{"suffix", "suffix"},
-			inputPrefix:   "prefix",
-			inputSuffix:   "suffix",
-			expected:      "",
-			filter: Filter{
-				FieldSpec: types.FieldSpec{Path: "ref/name"},
-				Target: resid.Gvk{
-					Group:   "apps",
-					Version: "v1",
-					Kind:    "Secret",
-				},
-			},
-			err: true,
-		},
-		"multiple match: only prefix": {
-			input: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-ref:
-  name: oldName
-`,
-			candidates: `
-apiVersion: apps/v1
-kind: Secret
-metadata:
-  name: newName
----
-apiVersion: apps/v1
-kind: Secret
-metadata:
-  name: newName2
-`,
-			originalNames: []string{"oldName", "oldName"},
-			prefix:        []string{"prefix", "prefix"},
-			suffix:        []string{"", ""},
-			inputPrefix:   "prefix",
-			inputSuffix:   "",
-			expected:      "",
-			filter: Filter{
-				FieldSpec: types.FieldSpec{Path: "ref/name"},
-				Target: resid.Gvk{
-					Group:   "apps",
-					Version: "v1",
-					Kind:    "Secret",
-				},
-			},
-			err: true,
-		},
-		"multiple match: only suffix": {
-			input: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-ref:
-  name: oldName
-`,
-			candidates: `
-apiVersion: apps/v1
-kind: Secret
-metadata:
-  name: newName
----
-apiVersion: apps/v1
-kind: Secret
-metadata:
-  name: newName2
-`,
-			originalNames: []string{"oldName", "oldName"},
-			prefix:        []string{"", ""},
-			suffix:        []string{"suffix", "suffix"},
-			inputPrefix:   "",
-			inputSuffix:   "suffix",
-			expected:      "",
-			filter: Filter{
-				FieldSpec: types.FieldSpec{Path: "ref/name"},
-				Target: resid.Gvk{
-					Group:   "apps",
-					Version: "v1",
-					Kind:    "Secret",
-				},
-			},
-			err: true,
-		},
-		"no match: neither match": {
-			input: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-ref:
-  name: oldName
-`,
-			candidates: `
-apiVersion: apps/v1
-kind: Secret
-metadata:
-  name: newName
----
-apiVersion: apps/v1
-kind: Secret
-metadata:
-  name: newName2
-`,
-			originalNames: []string{"oldName", "oldName"},
-			prefix:        []string{"prefix1", "prefix2"},
-			suffix:        []string{"suffix1", "suffix2"},
-			inputPrefix:   "prefix",
-			inputSuffix:   "suffix",
-			expected: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-ref:
-  name: oldName
-`,
-			filter: Filter{
-				FieldSpec: types.FieldSpec{Path: "ref/name"},
-				Target: resid.Gvk{
-					Group:   "apps",
-					Version: "v1",
-					Kind:    "Secret",
-				},
-			},
-			err: false,
-		},
-		"no match: prefix doesn't match": {
-			input: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-ref:
-  name: oldName
-`,
-			candidates: `
-apiVersion: apps/v1
-kind: Secret
-metadata:
-  name: newName
----
-apiVersion: apps/v1
-kind: Secret
-metadata:
-  name: newName2
-`,
-			originalNames: []string{"oldName", "oldName"},
-			prefix:        []string{"prefix1", "prefix2"},
-			suffix:        []string{"suffix", "suffix"},
-			inputPrefix:   "prefix",
-			inputSuffix:   "suffix",
-			expected: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-ref:
-  name: oldName
-`,
-			filter: Filter{
-				FieldSpec: types.FieldSpec{Path: "ref/name"},
-				Target: resid.Gvk{
-					Group:   "apps",
-					Version: "v1",
-					Kind:    "Secret",
-				},
-			},
-			err: false,
-		},
-		"no match: suffix doesn't match": {
-			input: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-ref:
-  name: oldName
-`,
-			candidates: `
-apiVersion: apps/v1
-kind: Secret
-metadata:
-  name: newName
----
-apiVersion: apps/v1
-kind: Secret
-metadata:
-  name: newName2
-`,
-			originalNames: []string{"oldName", "oldName"},
-			prefix:        []string{"prefix", "prefix"},
-			suffix:        []string{"suffix1", "suffix2"},
-			inputPrefix:   "prefix",
-			inputSuffix:   "suffix",
-			expected: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-ref:
-  name: oldName
-`,
-			filter: Filter{
-				FieldSpec: types.FieldSpec{Path: "ref/name"},
-				Target: resid.Gvk{
-					Group:   "apps",
-					Version: "v1",
-					Kind:    "Secret",
-				},
-			},
-			err: false,
-		},
-	}
-
-	for tn, tc := range testCases {
-		t.Run(tn, func(t *testing.T) {
-			factory := resource.NewFactory(kunstruct.NewKunstructuredFactoryImpl())
-			referrer, err := factory.FromBytes([]byte(tc.input))
-			if err != nil {
-				t.Fatal(err)
-			}
-			if tc.inputPrefix != "" {
-				referrer.AddNamePrefix(tc.inputPrefix)
-			}
-			if tc.inputSuffix != "" {
-				referrer.AddNameSuffix(tc.inputSuffix)
-			}
-			tc.filter.Referrer = referrer
-
-			resMapFactory := resmap.NewFactory(factory, nil)
-			candidatesRes, err := factory.SliceFromBytesWithNames(
-				tc.originalNames, []byte(tc.candidates))
-			if err != nil {
-				t.Fatal(err)
-			}
-			for i := range candidatesRes {
-				if tc.prefix[i] != "" {
-					candidatesRes[i].AddNamePrefix(tc.prefix[i])
-				}
-				if tc.suffix[i] != "" {
-					candidatesRes[i].AddNameSuffix(tc.suffix[i])
-				}
-			}
-
-			candidates := resMapFactory.FromResourceSlice(candidatesRes)
-			tc.filter.ReferralCandidates = candidates
-
-			if !tc.err {
-				if !assert.Equal(t,
-					strings.TrimSpace(tc.expected),
-					strings.TrimSpace(
-						filtertest_test.RunFilter(t, tc.input, tc.filter))) {
-					t.FailNow()
-				}
-			} else {
-				_, err := filtertest_test.RunFilterE(t, tc.input, tc.filter)
-				if err == nil {
-					t.Fatalf("an error is expected")
-				}
-			}
-		})
-	}
-}

api/filters/nameref/seqfilter.go

@@ -1,57 +0,0 @@
-package nameref
-
-import (
-	"fmt"
-
-	"sigs.k8s.io/kustomize/kyaml/yaml"
-)
-
-type setFn func(*yaml.RNode) error
-
-type seqFilter struct {
-	setScalarFn  setFn
-	setMappingFn setFn
-}
-
-func (sf seqFilter) Filter(node *yaml.RNode) (*yaml.RNode, error) {
-	if yaml.IsMissingOrNull(node) {
-		return node, nil
-	}
-	switch node.YNode().Kind {
-	case yaml.ScalarNode:
-		// Kind: Role/ClusterRole
-		// FieldSpec is rules.resourceNames
-		err := sf.setScalarFn(node)
-		return node, err
-	case yaml.MappingNode:
-		// Kind: RoleBinding/ClusterRoleBinding
-		// FieldSpec is subjects
-		// Note: The corresponding fieldSpec had been changed from
-		// from path: subjects/name to just path: subjects. This is
-		// what get mutatefield to request the mapping of the whole
-		// map containing namespace and name instead of just a simple
-		// string field containing the name
-		err := sf.setMappingFn(node)
-		return node, err
-	default:
-		return node, fmt.Errorf(
-			"%#v is expected to be either a string or a map of string", node)
-	}
-}
-
-// applyFilterToSeq will apply the filter to each element in the sequence node
-func applyFilterToSeq(filter yaml.Filter, node *yaml.RNode) error {
-	if node.YNode().Kind != yaml.SequenceNode {
-		return fmt.Errorf("expect a sequence node but got %v", node.YNode().Kind)
-	}
-
-	for _, elem := range node.Content() {
-		rnode := yaml.NewRNode(elem)
-		err := rnode.PipeE(filter)
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}

api/filters/nameref/seqfilter_test.go

@@ -1,80 +0,0 @@
-package nameref
-
-import (
-	"strings"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"sigs.k8s.io/kustomize/kyaml/yaml"
-)
-
-func SeqFilter(node *yaml.RNode) (*yaml.RNode, error) {
-	if node.YNode().Value == "aaa" {
-		node.YNode().SetString("ccc")
-	}
-	return node, nil
-}
-
-func TestApplyFilterToSeq(t *testing.T) {
-	fltr := yaml.FilterFunc(SeqFilter)
-
-	testCases := map[string]struct {
-		input  string
-		expect string
-	}{
-		"replace in seq": {
-			input: `
-- aaa
-- bbb`,
-			expect: `
-- ccc
-- bbb`,
-		},
-	}
-
-	for tn, tc := range testCases {
-		t.Run(tn, func(t *testing.T) {
-			node, err := yaml.Parse(tc.input)
-			if err != nil {
-				t.Fatal(err)
-			}
-			err = applyFilterToSeq(fltr, node)
-			if err != nil {
-				t.Fatal(err)
-			}
-			if !assert.Equal(t,
-				strings.TrimSpace(tc.expect),
-				strings.TrimSpace(node.MustString())) {
-				t.Fatalf("expect:\n%s\nactual:\n%s",
-					strings.TrimSpace(tc.expect),
-					strings.TrimSpace(node.MustString()))
-			}
-		})
-	}
-}
-
-func TestApplyFilterToSeqUnhappy(t *testing.T) {
-	fltr := yaml.FilterFunc(SeqFilter)
-
-	testCases := map[string]struct {
-		input string
-	}{
-		"replace in seq": {
-			input: `
-aaa`,
-		},
-	}
-
-	for tn, tc := range testCases {
-		t.Run(tn, func(t *testing.T) {
-			node, err := yaml.Parse(tc.input)
-			if err != nil {
-				t.Fatal(err)
-			}
-			err = applyFilterToSeq(fltr, node)
-			if err == nil {
-				t.Fatalf("expect an error")
-			}
-		})
-	}
-}

api/filters/namespace/namespace.go

@@ -4,8 +4,6 @@
 package namespace
 
 import (
-	"sigs.k8s.io/kustomize/api/filters/fieldspec"
-	"sigs.k8s.io/kustomize/api/filters/filtersutil"
 	"sigs.k8s.io/kustomize/api/filters/fsslice"
 	"sigs.k8s.io/kustomize/api/types"
 	"sigs.k8s.io/kustomize/kyaml/kio"
@@ -44,9 +42,9 @@ func (ns Filter) run(node *yaml.RNode) (*yaml.RNode, error) {
 	// transformations based on data -- :)
 	err := node.PipeE(fsslice.Filter{
 		FsSlice:    ns.FsSlice,
-		SetValue:   filtersutil.SetScalar(ns.Namespace),
+		SetValue:   fsslice.SetScalar(ns.Namespace),
 		CreateKind: yaml.ScalarNode, // Namespace is a ScalarNode
-		CreateTag:  yaml.NodeTagString,
+		CreateTag:  yaml.StringTag,
 	})
 	return node, err
 }
@@ -69,13 +67,13 @@ func (ns Filter) hacks(obj *yaml.RNode) error {
 // metaNamespaceHack is a hack for implementing the namespace transform
 // for the metadata.namespace field on namespace scoped resources.
 // namespace scoped resources are determined by NOT being present
-// in a hard-coded list of cluster-scoped resource types (by apiVersion and kind).
+// in a blacklist of cluster-scoped resource types (by apiVersion and kind).
 //
 // This hack should be updated to allow individual resources to specify
 // if they are cluster scoped through either an annotation on the resources,
 // or through inlined OpenAPI on the resource as a YAML comment.
 func (ns Filter) metaNamespaceHack(obj *yaml.RNode, meta yaml.ResourceMeta) error {
-	gvk := fieldspec.GetGVK(meta)
+	gvk := fsslice.GetGVK(meta)
 	if !gvk.IsNamespaceableKind() {
 		return nil
 	}
@@ -83,7 +81,7 @@ func (ns Filter) metaNamespaceHack(obj *yaml.RNode, meta yaml.ResourceMeta) erro
 		FsSlice: []types.FieldSpec{
 			{Path: types.MetadataNamespacePath, CreateIfNotPresent: true},
 		},
-		SetValue:   filtersutil.SetScalar(ns.Namespace),
+		SetValue:   fsslice.SetScalar(ns.Namespace),
 		CreateKind: yaml.ScalarNode, // Namespace is a ScalarNode
 	}
 	_, err := f.Filter(obj)
@@ -112,7 +110,7 @@ func (ns Filter) roleBindingHack(obj *yaml.RNode, meta yaml.ResourceMeta) error
 	// Lookup the namespace field on all elements.
 	// We should change the fieldspec so this isn't necessary.
 	obj, err := obj.Pipe(yaml.Lookup(subjectsField))
-	if err != nil || yaml.IsMissingOrNull(obj) {
+	if err != nil || yaml.IsEmpty(obj) {
 		return err
 	}
 
@@ -125,7 +123,7 @@ func (ns Filter) roleBindingHack(obj *yaml.RNode, meta yaml.ResourceMeta) error
 		name, err := o.Pipe(
 			yaml.Lookup("name"), yaml.Match("default"),
 		)
-		if err != nil || yaml.IsMissingOrNull(name) {
+		if err != nil || yaml.IsEmpty(name) {
 			return err
 		}
 

api/filters/patchstrategicmerge/patchstrategicmerge.go

@@ -1,6 +1,3 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
 package patchstrategicmerge
 
 import (
@@ -16,13 +13,9 @@ type Filter struct {
 var _ kio.Filter = Filter{}
 
 func (pf Filter) Filter(nodes []*yaml.RNode) ([]*yaml.RNode, error) {
-	var result []*yaml.RNode
-	for i := range nodes {
-		r, err := merge2.Merge(pf.Patch, nodes[i])
-		if err != nil {
-			return nil, err
-		}
-		result = append(result, r)
-	}
-	return result, nil
+	return kio.FilterAll(yaml.FilterFunc(pf.run)).Filter(nodes)
+}
+
+func (pf Filter) run(node *yaml.RNode) (*yaml.RNode, error) {
+	return merge2.Merge(pf.Patch, node)
 }

api/filters/patchstrategicmerge/patchstrategicmerge_test.go

@@ -31,86 +31,6 @@ apiVersion: apps/v1
 metadata:
   name: yourDeploy
 kind: Deployment
-`,
-		},
-		"container patch": {
-			input: `
-apiVersion: apps/v1
-metadata:
-  name: myDeploy
-kind: Deployment
-spec:
-  template:
-    spec:
-      containers:
-      - name: foo1
-      - name: foo2
-      - name: foo3
-`,
-			patch: yaml.MustParse(`
-apiVersion: apps/v1
-metadata:
-  name: myDeploy
-kind: Deployment
-spec:
-  template:
-    spec:
-      containers:
-      - name: foo0
-`),
-			expected: `
-apiVersion: apps/v1
-metadata:
-  name: myDeploy
-kind: Deployment
-spec:
-  template:
-    spec:
-      containers:
-      - name: foo1
-      - name: foo2
-      - name: foo3
-      - name: foo0
-`,
-		},
-		"volumes patch": {
-			input: `
-apiVersion: apps/v1
-metadata:
-  name: myDeploy
-kind: Deployment
-spec:
-  template:
-    spec:
-      volumes:
-      - name: foo1
-      - name: foo2
-      - name: foo3
-`,
-			patch: yaml.MustParse(`
-apiVersion: apps/v1
-metadata:
-  name: myDeploy
-kind: Deployment
-spec:
-  template:
-    spec:
-      volumes:
-      - name: foo0
-`),
-			expected: `
-apiVersion: apps/v1
-metadata:
-  name: myDeploy
-kind: Deployment
-spec:
-  template:
-    spec:
-      volumes:
-      - name: foo1
-      - name: foo2
-      - name: foo3
-      - name: foo0
 `,
 		},
 		"nested patch": {

api/filters/prefixsuffix/example_test.go

@@ -9,11 +9,12 @@ import (
 	"os"
 
 	"sigs.k8s.io/kustomize/api/filters/prefixsuffix"
-	"sigs.k8s.io/kustomize/api/types"
+	"sigs.k8s.io/kustomize/api/internal/plugins/builtinconfig"
 	"sigs.k8s.io/kustomize/kyaml/kio"
 )
 
 func ExampleFilter() {
+	fss := builtinconfig.MakeDefaultConfig().NamePrefix
 	err := kio.Pipeline{
 		Inputs: []kio.Reader{&kio.ByteReader{Reader: bytes.NewBufferString(`
 apiVersion: example.com/v1
@@ -26,8 +27,7 @@ kind: Bar
 metadata:
   name: instance
 `)}},
-		Filters: []kio.Filter{prefixsuffix.Filter{
-			Prefix: "baz-", FieldSpec: types.FieldSpec{Path: "metadata/name"}}},
+		Filters: []kio.Filter{prefixsuffix.Filter{Prefix: "baz-", FsSlice: fss}},
 		Outputs: []kio.Writer{kio.ByteWriter{Writer: os.Stdout}},
 	}.Execute()
 	if err != nil {

api/filters/prefixsuffix/prefixsuffix.go

@@ -6,8 +6,7 @@ package prefixsuffix
 import (
 	"fmt"
 
-	"sigs.k8s.io/kustomize/api/filters/fieldspec"
-	"sigs.k8s.io/kustomize/api/filters/filtersutil"
+	"sigs.k8s.io/kustomize/api/filters/fsslice"
 	"sigs.k8s.io/kustomize/api/types"
 	"sigs.k8s.io/kustomize/kyaml/kio"
 	"sigs.k8s.io/kustomize/kyaml/yaml"
@@ -18,26 +17,28 @@ type Filter struct {
 	Prefix string `json:"prefix,omitempty" yaml:"prefix,omitempty"`
 	Suffix string `json:"suffix,omitempty" yaml:"suffix,omitempty"`
 
-	FieldSpec types.FieldSpec `json:"fieldSpec,omitempty" yaml:"fieldSpec,omitempty"`
+	FsSlice types.FsSlice `json:"fieldSpecs,omitempty" yaml:"fieldSpecs,omitempty"`
 }
 
 var _ kio.Filter = Filter{}
 
-func (f Filter) Filter(nodes []*yaml.RNode) ([]*yaml.RNode, error) {
-	return kio.FilterAll(yaml.FilterFunc(f.run)).Filter(nodes)
+func (ns Filter) Filter(nodes []*yaml.RNode) ([]*yaml.RNode, error) {
+	return kio.FilterAll(yaml.FilterFunc(ns.run)).Filter(nodes)
 }
 
-func (f Filter) run(node *yaml.RNode) (*yaml.RNode, error) {
-	err := node.PipeE(fieldspec.Filter{
-		FieldSpec:  f.FieldSpec,
-		SetValue:   f.evaluateField,
+// Run runs the filter on a single node rather than a slice
+func (ns Filter) run(node *yaml.RNode) (*yaml.RNode, error) {
+	// transformations based on data -- :)
+	err := node.PipeE(fsslice.Filter{
+		FsSlice:    ns.FsSlice,
+		SetValue:   ns.set,
 		CreateKind: yaml.ScalarNode, // Name is a ScalarNode
-		CreateTag:  yaml.NodeTagString,
+		CreateTag:  yaml.StringTag,
 	})
 	return node, err
 }
 
-func (f Filter) evaluateField(node *yaml.RNode) error {
-	return filtersutil.SetScalar(fmt.Sprintf(
-		"%s%s%s", f.Prefix, node.YNode().Value, f.Suffix))(node)
+func (ns Filter) set(node *yaml.RNode) error {
+	return fsslice.SetScalar(fmt.Sprintf(
+		"%s%s%s", ns.Prefix, node.YNode().Value, ns.Suffix))(node)
 }

api/filters/prefixsuffix/prefixsuffix_test.go

@@ -9,12 +9,14 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"sigs.k8s.io/kustomize/api/filters/prefixsuffix"
+	"sigs.k8s.io/kustomize/api/internal/plugins/builtinconfig"
 	filtertest_test "sigs.k8s.io/kustomize/api/testutils/filtertest"
 	"sigs.k8s.io/kustomize/api/types"
 )
 
-var tests = map[string]TestCase{
-	"prefix": {
+var tests = []TestCase{
+	{
+		name: "prefix",
 		input: `
 apiVersion: example.com/v1
 kind: Foo
@@ -38,10 +40,10 @@ metadata:
   name: foo-instance
 `,
 		filter: prefixsuffix.Filter{Prefix: "foo-"},
-		fs:     types.FieldSpec{Path: "metadata/name"},
 	},
 
-	"suffix": {
+	{
+		name: "suffix",
 		input: `
 apiVersion: example.com/v1
 kind: Foo
@@ -65,10 +67,10 @@ metadata:
   name: instance-foo
 `,
 		filter: prefixsuffix.Filter{Suffix: "-foo"},
-		fs:     types.FieldSpec{Path: "metadata/name"},
 	},
 
-	"prefix-suffix": {
+	{
+		name: "prefix-suffix",
 		input: `
 apiVersion: example.com/v1
 kind: Foo
@@ -92,10 +94,10 @@ metadata:
   name: bar-instance-foo
 `,
 		filter: prefixsuffix.Filter{Prefix: "bar-", Suffix: "-foo"},
-		fs:     types.FieldSpec{Path: "metadata/name"},
 	},
 
-	"data-fieldspecs": {
+	{
+		name: "data-fieldspecs",
 		input: `
 apiVersion: example.com/v1
 kind: Foo
@@ -117,7 +119,7 @@ a:
 apiVersion: example.com/v1
 kind: Foo
 metadata:
-  name: instance
+  name: foo-instance
 a:
   b:
     c: foo-d
@@ -125,28 +127,35 @@ a:
 apiVersion: example.com/v1
 kind: Bar
 metadata:
-  name: instance
+  name: foo-instance
 a:
   b:
     c: foo-d
 `,
 		filter: prefixsuffix.Filter{Prefix: "foo-"},
-		fs:     types.FieldSpec{Path: "a/b/c"},
+		fsslice: []types.FieldSpec{
+			{
+				Path: "a/b/c",
+			},
+		},
 	},
 }
 
 type TestCase struct {
+	name     string
 	input    string
 	expected string
 	filter   prefixsuffix.Filter
-	fs       types.FieldSpec
+	fsslice  types.FsSlice
 }
 
+var config = builtinconfig.MakeDefaultConfig()
+
 func TestFilter(t *testing.T) {
-	for name := range tests {
-		test := tests[name]
-		t.Run(name, func(t *testing.T) {
-			test.filter.FieldSpec = test.fs
+	for i := range tests {
+		test := tests[i]
+		t.Run(test.name, func(t *testing.T) {
+			test.filter.FsSlice = append(config.NamePrefix, test.fsslice...)
 			if !assert.Equal(t,
 				strings.TrimSpace(test.expected),
 				strings.TrimSpace(

api/filters/refvar/doc.go

@@ -1,3 +0,0 @@
-// Package refvar contains a kio.Filter implementation of the kustomize
-// refvar transformer.
-package refvar

api/filters/refvar/refvar.go

@@ -1,101 +0,0 @@
-package refvar
-
-import (
-	"fmt"
-	"strconv"
-
-	"sigs.k8s.io/kustomize/api/filters/fieldspec"
-	"sigs.k8s.io/kustomize/api/types"
-	"sigs.k8s.io/kustomize/kyaml/kio"
-	"sigs.k8s.io/kustomize/kyaml/yaml"
-
-	expansion2 "sigs.k8s.io/kustomize/api/internal/accumulator/expansion"
-)
-
-// Filter updates $(VAR) style variables with values.
-// The fieldSpecs are the places to look for occurrences of $(VAR).
-type Filter struct {
-	MappingFunc func(string) interface{} `json:"mappingFunc,omitempty" yaml:"mappingFunc,omitempty"`
-	FieldSpec   types.FieldSpec          `json:"fieldSpec,omitempty" yaml:"fieldSpec,omitempty"`
-}
-
-func (f Filter) Filter(nodes []*yaml.RNode) ([]*yaml.RNode, error) {
-	return kio.FilterAll(yaml.FilterFunc(f.run)).Filter(nodes)
-}
-
-func (f Filter) run(node *yaml.RNode) (*yaml.RNode, error) {
-	err := node.PipeE(fieldspec.Filter{
-		FieldSpec: f.FieldSpec,
-		SetValue:  f.set,
-	})
-	return node, err
-}
-
-func (f Filter) set(node *yaml.RNode) error {
-	if yaml.IsMissingOrNull(node) {
-		return nil
-	}
-	switch node.YNode().Kind {
-	case yaml.ScalarNode:
-		return f.setScalar(node)
-	case yaml.MappingNode:
-		return f.setMap(node)
-	case yaml.SequenceNode:
-		return f.setSeq(node)
-	default:
-		return fmt.Errorf("invalid type encountered %v", node.YNode().Kind)
-	}
-}
-
-func updateNodeValue(node *yaml.Node, newValue interface{}) {
-	switch newValue := newValue.(type) {
-	case int64:
-		node.Value = strconv.FormatInt(newValue, 10)
-		node.Tag = yaml.NodeTagInt
-	case bool:
-		node.SetString(strconv.FormatBool(newValue))
-		node.Tag = yaml.NodeTagBool
-	case float64:
-		node.SetString(strconv.FormatFloat(newValue, 'f', -1, 64))
-		node.Tag = yaml.NodeTagFloat
-	default:
-		node.SetString(newValue.(string))
-		node.Tag = yaml.NodeTagString
-	}
-	node.Style = 0
-}
-
-func (f Filter) setScalar(node *yaml.RNode) error {
-	if !yaml.IsYNodeString(node.YNode()) {
-		return nil
-	}
-	v := expansion2.Expand(node.YNode().Value, f.MappingFunc)
-	updateNodeValue(node.YNode(), v)
-	return nil
-}
-
-func (f Filter) setMap(node *yaml.RNode) error {
-	contents := node.YNode().Content
-	for i := 0; i < len(contents); i += 2 {
-		if !yaml.IsYNodeString(contents[i]) {
-			return fmt.Errorf("invalid map key: %s, type: %s", contents[i].Value, contents[i].Tag)
-		}
-		if !yaml.IsYNodeString(contents[i+1]) {
-			continue
-		}
-		newValue := expansion2.Expand(contents[i+1].Value, f.MappingFunc)
-		updateNodeValue(contents[i+1], newValue)
-	}
-	return nil
-}
-
-func (f Filter) setSeq(node *yaml.RNode) error {
-	for _, item := range node.YNode().Content {
-		if !yaml.IsYNodeString(item) {
-			return fmt.Errorf("invalid value type expect a string")
-		}
-		newValue := expansion2.Expand(item.Value, f.MappingFunc)
-		updateNodeValue(item, newValue)
-	}
-	return nil
-}

api/filters/refvar/refvar_test.go

@@ -1,293 +0,0 @@
-package refvar
-
-import (
-	"strings"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	expansion2 "sigs.k8s.io/kustomize/api/internal/accumulator/expansion"
-	filtertest_test "sigs.k8s.io/kustomize/api/testutils/filtertest"
-	"sigs.k8s.io/kustomize/api/types"
-	"sigs.k8s.io/kustomize/kyaml/yaml"
-)
-
-func TestFilter(t *testing.T) {
-	replacementCounts := make(map[string]int)
-
-	testCases := map[string]struct {
-		input    string
-		expected string
-		filter   Filter
-	}{
-		"simple scalar": {
-			input: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-spec:
-  replicas: $(VAR)`,
-			expected: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-spec:
-  replicas: 5`,
-			filter: Filter{
-				MappingFunc: expansion2.MappingFuncFor(replacementCounts, map[string]interface{}{
-					"VAR": int64(5),
-				}),
-				FieldSpec: types.FieldSpec{Path: "spec/replicas"},
-			},
-		},
-		"non-string scalar": {
-			input: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-spec:
-  replicas: 1`,
-			expected: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-spec:
-  replicas: 1`,
-			filter: Filter{
-				MappingFunc: expansion2.MappingFuncFor(replacementCounts, map[string]interface{}{
-					"VAR": int64(5),
-				}),
-				FieldSpec: types.FieldSpec{Path: "spec/replicas"},
-			},
-		},
-		"wrong path": {
-			input: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-spec:
-  replicas: 1`,
-			expected: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-spec:
-  replicas: 1`,
-			filter: Filter{
-				MappingFunc: expansion2.MappingFuncFor(replacementCounts, map[string]interface{}{
-					"VAR": int64(5),
-				}),
-				FieldSpec: types.FieldSpec{Path: "a/b/c"},
-			},
-		},
-		"sequence": {
-			input: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-data:
-- $(FOO)
-- $(BAR)
-- $(BAZ)
-- $(FOO)+$(BAR)
-- $(BOOL)
-- $(FLOAT)`,
-			expected: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-data:
-- foo
-- bar
-- $(BAZ)
-- foo+bar
-- false
-- 1.23`,
-			filter: Filter{
-				MappingFunc: expansion2.MappingFuncFor(replacementCounts, map[string]interface{}{
-					"FOO":   "foo",
-					"BAR":   "bar",
-					"BOOL":  false,
-					"FLOAT": 1.23,
-				}),
-				FieldSpec: types.FieldSpec{Path: "data"},
-			},
-		},
-		"maps": {
-			input: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-data:
-  FOO: $(FOO)
-  BAR: $(BAR)
-  BAZ: $(BAZ)
-  PLUS: $(FOO)+$(BAR)`,
-			expected: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-data:
-  FOO: foo
-  BAR: bar
-  BAZ: $(BAZ)
-  PLUS: foo+bar`,
-			filter: Filter{
-				MappingFunc: expansion2.MappingFuncFor(replacementCounts, map[string]interface{}{
-					"FOO": "foo",
-					"BAR": "bar",
-				}),
-				FieldSpec: types.FieldSpec{Path: "data"},
-			},
-		},
-		"complicated case": {
-			input: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-data:
-  slice1:
-  - $(FOO)
-  slice2:
-    FOO: $(FOO)
-    BAR: $(BAR)
-    BOOL: false
-    INT: 0
-    SLICE:
-    - $(FOO)`,
-			expected: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-data:
-  slice1:
-  - $(FOO)
-  slice2:
-    FOO: foo
-    BAR: bar
-    BOOL: false
-    INT: 0
-    SLICE:
-    - $(FOO)`,
-			filter: Filter{
-				MappingFunc: expansion2.MappingFuncFor(replacementCounts, map[string]interface{}{
-					"FOO": "foo",
-					"BAR": "bar",
-				}),
-				FieldSpec: types.FieldSpec{Path: "data/slice2"},
-			},
-		},
-		"null value": {
-			input: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-data:
-  FOO: null`,
-			expected: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-data:
-  FOO: null`,
-			filter: Filter{
-				MappingFunc: expansion2.MappingFuncFor(replacementCounts, map[string]interface{}{}),
-				FieldSpec:   types.FieldSpec{Path: "data/FOO"},
-			},
-		},
-	}
-
-	for tn, tc := range testCases {
-		t.Run(tn, func(t *testing.T) {
-			if !assert.Equal(t,
-				strings.TrimSpace(tc.expected),
-				strings.TrimSpace(
-					filtertest_test.RunFilter(t, tc.input, tc.filter))) {
-				t.FailNow()
-			}
-		})
-	}
-}
-
-func TestFilterUnhappy(t *testing.T) {
-	replacementCounts := make(map[string]int)
-
-	testCases := map[string]struct {
-		input         string
-		expectedError string
-		filter        Filter
-	}{
-		"non-string in sequence": {
-			input: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-data:
-  slice:
-  - false`,
-			expectedError: `obj 'apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-  annotations:
-    config.kubernetes.io/index: '0'
-data:
-  slice:
-  - false
-' at path 'data/slice': invalid value type expect a string`,
-			filter: Filter{
-				MappingFunc: expansion2.MappingFuncFor(replacementCounts, map[string]interface{}{
-					"VAR": int64(5),
-				}),
-				FieldSpec: types.FieldSpec{Path: "data/slice"},
-			},
-		},
-		"invalid key in map": {
-			input: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-data:
-  1: str`,
-			expectedError: `obj 'apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dep
-  annotations:
-    config.kubernetes.io/index: '0'
-data:
-  1: str
-' at path 'data': invalid map key: 1, type: ` + yaml.NodeTagInt,
-			filter: Filter{
-				MappingFunc: expansion2.MappingFuncFor(replacementCounts, map[string]interface{}{
-					"VAR": int64(5),
-				}),
-				FieldSpec: types.FieldSpec{Path: "data"},
-			},
-		},
-	}
-
-	for tn, tc := range testCases {
-		t.Run(tn, func(t *testing.T) {
-			_, err := filtertest_test.RunFilterE(t, tc.input, tc.filter)
-			if !assert.EqualError(t, err, tc.expectedError) {
-				t.FailNow()
-			}
-		})
-	}
-}

api/filters/replicacount/example_test.go

@@ -33,8 +33,10 @@ spec:
 				Count: 42,
 				Name:  "instance",
 			},
-			FieldSpec: types.FieldSpec{
-				Path: "spec/template/replicas",
+			FsSlice: types.FsSlice{
+				{
+					Path: "spec/template/replicas",
+				},
 			},
 		}},
 		Outputs: []kio.Writer{kio.ByteWriter{Writer: os.Stdout}},

api/filters/replicacount/replicacount.go

@@ -3,8 +3,7 @@ package replicacount
 import (
 	"strconv"
 
-	"sigs.k8s.io/kustomize/api/filters/fieldspec"
-	"sigs.k8s.io/kustomize/api/filters/filtersutil"
+	"sigs.k8s.io/kustomize/api/filters/fsslice"
 	"sigs.k8s.io/kustomize/api/types"
 	"sigs.k8s.io/kustomize/kyaml/kio"
 	"sigs.k8s.io/kustomize/kyaml/yaml"
@@ -12,8 +11,10 @@ import (
 
 // Filter updates/sets replicas fields using the fieldSpecs
 type Filter struct {
-	Replica   types.Replica   `json:"replica,omitempty" yaml:"replica,omitempty"`
-	FieldSpec types.FieldSpec `json:"fieldSpec,omitempty" yaml:"fieldSpec,omitempty"`
+	Replica types.Replica `json:"replica,omitempty" yaml:"replica,omitempty"`
+
+	// FsSlice contains the FieldSpecs to locate the namespace field
+	FsSlice types.FsSlice `json:"fieldSpecs,omitempty" yaml:"fieldSpecs,omitempty"`
 }
 
 var _ kio.Filter = Filter{}
@@ -22,16 +23,27 @@ func (rc Filter) Filter(nodes []*yaml.RNode) ([]*yaml.RNode, error) {
 	return kio.FilterAll(yaml.FilterFunc(rc.run)).Filter(nodes)
 }
 
+// run processes each node individually.
 func (rc Filter) run(node *yaml.RNode) (*yaml.RNode, error) {
-	err := node.PipeE(fieldspec.Filter{
-		FieldSpec:  rc.FieldSpec,
+	meta, err := node.GetMeta()
+	if err != nil {
+		return nil, err
+	}
+
+	// only update resources where the name matches the Replica name.
+	if meta.Name != rc.Replica.Name {
+		return node, nil
+	}
+
+	err = node.PipeE(fsslice.Filter{
+		FsSlice:    rc.FsSlice,
 		SetValue:   rc.set,
 		CreateKind: yaml.ScalarNode, // replicas is a ScalarNode
-		CreateTag:  yaml.NodeTagInt,
+		CreateTag:  yaml.IntTag,
 	})
 	return node, err
 }
 
 func (rc Filter) set(node *yaml.RNode) error {
-	return filtersutil.SetScalar(strconv.FormatInt(rc.Replica.Count, 10))(node)
+	return fsslice.SetScalar(strconv.FormatInt(rc.Replica.Count, 10))(node)
 }

api/filters/replicacount/replicacount_test.go

@@ -5,16 +5,19 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"sigs.k8s.io/kustomize/api/internal/plugins/builtinconfig"
 	filtertest_test "sigs.k8s.io/kustomize/api/testutils/filtertest"
 	"sigs.k8s.io/kustomize/api/types"
 )
 
 func TestFilter(t *testing.T) {
+	var config = builtinconfig.MakeDefaultConfig()
 
 	testCases := map[string]struct {
 		input    string
 		expected string
 		filter   Filter
+		fsslice  types.FsSlice
 	}{
 		"update field": {
 			input: `
@@ -38,7 +41,11 @@ spec:
 					Name:  "dep",
 					Count: 42,
 				},
-				FieldSpec: types.FieldSpec{Path: "spec/replicas"},
+			},
+			fsslice: types.FsSlice{
+				{
+					Path: "spec/replicas",
+				},
 			},
 		},
 		"add field": {
@@ -66,7 +73,9 @@ spec:
 					Name:  "cus",
 					Count: 42,
 				},
-				FieldSpec: types.FieldSpec{
+			},
+			fsslice: types.FsSlice{
+				{
 					Path:               "spec/template/replicas",
 					CreateIfNotPresent: true,
 				},
@@ -99,7 +108,9 @@ spec:
 					Name:  "cus",
 					Count: 42,
 				},
-				FieldSpec: types.FieldSpec{
+			},
+			fsslice: types.FsSlice{
+				{
 					Path:               "spec/template/replicas",
 					CreateIfNotPresent: true,
 				},
@@ -129,7 +140,9 @@ spec:
 					Name:  "cus",
 					Count: 42,
 				},
-				FieldSpec: types.FieldSpec{
+			},
+			fsslice: types.FsSlice{
+				{
 					Path: "spec/template/replicas",
 				},
 			},
@@ -141,6 +154,7 @@ kind: Custom
 metadata:
   name: cus
 spec:
+  replicas: 5
   template:
     replicas: 5
 `,
@@ -150,6 +164,7 @@ kind: Custom
 metadata:
   name: cus
 spec:
+  replicas: 42
   template:
     replicas: 42
 `,
@@ -158,13 +173,21 @@ spec:
 					Name:  "cus",
 					Count: 42,
 				},
-				FieldSpec: types.FieldSpec{Path: "spec/template/replicas"},
+			},
+			fsslice: types.FsSlice{
+				{
+					Path: "spec/template/replicas",
+				},
+				{
+					Path: "spec/replicas",
+				},
 			},
 		},
 	}
 
 	for tn, tc := range testCases {
 		t.Run(tn, func(t *testing.T) {
+			tc.filter.FsSlice = append(config.Replicas, tc.fsslice...)
 			if !assert.Equal(t,
 				strings.TrimSpace(tc.expected),
 				strings.TrimSpace(

api/go.mod

@@ -1,6 +1,6 @@
 module sigs.k8s.io/kustomize/api
 
-go 1.14
+go 1.13
 
 require (
 	github.com/evanphx/json-patch v4.5.0+incompatible
@@ -10,13 +10,12 @@ require (
 	github.com/pkg/errors v0.8.1
 	github.com/stretchr/testify v1.4.0
 	github.com/yujunz/go-getter v1.4.1-lite
-	golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e
-	gopkg.in/yaml.v2 v2.3.0
-	gopkg.in/yaml.v3 v3.0.0-20200121175148-a6ecf24a6d71
+	golang.org/x/tools v0.0.0-20191010075000-0337d82405ff
+	gopkg.in/yaml.v2 v2.2.8
 	k8s.io/api v0.17.0
 	k8s.io/apimachinery v0.17.0
 	k8s.io/client-go v0.17.0
 	k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a
-	sigs.k8s.io/kustomize/kyaml v0.8.0
+	sigs.k8s.io/kustomize/kyaml v0.1.11
 	sigs.k8s.io/yaml v1.2.0
 )

api/go.sum

@@ -104,6 +104,7 @@ github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34
 github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg=
 github.com/go-openapi/jsonreference v0.17.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I=
 github.com/go-openapi/jsonreference v0.18.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I=
+github.com/go-openapi/jsonreference v0.19.2 h1:o20suLFB4Ri0tuzpWtyHlh7E7HnkqTNLq6aR6WVNS1w=
 github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc=
 github.com/go-openapi/jsonreference v0.19.3 h1:5cxNfTy0UVC3X8JL5ymxzyoUZmo8iZb+jeTWn7tUa8o=
 github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8=
@@ -166,6 +167,7 @@ github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7a
 github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
 github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d h1:3PaI8p3seN09VjbTYC/QWlUZdZ1qS1zGjy7LH2Wt07I=
 github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
@@ -239,7 +241,6 @@ github.com/hashicorp/go-safetemp v1.0.0/go.mod h1:oaerMy3BhqiTbVye6QuFhFtIceqFoD
 github.com/hashicorp/go-version v1.1.0 h1:bPIoEKD27tNdebFGGxxYwcL4nepeY4j1QP23PFRGzg0=
 github.com/hashicorp/go-version v1.1.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
-github.com/hashicorp/golang-lru v0.5.1 h1:0hERBMJE1eitiLkihrMvRVBYAkpHzc/J3QdDN+dAcgU=
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
@@ -280,6 +281,7 @@ github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN
 github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
+github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e h1:hB2xlXdHp/pmPZq0y3QnmWAArdw9PqbmotexnWx/FU8=
 github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.7.0 h1:aizVhC/NAAcKWb+5QsU1iNOZb4Yws5UO2I+aIprQITM=
 github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs=
@@ -307,8 +309,6 @@ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lN
 github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI=
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8=
-github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 h1:n6/2gBQ3RWajuToeY6ZtZTIKv2v7ThUy5KKusIT0yc0=
-github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00/go.mod h1:Pm3mSP3c5uWn86xMLZ5Sa7JB9GsEZySvHYXCTK4E9q4=
 github.com/mozilla/tls-observatory v0.0.0-20190404164649-a3c1b6cfecfd/go.mod h1:SrKMQvPiws7F7iqYp8/TX+IhxCYhzr6N/1yb8cwHsGk=
 github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
@@ -343,7 +343,6 @@ github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y8
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
-github.com/qri-io/starlib v0.4.2-0.20200213133954-ff2e8cd5ef8d h1:K6eOUihrFLdZjZnA4XlRp864fmWXv9YTIk7VPLhRacA=
 github.com/qri-io/starlib v0.4.2-0.20200213133954-ff2e8cd5ef8d/go.mod h1:7DPO4domFU579Ga6E61sB9VFNaniPVwJP5C4bBCu3wA=
 github.com/quasilyte/go-consistent v0.0.0-20190521200055-c6f3937de18c/go.mod h1:5STLWrekHfjyYwxBRVRXNOSewLJ3PWfDJd1VyTS21fI=
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
@@ -374,6 +373,7 @@ github.com/spf13/afero v1.2.2 h1:5jhuqJyZCZf2JRofRvN/nIFgIWNzPa3/Vz8mYylgbWc=
 github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=
 github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8=
 github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
+github.com/spf13/cobra v0.0.5 h1:f0B+LkLX6DtmRH1isoNA9VTtNUK9K8xYd28JNNfOv/s=
 github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU=
 github.com/spf13/cobra v1.0.0 h1:6m/oheQuQ13N9ks4hubMG6BnvwOeaJrqSPLahSnczz8=
 github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE=
@@ -427,7 +427,6 @@ go.mongodb.org/mongo-driver v1.1.1/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qL
 go.mongodb.org/mongo-driver v1.1.2/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 go.starlark.net v0.0.0-20190528202925-30ae18b8564f/go.mod h1:c1/X6cHgvdXj6pUlmWKMkuqRnW4K8x2vwt6JAaaircg=
-go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 h1:+FNtrFTmVw0YZGpBGX56XDee331t6JAXeK2bcyhLOOc=
 go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5/go.mod h1:nmDLcffg48OtT/PSW0Hg7FvpRQsQh5OSqIylirxKC7o=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
@@ -441,7 +440,6 @@ golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190617133340-57b3e21c3d56/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392 h1:ACG4HJsFiNMf47Y4PeRoebLNy/2lXT9EtprMuTFWt1M=
 golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -470,9 +468,10 @@ golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20191004110552-13f9640d40b9 h1:rjwSpXsdiK0dV8/Naq3kAw9ymfAeJIyd0upUIElB+lI=
 golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200226121028-0de0cce0169b h1:0mm1VjtFUOIlE1SbDlwjYaDxZVDP2S5ou6y0gSgXHu8=
+golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 h1:SVwTIAaPC2U/AvvLNZ2a7OVsmBpC8L5BlwK1whH3hm0=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -494,6 +493,7 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190922100055-0a153f010e69 h1:rOhMmluY6kLMhdnrivzec6lLgaVbMHMn2ISQXJeJ5EM=
 golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191002063906-3421d5a6bb1c h1:Vco5b+cuG5NNfORVxZy6bYZQ7rsigisU1WQFkvQ0L5E=
 golang.org/x/sys v0.0.0-20191002063906-3421d5a6bb1c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -503,7 +503,6 @@ golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3
 golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 h1:SvFZT6jyqRaOeXpc5h/JSfZenJ2O330aBsf7JfSUXmQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -528,8 +527,6 @@ golang.org/x/tools v0.0.0-20190910044552-dd2b5c81c578/go.mod h1:b+2E5dAYhXwXZwtn
 golang.org/x/tools v0.0.0-20190930201159-7c411dea38b0/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191010075000-0337d82405ff h1:XdBG6es/oFDr1HwaxkxgVve7NB281QhxgK/i4voubFs=
 golang.org/x/tools v0.0.0-20191010075000-0337d82405ff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e h1:aZzprAO9/8oim3qStq3wc1Xuxx4QmAGriC4VU4ojemQ=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
@@ -556,13 +553,14 @@ gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWD
 gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.7 h1:VUgggvou5XRW9mHwD/yXxIYSMtY0zoKQf/v226p2nyo=
+gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
-gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v3 v3.0.0-20200121175148-a6ecf24a6d71 h1:Xe2gvTZUJpsvOWUnvmL/tmhVBZUmHSvLbMjRj6NUUKo=
-gopkg.in/yaml.v3 v3.0.0-20200121175148-a6ecf24a6d71/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.0-20191120175047-4206685974f2 h1:XZx7nhd5GMaZpmDaEHFVafUZC7ya0fuo7cSJ3UCKYmM=
+gopkg.in/yaml.v3 v3.0.0-20191120175047-4206685974f2/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.1-2019.2.3 h1:3JgtbtFHMiCmsznwGVTUWbgGov+pVqnlf1dEJTNAXeM=
@@ -580,7 +578,6 @@ k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8=
 k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
 k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a h1:UcxjrRMyNx/i/y8G7kPvLyy7rfbeuf1PYyBf973pgyU=
 k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E=
-k8s.io/utils v0.0.0-20191114184206-e782cd3c129f h1:GiPwtSzdP43eI1hpPCbROQCCIgCuiMMNF8YUVLF3vJo=
 k8s.io/utils v0.0.0-20191114184206-e782cd3c129f/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
 mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed h1:WX1yoOaKQfddO/mLzdV4wptyWgoH/6hwLs7QHTixo0I=
 mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed/go.mod h1:Xkxe497xwlCKkIaQYRfC7CSLworTXY9RMqwhhCm+8Nc=
@@ -588,9 +585,10 @@ mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b h1:DxJ5nJdkhDlLok9K6qO+5290kphD
 mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b/go.mod h1:2odslEg/xrtNQqCYg2/jCoyKnw3vv5biOc3JnIcYfL4=
 mvdan.cc/unparam v0.0.0-20190720180237-d51796306d8f h1:Cq7MalBHYACRd6EesksG1Q8EoIAKOsiZviGKbOLIej4=
 mvdan.cc/unparam v0.0.0-20190720180237-d51796306d8f/go.mod h1:4G1h5nDURzA3bwVMZIVpwbkw+04kSxk3rAtzlimaUJw=
-sigs.k8s.io/kustomize/kyaml v0.8.0 h1:/MqPML99XAm2pbrD/eTpePh5rnU5bpnuTPqb29LpSz4=
-sigs.k8s.io/kustomize/kyaml v0.8.0/go.mod h1:UTm64bSWVdBUA8EQoYCxVOaBQxUdIOr5LKWxA4GNbkw=
+sigs.k8s.io/kustomize/kyaml v0.1.11 h1:/VvWxVIgH5gG1K4A7trgbyLgO3tRBiAWNhLFVU1HEmo=
+sigs.k8s.io/kustomize/kyaml v0.1.11/go.mod h1:72/rLkSi+L/pHM1oCjwrf3ClU+tH5kZQvvdLSqIHwWU=
 sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI=
+sigs.k8s.io/yaml v1.1.0 h1:4A07+ZFc2wgJwo8YNlQpr1rVlgUDlxXHhPJciaPY5gs=
 sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
 sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q=
 sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=

api/hasher/hasher.go

@@ -8,8 +8,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"sort"
-
-	"sigs.k8s.io/kustomize/kyaml/yaml"
 )
 
 // SortArrayAndComputeHash sorts a string array and
@@ -52,105 +50,3 @@ func Encode(hex string) (string, error) {
 func Hash(data string) string {
 	return fmt.Sprintf("%x", sha256.Sum256([]byte(data)))
 }
-
-// HashRNode returns the hash value of input RNode
-func HashRNode(node *yaml.RNode) (string, error) {
-	// get node kind
-	kindNode, err := node.Pipe(yaml.FieldMatcher{Name: "kind"})
-	if err != nil {
-		return "", err
-	}
-	kind := kindNode.YNode().Value
-
-	// calculate hash for different kinds
-	encoded := ""
-	switch kind {
-	case "ConfigMap":
-		encoded, err = encodeConfigMap(node)
-	case "Secret":
-		encoded, err = encodeSecret(node)
-	default:
-		var encodedBytes []byte
-		encodedBytes, err = json.Marshal(node.YNode())
-		encoded = string(encodedBytes)
-	}
-	if err != nil {
-		return "", err
-	}
-	return Encode(Hash(encoded))
-}
-
-func getNodeValues(node *yaml.RNode, paths []string) (map[string]interface{}, error) {
-	values := make(map[string]interface{})
-	for _, p := range paths {
-		vn, err := node.Pipe(yaml.Lookup(p))
-		if err != nil {
-			return map[string]interface{}{}, err
-		}
-		if vn == nil {
-			values[p] = ""
-			continue
-		}
-		if vn.YNode().Kind != yaml.ScalarNode {
-			vs, err := vn.MarshalJSON()
-			if err != nil {
-				return map[string]interface{}{}, err
-			}
-			// data, binaryData and stringData are all maps
-			var v map[string]interface{}
-			json.Unmarshal(vs, &v)
-			values[p] = v
-		} else {
-			values[p] = vn.YNode().Value
-		}
-	}
-	return values, nil
-}
-
-// encodeConfigMap encodes a ConfigMap.
-// Data, Kind, and Name are taken into account.
-// BinaryData is included if it's not empty to avoid useless key in output.
-func encodeConfigMap(node *yaml.RNode) (string, error) {
-	// get fields
-	paths := []string{"metadata/name", "data", "binaryData"}
-	values, err := getNodeValues(node, paths)
-	if err != nil {
-		return "", err
-	}
-	m := map[string]interface{}{"kind": "ConfigMap", "name": values["metadata/name"],
-		"data": values["data"]}
-	if _, ok := values["binaryData"].(map[string]interface{}); ok {
-		m["binaryData"] = values["binaryData"]
-	}
-
-	// json.Marshal sorts the keys in a stable order in the encoding
-	data, err := json.Marshal(m)
-	if err != nil {
-		return "", err
-	}
-	return string(data), nil
-}
-
-// encodeSecret encodes a Secret.
-// Data, Kind, Name, and Type are taken into account.
-// StringData is included if it's not empty to avoid useless key in output.
-func encodeSecret(node *yaml.RNode) (string, error) {
-	// get fields
-	paths := []string{"type", "metadata/name", "data", "stringData"}
-	values, err := getNodeValues(node, paths)
-	if err != nil {
-		return "", err
-	}
-	m := map[string]interface{}{"kind": "Secret", "type": values["type"],
-		"name": values["metadata/name"], "data": values["data"]}
-	if _, ok := values["stringData"].(map[string]interface{}); ok {
-		m["stringData"] = values["stringData"]
-	}
-
-	// json.Marshal sorts the keys in a stable order in the encoding
-	data, err := json.Marshal(m)
-	if err != nil {
-		return "", err
-	}
-	return string(data), nil
-}

api/hasher/hasher_test.go

@@ -1,13 +1,12 @@
 // Copyright 2019 The Kubernetes Authors.
 // SPDX-License-Identifier: Apache-2.0
 
-package hasher
+package hasher_test
 
 import (
-	"strings"
 	"testing"
 
-	"sigs.k8s.io/kustomize/kyaml/yaml"
+	. "sigs.k8s.io/kustomize/api/hasher"
 )
 
 func TestSortArrayAndComputeHash(t *testing.T) {
@@ -40,314 +39,3 @@ func TestHash(t *testing.T) {
 		t.Errorf("expected hash %q but got %q", expect, sum)
 	}
 }
-
-func TestConfigMapHash(t *testing.T) {
-	cases := []struct {
-		desc   string
-		cmYaml string
-		hash   string
-		err    string
-	}{
-		// empty map
-		{"empty data", `
-apiVersion: v1
-kind: ConfigMap`, "6ct58987ht", ""},
-		// one key
-		{"one key", `
-apiVersion: v1
-kind: ConfigMap
-data: 
-  one: ""`, "9g67k2htb6", ""},
-		// three keys (tests sorting order)
-		{"three keys", `
-apiVersion: v1
-kind: ConfigMap
-data:
-  two: 2
-  one: ""
-  three: 3`, "7757f9kkct", ""},
-		// empty binary data map
-		{"empty binary data", `
-apiVersion: v1
-kind: ConfigMap`, "6ct58987ht", ""},
-		// one key with binary data
-		{"one key with binary data", `
-apiVersion: v1
-kind: ConfigMap
-binaryData:
-  one: ""`, "6mtk2m274t", ""},
-		// three keys with binary data (tests sorting order)
-		{"three keys with binary data", `
-apiVersion: v1
-kind: ConfigMap
-binaryData:
-  two: 2
-  one: ""
-  three: 3`, "9th7kc28dg", ""},
-		// two keys, one with string and another with binary data
-		{"two keys with one each", `
-apiVersion: v1
-kind: ConfigMap
-data:
-  one: ""
-binaryData:
-  two: ""`, "698h7c7t9m", ""},
-	}
-
-	for _, c := range cases {
-		node, err := yaml.Parse(c.cmYaml)
-		if err != nil {
-			t.Fatal(err)
-		}
-		h, err := HashRNode(node)
-		if SkipRest(t, c.desc, err, c.err) {
-			continue
-		}
-		if c.hash != h {
-			t.Errorf("case %q, expect hash %q but got %q", c.desc, c.hash, h)
-		}
-	}
-}
-
-func TestSecretHash(t *testing.T) {
-	cases := []struct {
-		desc       string
-		secretYaml string
-		hash       string
-		err        string
-	}{
-		// empty map
-		{"empty data", `
-apiVersion: v1
-kind: Secret
-type: my-type`, "5gmgkf8578", ""},
-		// one key
-		{"one key", `
-apiVersion: v1
-kind: Secret
-type: my-type
-data:
-  one: ""`, "74bd68bm66", ""},
-		// three keys (tests sorting order)
-		{"three keys", `
-apiVersion: v1
-kind: Secret
-type: my-type
-data:
-  two: 2
-  one: ""
-  three: 3`, "4gf75c7476", ""},
-		// with stringdata
-		{"stringdata", `
-apiVersion: v1
-kind: Secret
-type: my-type
-data:
-  one: ""
-stringData:
-  two: 2`, "c4h4264gdb", ""},
-		// empty stringdata
-		{"empty stringdata", `
-apiVersion: v1
-kind: Secret
-type: my-type
-data:
-  one: ""`, "74bd68bm66", ""},
-	}
-
-	for _, c := range cases {
-		node, err := yaml.Parse(c.secretYaml)
-		if err != nil {
-			t.Fatal(err)
-		}
-		h, err := HashRNode(node)
-		if SkipRest(t, c.desc, err, c.err) {
-			continue
-		}
-		if c.hash != h {
-			t.Errorf("case %q, expect hash %q but got %q", c.desc, c.hash, h)
-		}
-	}
-}
-
-func TestUnstructuredHash(t *testing.T) {
-	cases := []struct {
-		desc         string
-		unstructured string
-		hash         string
-		err          string
-	}{
-		{"minimal", `
-apiVersion: test/v1
-kind: TestResource
-metadata:
-  name: my-resource`, "244782mkb7", ""},
-		{"with spec", `
-apiVersion: test/v1
-kind: TestResource
-metadata:
-  name: my-resource
-spec:
-  foo: 1
-  bar: abc`, "59m2mdccg4", ""},
-	}
-
-	for _, c := range cases {
-		node, err := yaml.Parse(c.unstructured)
-		if err != nil {
-			t.Fatal(err)
-		}
-		h, err := HashRNode(node)
-		if SkipRest(t, c.desc, err, c.err) {
-			continue
-		}
-		if c.hash != h {
-			t.Errorf("case %q, expect hash %q but got %q", c.desc, c.hash, h)
-		}
-	}
-}
-
-func TestEncodeConfigMap(t *testing.T) {
-	cases := []struct {
-		desc   string
-		cmYaml string
-		expect string
-		err    string
-	}{
-		// empty map
-		{"empty data", `
-apiVersion: v1
-kind: ConfigMap`, `{"data":"","kind":"ConfigMap","name":""}`, ""},
-		// one key
-		{"one key", `
-apiVersion: v1
-kind: ConfigMap
-data: 
-  one: ""`, `{"data":{"one":""},"kind":"ConfigMap","name":""}`, ""},
-		// three keys (tests sorting order)
-		{"three keys", `
-apiVersion: v1
-kind: ConfigMap
-data:
-  two: 2
-  one: ""
-  three: 3`, `{"data":{"one":"","three":3,"two":2},"kind":"ConfigMap","name":""}`, ""},
-		// empty binary map
-		{"empty data", `
-apiVersion: v1
-kind: ConfigMap`, `{"data":"","kind":"ConfigMap","name":""}`, ""},
-		// one key with binary data
-		{"one key", `
-apiVersion: v1
-kind: ConfigMap
-binaryData:
-  one: ""`, `{"binaryData":{"one":""},"data":"","kind":"ConfigMap","name":""}`, ""},
-		// three keys with binary data (tests sorting order)
-		{"three keys", `
-apiVersion: v1
-kind: ConfigMap
-binaryData:
-  two: 2
-  one: ""
-  three: 3`, `{"binaryData":{"one":"","three":3,"two":2},"data":"","kind":"ConfigMap","name":""}`, ""},
-		// two keys, one string and one binary values
-		{"two keys with one each", `
-apiVersion: v1
-kind: ConfigMap
-data:
-  one: ""
-binaryData:
-  two: ""`, `{"binaryData":{"two":""},"data":{"one":""},"kind":"ConfigMap","name":""}`, ""},
-	}
-	for _, c := range cases {
-		node, err := yaml.Parse(c.cmYaml)
-		if err != nil {
-			t.Fatal(err)
-		}
-		s, err := encodeConfigMap(node)
-		if SkipRest(t, c.desc, err, c.err) {
-			continue
-		}
-		if s != c.expect {
-			t.Errorf("case %q, expect %q but got %q from encode %#v", c.desc, c.expect, s, c.cmYaml)
-		}
-	}
-}
-
-func TestEncodeSecret(t *testing.T) {
-	cases := []struct {
-		desc       string
-		secretYaml string
-		expect     string
-		err        string
-	}{
-		// empty map
-		{"empty data", `
-apiVersion: v1
-kind: Secret
-type: my-type`, `{"data":"","kind":"Secret","name":"","type":"my-type"}`, ""},
-		// one key
-		{"one key", `
-apiVersion: v1
-kind: Secret
-type: my-type
-data:
-  one: ""`, `{"data":{"one":""},"kind":"Secret","name":"","type":"my-type"}`, ""},
-		// three keys (tests sorting order) - note json.Marshal base64 encodes the values because they come in as []byte
-		{"three keys", `
-apiVersion: v1
-kind: Secret
-type: my-type
-data:
-  two: 2
-  one: ""
-  three: 3`, `{"data":{"one":"","three":3,"two":2},"kind":"Secret","name":"","type":"my-type"}`, ""},
-		// with stringdata
-		{"stringdata", `
-apiVersion: v1
-kind: Secret
-type: my-type
-data:
-  one: ""
-stringData:
-  two: 2`, `{"data":{"one":""},"kind":"Secret","name":"","stringData":{"two":2},"type":"my-type"}`, ""},
-		// empty stringdata
-		{"empty stringdata", `
-apiVersion: v1
-kind: Secret
-type: my-type
-data:
-  one: ""`, `{"data":{"one":""},"kind":"Secret","name":"","type":"my-type"}`, ""},
-	}
-	for _, c := range cases {
-		node, err := yaml.Parse(c.secretYaml)
-		if err != nil {
-			t.Fatal(err)
-		}
-		s, err := encodeSecret(node)
-		if SkipRest(t, c.desc, err, c.err) {
-			continue
-		}
-		if s != c.expect {
-			t.Errorf("case %q, expect %q but got %q from encode %#v", c.desc, c.expect, s, c.secretYaml)
-		}
-	}
-}
-
-// SkipRest returns true if there was a non-nil error or if we expected an error that didn't happen,
-// and logs the appropriate error on the test object.
-// The return value indicates whether we should skip the rest of the test case due to the error result.
-func SkipRest(t *testing.T, desc string, err error, contains string) bool {
-	if err != nil {
-		if len(contains) == 0 {
-			t.Errorf("case %q, expect nil error but got %q", desc, err.Error())
-		} else if !strings.Contains(err.Error(), contains) {
-			t.Errorf("case %q, expect error to contain %q but got %q", desc, contains, err.Error())
-		}
-		return true
-	} else if len(contains) > 0 {
-		t.Errorf("case %q, expect error to contain %q but got nil error", desc, contains)
-		return true
-	}
-	return false
-}

api/ifc/ifc.go

@@ -38,69 +38,36 @@ type Loader interface {
 	Cleanup() error
 }
 
-// Kunstructured represents a Kubernetes Resource Model object.
+// Kunstructured allows manipulation of k8s objects
+// that do not have Golang structs.
 type Kunstructured interface {
-	// Several uses.
-	Copy() Kunstructured
-
-	// Used by Resource.Replace, which in turn is used in many places, e.g.
-	//  - resource.Resource.Merge
-	//  - resWrangler.appendReplaceOrMerge (AbsorbAll)
-	//  - api.internal.k8sdeps.transformer.patch.conflictdetector
-	GetAnnotations() map[string]string
-
-	// Used by ResAccumulator and ReplacementTransformer.
-	GetFieldValue(string) (interface{}, error)
-
-	// Used by Resource.OrgId
-	GetGvk() resid.Gvk
-
-	// Used by resource.Factory.SliceFromBytes
-	GetKind() string
-
-	// Used by Resource.Replace
-	GetLabels() map[string]string
-
-	// Used by Resource.CurId and resource factory.
-	GetName() string
-
-	// Used by special case code in
-	// ResMap.SubsetThatCouldBeReferencedByResource
-	GetSlice(path string) ([]interface{}, error)
-
-	// GetString returns the value of a string field.
-	// Used by Resource.GetNamespace
-	GetString(string) (string, error)
-
-	// Several uses.
 	Map() map[string]interface{}
-
-	// Used by Resource.AsYAML and Resource.String
+	SetMap(map[string]interface{})
+	Copy() Kunstructured
+	GetFieldValue(string) (interface{}, error)
+	GetString(string) (string, error)
+	GetStringSlice(string) ([]string, error)
+	GetBool(path string) (bool, error)
+	GetFloat64(path string) (float64, error)
+	GetInt64(path string) (int64, error)
+	GetSlice(path string) ([]interface{}, error)
+	GetStringMap(path string) (map[string]string, error)
+	GetMap(path string) (map[string]interface{}, error)
 	MarshalJSON() ([]byte, error)
-
-	// Used by resWrangler.Select
-	MatchesAnnotationSelector(selector string) (bool, error)
-
-	// Used by resWrangler.Select
-	MatchesLabelSelector(selector string) (bool, error)
-
-	// Used by Resource.Replace.
-	SetAnnotations(map[string]string)
-
-	// Used by PatchStrategicMergeTransformer.
-	SetGvk(resid.Gvk)
-
-	// Used by Resource.Replace and used to remove "validated by" labels.
-	SetLabels(map[string]string)
-
-	// Used by Resource.Replace.
-	SetName(string)
-
-	// Used by Resource.Replace.
-	SetNamespace(string)
-
-	// Needed, for now, by kyaml/filtersutil.ApplyToJSON.
 	UnmarshalJSON([]byte) error
+	GetGvk() resid.Gvk
+	SetGvk(resid.Gvk)
+	GetKind() string
+	GetName() string
+	SetName(string)
+	SetNamespace(string)
+	GetLabels() map[string]string
+	SetLabels(map[string]string)
+	GetAnnotations() map[string]string
+	SetAnnotations(map[string]string)
+	MatchesLabelSelector(selector string) (bool, error)
+	MatchesAnnotationSelector(selector string) (bool, error)
+	Patch(Kunstructured) error
 }
 
 // KunstructuredFactory makes instances of Kunstructured.

api/internal/accumulator/namereferencetransformer.go

@@ -4,12 +4,14 @@
 package accumulator
 
 import (
+	"fmt"
 	"log"
 
-	"sigs.k8s.io/kustomize/api/filters/nameref"
 	"sigs.k8s.io/kustomize/api/internal/plugins/builtinconfig"
+	"sigs.k8s.io/kustomize/api/resid"
 	"sigs.k8s.io/kustomize/api/resmap"
-	"sigs.k8s.io/kustomize/kyaml/filtersutil"
+	"sigs.k8s.io/kustomize/api/resource"
+	"sigs.k8s.io/kustomize/api/transform"
 )
 
 type nameReferenceTransformer struct {
@@ -84,12 +86,16 @@ func (o *nameReferenceTransformer) Transform(m resmap.ResMap) error {
 					if candidates == nil {
 						candidates = m.SubsetThatCouldBeReferencedByResource(referrer)
 					}
-					err := filtersutil.ApplyToJSON(nameref.Filter{
-						FieldSpec:          fSpec,
-						Referrer:           referrer,
-						Target:             target.Gvk,
-						ReferralCandidates: candidates,
-					}, referrer)
+					err := transform.MutateField(
+						referrer.Map(),
+						fSpec.PathSlice(),
+						fSpec.CreateIfNotPresent,
+						o.getNewNameFunc(
+							// referrer could be an HPA instance,
+							// target could be Gvk for Deployment,
+							// candidate a list of resources "reachable"
+							// from the HPA.
+							referrer, target.Gvk, candidates))
 					if err != nil {
 						return err
 					}
@@ -99,3 +105,165 @@ func (o *nameReferenceTransformer) Transform(m resmap.ResMap) error {
 	}
 	return nil
 }
+
+// selectReferral picks the referral among a subset of candidates.
+// It returns the current name and namespace of the selected candidate.
+// Note that the content of the referricalCandidateSubset slice is most of the time
+// identical to the referralCandidates resmap. Still in some cases, such
+// as ClusterRoleBinding, the subset only contains the resources of a specific
+// namespace.
+func (o *nameReferenceTransformer) selectReferral(
+	oldName string,
+	referrer *resource.Resource,
+	target resid.Gvk,
+	referralCandidates resmap.ResMap,
+	referralCandidateSubset []*resource.Resource) (interface{}, interface{}, error) {
+
+	for _, res := range referralCandidateSubset {
+		id := res.OrgId()
+		if id.IsSelected(&target) && res.GetOriginalName() == oldName {
+			matches := referralCandidates.GetMatchingResourcesByOriginalId(id.Equals)
+			// If there's more than one match, there's no way
+			// to know which one to pick, so emit error.
+			if len(matches) > 1 {
+				return nil, nil, fmt.Errorf(
+					"multiple matches for %s:\n  %v",
+					id, getIds(matches))
+			}
+			// In the resource, note that it is referenced
+			// by the referrer.
+			res.AppendRefBy(referrer.CurId())
+			// Return transformed name of the object,
+			// complete with prefixes, hashes, etc.
+			return res.GetName(), res.GetNamespace(), nil
+		}
+	}
+
+	return oldName, nil, nil
+}
+
+// utility function to replace a simple string by the new name
+func (o *nameReferenceTransformer) getSimpleNameField(
+	oldName string,
+	referrer *resource.Resource,
+	target resid.Gvk,
+	referralCandidates resmap.ResMap,
+	referralCandidateSubset []*resource.Resource) (interface{}, error) {
+
+	newName, _, err := o.selectReferral(oldName, referrer, target,
+		referralCandidates, referralCandidateSubset)
+
+	return newName, err
+}
+
+// utility function to replace name field within a map[string]interface{}
+// and leverage the namespace field.
+func (o *nameReferenceTransformer) getNameAndNsStruct(
+	inMap map[string]interface{},
+	referrer *resource.Resource,
+	target resid.Gvk,
+	referralCandidates resmap.ResMap) (interface{}, error) {
+
+	// Example:
+	if _, ok := inMap["name"]; !ok {
+		return nil, fmt.Errorf(
+			"%#v is expected to contain a name field", inMap)
+	}
+	oldName, ok := inMap["name"].(string)
+	if !ok {
+		return nil, fmt.Errorf(
+			"%#v is expected to contain a name field of type string", oldName)
+	}
+
+	subset := referralCandidates.Resources()
+	if namespacevalue, ok := inMap["namespace"]; ok {
+		namespace := namespacevalue.(string)
+		bynamespace := referralCandidates.GroupedByOriginalNamespace()
+		if _, ok := bynamespace[namespace]; !ok {
+			return inMap, nil
+		}
+		subset = bynamespace[namespace]
+	}
+
+	newname, newnamespace, err := o.selectReferral(oldName, referrer, target,
+		referralCandidates, subset)
+	if err != nil {
+		return nil, err
+	}
+
+	if (newname == oldName) && (newnamespace == nil) {
+		// no candidate found.
+		return inMap, nil
+	}
+
+	inMap["name"] = newname
+	if newnamespace != "" {
+		// We don't want value "" to replace value "default" since
+		// the empty string is handled as a wild card here not default namespace
+		// by kubernetes.
+		inMap["namespace"] = newnamespace
+	}
+	return inMap, nil
+
+}
+
+func (o *nameReferenceTransformer) getNewNameFunc(
+	referrer *resource.Resource,
+	target resid.Gvk,
+	referralCandidates resmap.ResMap) func(in interface{}) (interface{}, error) {
+	return func(in interface{}) (interface{}, error) {
+		switch thing := in.(type) {
+		case string:
+			return o.getSimpleNameField(thing, referrer, target,
+				referralCandidates, referralCandidates.Resources())
+		case map[string]interface{}:
+			// Kind: ValidatingWebhookConfiguration
+			// FieldSpec is webhooks/clientConfig/service
+			return o.getNameAndNsStruct(thing, referrer, target,
+				referralCandidates)
+		case []interface{}:
+			for idx, item := range thing {
+				switch value := item.(type) {
+				case string:
+					// Kind: Role/ClusterRole
+					// FieldSpec is rules.resourceNames
+					newName, err := o.getSimpleNameField(value, referrer, target,
+						referralCandidates, referralCandidates.Resources())
+					if err != nil {
+						return nil, err
+					}
+					thing[idx] = newName
+				case map[string]interface{}:
+					// Kind: RoleBinding/ClusterRoleBinding
+					// FieldSpec is subjects
+					// Note: The corresponding fieldSpec had been changed from
+					// from path: subjects/name to just path: subjects. This is
+					// what get mutatefield to request the mapping of the whole
+					// map containing namespace and name instead of just a simple
+					// string field containing the name
+					newMap, err := o.getNameAndNsStruct(value, referrer, target,
+						referralCandidates)
+					if err != nil {
+						return nil, err
+					}
+					thing[idx] = newMap
+				default:
+					return nil, fmt.Errorf(
+						"%#v is expected to be either a []string or a []map[string]interface{}", in)
+				}
+			}
+			return in, nil
+		default:
+			return nil, fmt.Errorf(
+				"%#v is expected to be either a string or a []interface{}", in)
+		}
+	}
+}
+
+func getIds(rs []*resource.Resource) []string {
+	var result []string
+	for _, r := range rs {
+		result = append(result, r.CurId().String()+"\n")
+	}
+	return result
+}

api/internal/accumulator/namereferencetransformer_test.go

@@ -520,7 +520,7 @@ func TestNameReferenceUnhappyRun(t *testing.T) {
 						},
 					},
 				}).ResMap(),
-			expectedErr: "cannot find field 'name' in node"},
+			expectedErr: "is expected to contain a name field"},
 	}
 
 	nrt := newNameReferenceTransformer(builtinconfig.MakeDefaultConfig().NameReference)

api/internal/accumulator/refvartransformer.go

@@ -4,12 +4,13 @@
 package accumulator
 
 import (
+	"fmt"
+
 	expansion2 "sigs.k8s.io/kustomize/api/internal/accumulator/expansion"
 
-	"sigs.k8s.io/kustomize/api/filters/refvar"
 	"sigs.k8s.io/kustomize/api/resmap"
+	"sigs.k8s.io/kustomize/api/transform"
 	"sigs.k8s.io/kustomize/api/types"
-	"sigs.k8s.io/kustomize/kyaml/filtersutil"
 )
 
 type refVarTransformer struct {
@@ -30,6 +31,59 @@ func newRefVarTransformer(
 	}
 }
 
+// replaceVars accepts as 'in' a string, or string array, which can have
+// embedded instances of $VAR style variables, e.g. a container command string.
+// The function returns the string with the variables expanded to their final
+// values.
+func (rv *refVarTransformer) replaceVars(in interface{}) (interface{}, error) {
+	switch vt := in.(type) {
+	case []interface{}:
+		var xs []interface{}
+		for _, a := range in.([]interface{}) {
+			x, ok := a.(string)
+			if !ok {
+				return nil, fmt.Errorf("expected array of strings, found %v", in)
+			}
+			xs = append(xs, expansion2.Expand(x, rv.mappingFunc))
+		}
+		return xs, nil
+	case map[string]interface{}:
+		inMap := in.(map[string]interface{})
+		xs := make(map[string]interface{}, len(inMap))
+		for k, v := range inMap {
+			s, ok := v.(string)
+			if !ok {
+				// This field can not contain a $(VAR) since it is not
+				// of string type. For instance .spec.replicas: 3 in
+				// a Deployment object
+				xs[k] = v
+			} else {
+				// This field can potentially contains a $(VAR) since it is
+				// of string type. For instance .spec.replicas: $(REPLICAS)
+				// in a Deployment object
+				xs[k] = expansion2.Expand(s, rv.mappingFunc)
+			}
+		}
+		return xs, nil
+	case interface{}:
+		s, ok := in.(string)
+		if !ok {
+			// This field can not contain a $(VAR) since it is not of string type.
+			return in, nil
+		}
+		// This field can potentially contain a $(VAR) since it is
+		// of string type.
+		return expansion2.Expand(s, rv.mappingFunc), nil
+	// staticcheck erroneously claims that `case nil`
+	// is unreachable here, so suppressing it.
+	//nolint:staticcheck
+	case nil:
+		return nil, nil
+	default:
+		return "", fmt.Errorf("invalid type encountered %T", vt)
+	}
+}
+
 // UnusedVars returns slice of Var names that were unused
 // after a Transform run.
 func (rv *refVarTransformer) UnusedVars() []string {
@@ -50,12 +104,12 @@ 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{
-				MappingFunc: rv.mappingFunc,
-				FieldSpec:   fieldSpec,
-			}, res)
-			if err != nil {
-				return err
+			if res.OrgId().IsSelected(&fieldSpec.Gvk) {
+				if err := transform.MutateField(
+					res.Map(), fieldSpec.PathSlice(),
+					false, rv.replaceVars); err != nil {
+					return err
+				}
 			}
 		}
 	}

api/internal/accumulator/refvartransformer_test.go

@@ -44,6 +44,7 @@ func TestRefVarTransformer(t *testing.T) {
 					{Gvk: resid.Gvk{Version: "v1", Kind: "ConfigMap"}, Path: "data/map"},
 					{Gvk: resid.Gvk{Version: "v1", Kind: "ConfigMap"}, Path: "data/slice"},
 					{Gvk: resid.Gvk{Version: "v1", Kind: "ConfigMap"}, Path: "data/interface"},
+					{Gvk: resid.Gvk{Version: "v1", Kind: "ConfigMap"}, Path: "data/nil"},
 					{Gvk: resid.Gvk{Version: "v1", Kind: "ConfigMap"}, Path: "data/num"},
 				},
 				res: resmaptest_test.NewRmBuilder(
@@ -62,7 +63,7 @@ func TestRefVarTransformer(t *testing.T) {
 								"item4": "$(BAZ)+$(BAZ)",
 								"item5": "$(BOO)",
 								"item6": "if $(BOO)",
-								"item7": int64(2019),
+								"item7": 2019,
 							},
 							"slice": []interface{}{
 								"$(FOO)",
@@ -73,7 +74,8 @@ func TestRefVarTransformer(t *testing.T) {
 								"if $(BOO)",
 							},
 							"interface": "$(FOO)",
-							"num":       int64(2019),
+							"nil":       nil,
+							"num":       2019,
 						}}).ResMap(),
 			},
 			expected: expected{
@@ -93,7 +95,7 @@ func TestRefVarTransformer(t *testing.T) {
 								"item4": "5+5",
 								"item5": true,
 								"item6": "if true",
-								"item7": int64(2019),
+								"item7": 2019,
 							},
 							"slice": []interface{}{
 								"replacementForFoo",
@@ -104,7 +106,8 @@ func TestRefVarTransformer(t *testing.T) {
 								"if true",
 							},
 							"interface": "replacementForFoo",
-							"num":       int64(2019),
+							"nil":       nil,
+							"num":       2019,
 						}}).ResMap(),
 				unused: []string{"BAR"},
 			},
@@ -128,41 +131,7 @@ func TestRefVarTransformer(t *testing.T) {
 							"slice": []interface{}{5}, // noticeably *not* a []string
 						}}).ResMap(),
 			},
-			errMessage: `obj '{"apiVersion": "v1", "data": {"slice": [5]}, "kind": "ConfigMap", "metadata": {"name": "cm1"}}
-' at path 'data/slice': invalid value type expect a string`,
-		},
-		{
-			description: "var replacement in nil",
-			given: given{
-				varMap: map[string]interface{}{},
-				fs: []types.FieldSpec{
-					{Gvk: resid.Gvk{Version: "v1", Kind: "ConfigMap"}, Path: "data/nil"},
-				},
-				res: resmaptest_test.NewRmBuilder(
-					t, resource.NewFactory(kunstruct.NewKunstructuredFactoryImpl())).
-					Add(map[string]interface{}{
-						"apiVersion": "v1",
-						"kind":       "ConfigMap",
-						"metadata": map[string]interface{}{
-							"name": "cm1",
-						},
-						"data": map[string]interface{}{
-							"nil": nil, // noticeably *not* a []string
-						}}).ResMap(),
-			},
-			expected: expected{
-				res: resmaptest_test.NewRmBuilder(
-					t, resource.NewFactory(kunstruct.NewKunstructuredFactoryImpl())).
-					Add(map[string]interface{}{
-						"apiVersion": "v1",
-						"kind":       "ConfigMap",
-						"metadata": map[string]interface{}{
-							"name": "cm1",
-						},
-						"data": map[string]interface{}{
-							"nil": nil, // noticeably *not* a []string
-						}}).ResMap(),
-			},
+			errMessage: "expected array of strings, found [5]",
 		},
 	}
 

api/internal/crawl/README.md

@@ -217,7 +217,7 @@ overview of each component with the following sections going into more details.
 
 The overall structure is outlined in the following figure:
 ![overview](
-https://github.com/kubernetes-sigs/kustomize/blob/master/api/internal/crawl/pictures/token_config.png)
+https://sigs.k8s.io/kustomize/internal/tools/pictures/sys_arch.png)
 
 #### Crawler
 The leftmost component consists of a crawler with an http cache of GitHub

api/internal/crawl/cmd/crawler/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.14 AS build
+FROM golang:1.11 AS build
 
 ARG GO111MODULE=on
 

api/internal/crawl/cmd/crawler/crawler.go

@@ -159,31 +159,40 @@ func main() {
 		}
 	}
 
-	query := []byte(`{ "query":{ "match_all":{} } }`)
-	it := idx.IterateQuery(query, 10000, 60*time.Second)
+	seedDocs := make(crawler.CrawlSeed, 0)
+
+	// get all the documents in the index
+	getSeedDocsFunc := func() {
+		query := []byte(`{ "query":{ "match_all":{} } }`)
+		it := idx.IterateQuery(query, 10000, 60*time.Second)
+		for it.Next() {
+			for _, hit := range it.Value().Hits.Hits {
+				seedDocs = append(seedDocs, hit.Document.Document.Copy())
+			}
+		}
+		if err := it.Err(); err != nil {
+			log.Fatalf("getSeedDocsFunc Error iterating: %v\n", err)
+		}
+	}
 
 	switch mode {
 	case CrawlIndexAndGithub:
+		getSeedDocsFunc()
 		crawlers := []crawler.Crawler{ghCrawlerConstructor("", "")}
-		crawler.CrawlFromSeedIterator(ctx, it, crawlers, docConverter, indexFunc, seen)
+		crawler.CrawlFromSeed(ctx, seedDocs, crawlers, docConverter, indexFunc, seen)
 		crawler.CrawlGithub(ctx, crawlers, docConverter, indexFunc, seen)
 	case CrawlIndex:
+		getSeedDocsFunc()
 		crawlers := []crawler.Crawler{ghCrawlerConstructor("", "")}
-		crawler.CrawlFromSeedIterator(ctx, it, crawlers, docConverter, indexFunc, seen)
+		crawler.CrawlFromSeed(ctx, seedDocs, crawlers, docConverter, indexFunc, seen)
 	case CrawlGithub:
 		crawlers := []crawler.Crawler{ghCrawlerConstructor("", "")}
 		// add all the documents in the index into seen.
 		// this greatly reduces the time overhead of CrawlGithub.
-		for it.Next() {
-			for _, hit := range it.Value().Hits.Hits {
-				d := hit.Document.Document
-				seen.Set(d.ID(), d.FileType)
-			}
+		getSeedDocsFunc()
+		for _, d := range seedDocs {
+			seen[d.ID()] = d.FileType
 		}
-		if err := it.Err(); err != nil {
-			log.Fatalf("Error iterating the index: %v\n", err)
-		}
-
 		crawler.CrawlGithub(ctx, crawlers, docConverter, indexFunc, seen)
 	case CrawlUser:
 		if *githubUserPtr == "" {

api/internal/crawl/config/elastic/service.yaml

@@ -0,0 +1,16 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: elasticsearch
+spec:
+  selector:
+    custom-resource: v1alpha1.ESCluster
+    custom-resource-name: esbasic
+    custom-resource-namespace: default
+    es/data: "true"
+    using: escluster.Cluster
+  ports:
+  - protocol: "TCP"
+    port: 9200
+  type: LoadBalancer
+  loadBalancerIP: ""

api/internal/crawl/crawler/crawler.go

@@ -213,36 +213,21 @@ func doCrawl(ctx context.Context, docsPtr *CrawlSeed, crawlers []Crawler, conv C
 	logger.Printf("\t%d documents cannot be converted but still were inserted or updated in the index\n", convErrCount)
 }
 
-// CrawlFromSeedIterator iterates all the documents in the index and call CrawlFromSeed for each document.
-func CrawlFromSeedIterator(ctx context.Context, it *index.KustomizeIterator, crawlers []Crawler,
-	conv Converter, indx IndexFunc, seen utils.SeenMap) {
-	docCount := 0
-	for it.Next() {
-		for _, hit := range it.Value().Hits.Hits {
-			docCount++
-			logger.Printf("updating document %d from seed\n", docCount)
-
-			singleSeed := CrawlSeed{&(hit.Document.Document)}
-			CrawlFromSeed(ctx, singleSeed, crawlers, conv, indx, seen)
-		}
-	}
-	if err := it.Err(); err != nil {
-		log.Fatalf("Error iterating the index: %v\n", err)
-	}
-}
-
 // CrawlFromSeed updates all the documents in seed, and crawls all the new
 // documents referred in the seed.
 func CrawlFromSeed(ctx context.Context, seed CrawlSeed, crawlers []Crawler,
 	conv Converter, indx IndexFunc, seen utils.SeenMap) {
 
-	// stack tracks the documents directly referred in the seed.
+	// stack tracks the documents directly referred in other documents.
 	stack := make(CrawlSeed, 0)
 
+	// Exploit seed to update bulk of corpus.
+	logger.Printf("updating %d documents from seed\n", len(seed))
 	// each unique document in seed will be crawled once.
 	doCrawl(ctx, &seed, crawlers, conv, indx, seen, &stack, true, false)
 
-	logger.Printf("crawling %d new documents referred by doc\n", len(stack))
+	// Traverse any new documents added while updating corpus.
+	logger.Printf("crawling %d new documents found in the seed\n", len(stack))
 	// While crawling each document in stack, the documents directly referred in the document
 	// will be added into stack.
 	// After this statement is done, stack will become empty.
@@ -312,6 +297,8 @@ func CrawlGithubRunner(ctx context.Context, output chan<- CrawledDocument,
 // CrawlGithub crawls all the kustomization files on Github.
 func CrawlGithub(ctx context.Context, crawlers []Crawler, conv Converter,
 	indx IndexFunc, seen utils.SeenMap) {
+	// stack tracks the documents directly referred in other documents.
+	stack := make(CrawlSeed, 0)
 
 	// ch is channel where all the crawlers sends the crawled documents to.
 	ch := make(chan CrawledDocument, 1<<10)
@@ -337,20 +324,7 @@ func CrawlGithub(ctx context.Context, crawlers []Crawler, conv Converter,
 					"%v could not match any crawler", cdoc))
 				continue
 			}
-
-			// stack tracks the documents directly referred in the document.
-			stack := make(CrawlSeed, 0)
-
 			addBranches(cdoc, match, indx, seen, &stack)
-
-			if len(stack) > 0 {
-				// here the documents referred in a kustomization file are crawled separately,
-				// to avoid accumulating all the referred documents into a single gigantic
-				// mem-inentive stack.
-				logger.Printf("crawling the %d new documents referred in doc %d",
-					len(stack), docCount)
-				doCrawl(ctx, &stack, crawlers, conv, indx, seen, &stack, false, true)
-			}
 		}
 	}()
 
@@ -362,4 +336,9 @@ func CrawlGithub(ctx context.Context, crawlers []Crawler, conv Converter,
 	}
 	close(ch)
 	wg.Wait()
+
+	// Handle deps of newly discovered documents.
+	logger.Printf("crawling the %d new documents referred by other documents",
+		len(stack))
+	doCrawl(ctx, &stack, crawlers, conv, indx, seen, &stack, false, true)
 }

api/internal/crawl/crawler/github/crawler.go

@@ -82,15 +82,14 @@ func (gc githubCrawler) Crawl(ctx context.Context,
 
 	ranges := []RangeWithin{
 		RangeWithin{
-			start: uint64(0),
-			end:   githubMaxFileSize,
-		},
+		start: uint64(0),
+		end:   githubMaxFileSize,
+	},
 	}
 
 	errs := make(multiError, 0)
 	for len(ranges) > 0 {
-		logger.Printf("Current ranges: %v (len: %d)\n", ranges, len(ranges))
-		tailRange := ranges[len(ranges)-1]
+		tailRange := ranges[len(ranges) - 1]
 		ranges = ranges[:(len(ranges) - 1)]
 		reProcessQueryRanges, err := gc.CrawlSingleRange(ctx, output, seen, tailRange.start, tailRange.end)
 		if err != nil {
@@ -152,15 +151,7 @@ func (gc githubCrawler) CrawlSingleRange(ctx context.Context,
 		}
 		queryResult.Add(rangeResult)
 		if reProcessQuery {
-			// if the size of a range is 0, such as [245, 245], and reProcessQuery is true,
-			// it means that there are more than 1000 results for the query range.
-			// Reprocessing the query range will not help because the GitHub Search API
-			// only provides up to 1,000 results for each search.
-			if RangeSizes(query).Size() == 0 {
-				logger.Printf("range size is 0 includes more than 1000 results: %s", query)
-			} else {
-				reProcessQueryRanges = append(reProcessQueryRanges, RangeSizes(query))
-			}
+			reProcessQueryRanges = append(reProcessQueryRanges, RangeSizes(query))
 		}
 	}
 

api/internal/crawl/crawler/github/queries.go

@@ -225,7 +225,3 @@ type RangeWithin struct {
 func (r RangeWithin) RangeString() string {
 	return fmt.Sprintf("%d..%d", r.start, r.end)
 }
-
-func (r RangeWithin) Size() uint64 {
-	return r.end - r.start
-}

api/internal/crawl/go.mod

@@ -1,6 +1,6 @@
 module sigs.k8s.io/kustomize/api/internal/crawl
 
-go 1.14
+go 1.13
 
 require (
 	github.com/elastic/go-elasticsearch/v6 v6.8.5

api/internal/crawl/go.sum

@@ -16,10 +16,8 @@ github.com/OpenPeeDeeP/depguard v1.0.1/go.mod h1:xsIw86fROiiwelg+jB2uM9PiKihMMmU
 github.com/PuerkitoBio/goquery v1.5.0/go.mod h1:qD2PgZ9lccMbQlc7eEOjaeRlFQON7xY8kdmcsrnKqMg=
 github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
 github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
-github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tNFfI=
 github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
 github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
-github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M=
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
 github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg=
 github.com/agnivade/levenshtein v1.0.1/go.mod h1:CURSv5d9Uaml+FovSIICkLbAUZ9S4RqaHDIsdSBg7lM=
@@ -74,7 +72,6 @@ github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeME
 github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
 github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
 github.com/go-critic/go-critic v0.3.5-0.20190904082202-d79a9f0c64db/go.mod h1:+sE8vrLDS2M0pZkBk0wy6+nLdKexVDrl/jBqQOTDThA=
-github.com/go-errors/errors v1.0.1 h1:LUHzmkK3GUKUrL/1gfBUxAHzcev3apQlezX/+O7ma6w=
 github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-lintpack/lintpack v0.5.2/go.mod h1:NwZuYi2nUHho8XEIZ6SIxihrnPoqBTDqfpXvXAN0sXM=
@@ -94,13 +91,11 @@ github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+
 github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M=
 github.com/go-openapi/jsonpointer v0.18.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M=
 github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg=
-github.com/go-openapi/jsonpointer v0.19.3 h1:gihV7YNZK1iK6Tgwwsxo2rJbD1GTbdm72325Bq8FI3w=
 github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
 github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg=
 github.com/go-openapi/jsonreference v0.17.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I=
 github.com/go-openapi/jsonreference v0.18.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I=
 github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc=
-github.com/go-openapi/jsonreference v0.19.3 h1:5cxNfTy0UVC3X8JL5ymxzyoUZmo8iZb+jeTWn7tUa8o=
 github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8=
 github.com/go-openapi/loads v0.17.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU=
 github.com/go-openapi/loads v0.18.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU=
@@ -115,7 +110,6 @@ github.com/go-openapi/spec v0.17.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsd
 github.com/go-openapi/spec v0.18.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI=
 github.com/go-openapi/spec v0.19.2/go.mod h1:sCxk3jxKgioEJikev4fgkNmwS+3kuYdJtcsZsD5zxMY=
 github.com/go-openapi/spec v0.19.3/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8Lj9mJglo=
-github.com/go-openapi/spec v0.19.5 h1:Xm0Ao53uqnk9QE/LlYV5DEU09UAgpliA85QoT9LzqPw=
 github.com/go-openapi/spec v0.19.5/go.mod h1:Hm2Jr4jv8G1ciIAo+frC/Ft+rR2kQDh8JHKHb3gWUSk=
 github.com/go-openapi/strfmt v0.17.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU=
 github.com/go-openapi/strfmt v0.18.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU=
@@ -126,7 +120,6 @@ github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dp
 github.com/go-openapi/swag v0.17.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg=
 github.com/go-openapi/swag v0.18.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg=
 github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
-github.com/go-openapi/swag v0.19.5 h1:lTz6Ys4CmqqCQmZPBlbQENR1/GucA2bzYTE12Pw4tFY=
 github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
 github.com/go-openapi/validate v0.18.0/go.mod h1:Uh4HdOzKt19xGIGm1qHf/ofbX1YQ4Y+MYsct2VUrAJ4=
 github.com/go-openapi/validate v0.19.2/go.mod h1:1tRCw7m3jtI8eNWEEliiAqUIcBztB2KDnRCRMUi7GTA=
@@ -249,7 +242,6 @@ github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN
 github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-github.com/mailru/easyjson v0.7.0 h1:aizVhC/NAAcKWb+5QsU1iNOZb4Yws5UO2I+aIprQITM=
 github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs=
 github.com/matoous/godox v0.0.0-20190911065817-5d6d842e92eb/go.mod h1:1BELzlh859Sh1c6+90blK8lbYy0kwQf1bYlBhBysy1s=
 github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
@@ -271,8 +263,6 @@ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lN
 github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI=
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8=
-github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 h1:n6/2gBQ3RWajuToeY6ZtZTIKv2v7ThUy5KKusIT0yc0=
-github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00/go.mod h1:Pm3mSP3c5uWn86xMLZ5Sa7JB9GsEZySvHYXCTK4E9q4=
 github.com/mozilla/tls-observatory v0.0.0-20190404164649-a3c1b6cfecfd/go.mod h1:SrKMQvPiws7F7iqYp8/TX+IhxCYhzr6N/1yb8cwHsGk=
 github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
@@ -340,7 +330,6 @@ github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DM
 github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48=
 github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
 github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
@@ -364,7 +353,6 @@ github.com/valyala/quicktemplate v1.2.0/go.mod h1:EH+4AkTd43SvgIbQHYu59/cJyxDoOV
 github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio=
 github.com/vektah/gqlparser v1.1.2/go.mod h1:1ycwN7Ij5njmMkPPAOaRFY4rET2Enx7IkVv3vaXspKw=
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
-github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca h1:1CFlNzQhALwjS9mBAUkycX616GzgsuYUOCHA5+HSlXI=
 github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca/go.mod h1:ce1O1j6UtZfjr22oyGxGLbauSBp2YVXpARAosm7dHBg=
 github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
 github.com/yujunz/go-getter v1.4.1-lite h1:FhvNc94AXMZkfqUwfMKhnQEC9phkphSGdPTL7tIdhOM=
@@ -416,6 +404,8 @@ golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20191004110552-13f9640d40b9 h1:rjwSpXsdiK0dV8/Naq3kAw9ymfAeJIyd0upUIElB+lI=
 golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200226121028-0de0cce0169b h1:0mm1VjtFUOIlE1SbDlwjYaDxZVDP2S5ou6y0gSgXHu8=
+golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -472,7 +462,6 @@ golang.org/x/tools v0.0.0-20190719005602-e377ae9d6386/go.mod h1:jcCCGcm9btYwXyDq
 golang.org/x/tools v0.0.0-20190910044552-dd2b5c81c578/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20190930201159-7c411dea38b0/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191010075000-0337d82405ff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
@@ -501,12 +490,10 @@ gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
-gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v3 v3.0.0-20200121175148-a6ecf24a6d71 h1:Xe2gvTZUJpsvOWUnvmL/tmhVBZUmHSvLbMjRj6NUUKo=
-gopkg.in/yaml.v3 v3.0.0-20200121175148-a6ecf24a6d71/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.0-20191120175047-4206685974f2/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
@@ -527,8 +514,7 @@ k8s.io/utils v0.0.0-20191114184206-e782cd3c129f/go.mod h1:sZAwmy6armz5eXlNoLmJcl
 mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed/go.mod h1:Xkxe497xwlCKkIaQYRfC7CSLworTXY9RMqwhhCm+8Nc=
 mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b/go.mod h1:2odslEg/xrtNQqCYg2/jCoyKnw3vv5biOc3JnIcYfL4=
 mvdan.cc/unparam v0.0.0-20190720180237-d51796306d8f/go.mod h1:4G1h5nDURzA3bwVMZIVpwbkw+04kSxk3rAtzlimaUJw=
-sigs.k8s.io/kustomize/kyaml v0.8.0 h1:/MqPML99XAm2pbrD/eTpePh5rnU5bpnuTPqb29LpSz4=
-sigs.k8s.io/kustomize/kyaml v0.8.0/go.mod h1:UTm64bSWVdBUA8EQoYCxVOaBQxUdIOr5LKWxA4GNbkw=
+sigs.k8s.io/kustomize/kyaml v0.1.11/go.mod h1:72/rLkSi+L/pHM1oCjwrf3ClU+tH5kZQvvdLSqIHwWU=
 sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI=
 sigs.k8s.io/yaml v1.1.0 h1:4A07+ZFc2wgJwo8YNlQpr1rVlgUDlxXHhPJciaPY5gs=
 sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=

api/internal/crawl/utils/utils.go

@@ -1,37 +1,21 @@
 package utils
 
-import "sync"
+type SeenMap map[string]string
 
-type SeenMap struct {
-	data map[string]string
-	lock sync.RWMutex
-}
-
-// TODO: add lock to avoid race condition
 func (seen SeenMap) Seen(item string) bool {
-	seen.lock.RLock()
-	_, ok := seen.data[item]
-	seen.lock.RUnlock()
+	_, ok := seen[item]
 	return ok
 }
 
 func (seen SeenMap) Set(k, v string) {
-	seen.lock.Lock()
-	seen.data[k] = v
-	seen.lock.Unlock()
+	seen[k] = v
 }
 
 // The caller should make sure that key is in the map.
 func (seen SeenMap) Value(k string) string {
-	seen.lock.RLock()
-	v := seen.data[k]
-	seen.lock.RUnlock()
-	return v
+	return seen[k]
 }
 
 func NewSeenMap() SeenMap {
-	return SeenMap{
-		data: make(map[string]string),
-		lock: sync.RWMutex{},
-	}
+	return make(map[string]string)
 }

api/internal/git/cloner.go

@@ -33,7 +33,6 @@ func ClonerUsingGitExec(repoSpec *RepoSpec) error {
 	cmd := exec.Command(
 		gitProgram,
 		"clone",
-		"--depth=1",
 		repoSpec.CloneSpec(),
 		repoSpec.Dir.String())
 	out, err := cmd.CombinedOutput()
@@ -45,23 +44,10 @@ func ClonerUsingGitExec(repoSpec *RepoSpec) error {
 			repoSpec.CloneSpec(), repoSpec.Dir.String())
 	}
 
-	cmd = exec.Command(
-		gitProgram,
-		"fetch",
-		"--depth=1",
-		"origin",
-		repoSpec.Ref)
-	cmd.Dir = repoSpec.Dir.String()
-	out, err = cmd.CombinedOutput()
-	if err != nil {
-		log.Printf("Error fetching ref: %s", out)
-		return errors.Wrapf(err, "trouble fetching %s", repoSpec.Ref)
-	}
-
 	cmd = exec.Command(
 		gitProgram,
 		"checkout",
-		"FETCH_HEAD")
+		repoSpec.Ref)
 	cmd.Dir = repoSpec.Dir.String()
 	out, err = cmd.CombinedOutput()
 	if err != nil {

api/internal/k8sdeps/transformer/factory.go

@@ -0,0 +1,25 @@
+// Copyright 2019 The Kubernetes Authors.
+// SPDX-License-Identifier: Apache-2.0
+
+// Package transformer provides transformer factory
+package transformer
+
+import (
+	"sigs.k8s.io/kustomize/api/internal/k8sdeps/transformer/patch"
+	"sigs.k8s.io/kustomize/api/resmap"
+	"sigs.k8s.io/kustomize/api/resource"
+)
+
+// FactoryImpl makes patch transformer and name hash transformer
+type FactoryImpl struct{}
+
+// NewFactoryImpl makes a new factoryImpl instance
+func NewFactoryImpl() *FactoryImpl {
+	return &FactoryImpl{}
+}
+
+func (p *FactoryImpl) MergePatches(patches []*resource.Resource,
+	rf *resource.Factory) (
+	resmap.ResMap, error) {
+	return patch.MergePatches(patches, rf)
+}

api/internal/k8sdeps/transformer/patch/conflictdetector.go

@@ -1,7 +1,7 @@
 // Copyright 2019 The Kubernetes Authors.
 // SPDX-License-Identifier: Apache-2.0
 
-package merge
+package patch
 
 import (
 	"encoding/json"
@@ -20,20 +20,18 @@ import (
 
 type conflictDetector interface {
 	hasConflict(patch1, patch2 *resource.Resource) (bool, error)
-	findConflict(
-		conflictingPatchIdx int,
-		patches []*resource.Resource) (*resource.Resource, error)
+	findConflict(conflictingPatchIdx int, patches []*resource.Resource) (*resource.Resource, error)
 	mergePatches(patch1, patch2 *resource.Resource) (*resource.Resource, error)
 }
 
 type jsonMergePatch struct {
-	resourceFactory *resource.Factory
+	rf *resource.Factory
 }
 
 var _ conflictDetector = &jsonMergePatch{}
 
 func newJMPConflictDetector(rf *resource.Factory) conflictDetector {
-	return &jsonMergePatch{resourceFactory: rf}
+	return &jsonMergePatch{rf: rf}
 }
 
 func (jmp *jsonMergePatch) hasConflict(
@@ -42,8 +40,7 @@ func (jmp *jsonMergePatch) hasConflict(
 }
 
 func (jmp *jsonMergePatch) findConflict(
-	conflictingPatchIdx int,
-	patches []*resource.Resource) (*resource.Resource, error) {
+	conflictingPatchIdx int, patches []*resource.Resource) (*resource.Resource, error) {
 	for i, patch := range patches {
 		if i == conflictingPatchIdx {
 			continue
@@ -80,7 +77,7 @@ func (jmp *jsonMergePatch) mergePatches(
 	}
 	mergedMap := make(map[string]interface{})
 	err = json.Unmarshal(mergedBytes, &mergedMap)
-	return jmp.resourceFactory.FromMap(mergedMap), err
+	return jmp.rf.FromMap(mergedMap), err
 }
 
 type strategicMergePatch struct {
@@ -97,15 +94,13 @@ func newSMPConflictDetector(
 	return &strategicMergePatch{lookupPatchMeta: lookupPatchMeta, rf: rf}, err
 }
 
-func (smp *strategicMergePatch) hasConflict(
-	p1, p2 *resource.Resource) (bool, error) {
+func (smp *strategicMergePatch) hasConflict(p1, p2 *resource.Resource) (bool, error) {
 	return strategicpatch.MergingMapsHaveConflicts(
 		p1.Map(), p2.Map(), smp.lookupPatchMeta)
 }
 
 func (smp *strategicMergePatch) findConflict(
-	conflictingPatchIdx int,
-	patches []*resource.Resource) (*resource.Resource, error) {
+	conflictingPatchIdx int, patches []*resource.Resource) (*resource.Resource, error) {
 	for i, patch := range patches {
 		if i == conflictingPatchIdx {
 			continue
@@ -127,12 +122,10 @@ func (smp *strategicMergePatch) findConflict(
 	return nil, nil
 }
 
-func (smp *strategicMergePatch) mergePatches(
-	patch1, patch2 *resource.Resource) (*resource.Resource, error) {
+func (smp *strategicMergePatch) mergePatches(patch1, patch2 *resource.Resource) (*resource.Resource, error) {
 	if hasDeleteDirectiveMarker(patch2.Map()) {
 		if hasDeleteDirectiveMarker(patch1.Map()) {
-			return nil, fmt.Errorf(
-				"cannot merge patches both containing '$patch: delete' directives")
+			return nil, fmt.Errorf("cannot merge patches both containing '$patch: delete' directives")
 		}
 		patch1, patch2 = patch2, patch1
 	}
@@ -141,21 +134,10 @@ func (smp *strategicMergePatch) mergePatches(
 	return smp.rf.FromMap(mergeJSONMap), err
 }
 
-type merginatorImpl struct {
-	rf *resource.Factory
-}
-
-// NewMerginator returns a new implementation of resmap.Merginator.
-func NewMerginator(rf *resource.Factory) resmap.Merginator {
-	return &merginatorImpl{rf: rf}
-}
-
-var _ resmap.Merginator = (*merginatorImpl)(nil)
-
-// Merge merges the incoming resources into a new resmap.ResMap.
-// Returns an error on conflict.
-func (m *merginatorImpl) Merge(
-	patches []*resource.Resource) (resmap.ResMap, error) {
+// MergePatches merge and index patches by OrgId.
+// It errors out if there is conflict between patches.
+func MergePatches(patches []*resource.Resource,
+	rf *resource.Factory) (resmap.ResMap, error) {
 	rc := resmap.New()
 	for ix, patch := range patches {
 		id := patch.OrgId()
@@ -174,9 +156,9 @@ func (m *merginatorImpl) Merge(
 		}
 		var cd conflictDetector
 		if err != nil {
-			cd = newJMPConflictDetector(m.rf)
+			cd = newJMPConflictDetector(rf)
 		} else {
-			cd, err = newSMPConflictDetector(versionedObj, m.rf)
+			cd, err = newSMPConflictDetector(versionedObj, rf)
 			if err != nil {
 				return nil, err
 			}

api/internal/merge/merginator.go

@@ -1,25 +0,0 @@
-// Copyright 2020 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package merge
-
-import (
-	"sigs.k8s.io/kustomize/api/resmap"
-	"sigs.k8s.io/kustomize/api/resource"
-)
-
-// Merginator implements resmap.Merginator using kyaml libs.
-type Merginator struct {
-}
-
-var _ resmap.Merginator = (*Merginator)(nil)
-
-func NewMerginator(_ *resource.Factory) *Merginator {
-	return &Merginator{}
-}
-
-// Merge implements resmap.Merginator
-func (m Merginator) Merge(
-	resources []*resource.Resource) (resmap.ResMap, error) {
-	panic("TODO(#Merginator): implement Merge")
-}

api/internal/merge/merginator_test.go

@@ -1,4 +0,0 @@
-// Copyright 2020 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package merge_test

api/internal/plugins/execplugin/execplugin.go

@@ -9,17 +9,22 @@ import (
 	"io/ioutil"
 	"os"
 	"os/exec"
+	"strconv"
 	"strings"
 
 	"github.com/google/shlex"
 
 	"github.com/pkg/errors"
-	"sigs.k8s.io/kustomize/api/internal/plugins/utils"
+	"sigs.k8s.io/kustomize/api/resid"
 	"sigs.k8s.io/kustomize/api/resmap"
+	"sigs.k8s.io/kustomize/api/types"
 	"sigs.k8s.io/yaml"
 )
 
 const (
+	idAnnotation        = "kustomize.config.k8s.io/id"
+	HashAnnotation      = "kustomize.config.k8s.io/needs-hash"
+	BehaviorAnnotation  = "kustomize.config.k8s.io/behavior"
 	tmpConfigFilePrefix = "kust-plugin-config-"
 )
 
@@ -109,12 +114,12 @@ func (p *ExecPlugin) Generate() (resmap.ResMap, error) {
 	if err != nil {
 		return nil, err
 	}
-	return utils.UpdateResourceOptions(rm)
+	return p.UpdateResourceOptions(rm)
 }
 
 func (p *ExecPlugin) Transform(rm resmap.ResMap) error {
 	// add ResIds as annotations to all objects so that we can add them back
-	inputRM, err := utils.GetResMapWithIDAnnotation(rm)
+	inputRM, err := p.getResMapWithIdAnnotation(rm)
 	if err != nil {
 		return err
 	}
@@ -132,7 +137,7 @@ func (p *ExecPlugin) Transform(rm resmap.ResMap) error {
 	}
 
 	// update the original ResMap based on the output
-	return utils.UpdateResMapValues(p.path, p.h, output, rm)
+	return p.updateResMapValues(output, rm)
 }
 
 // invokePlugin writes plugin config to a temp file, then
@@ -179,3 +184,91 @@ func (p *ExecPlugin) getEnv() []string {
 		"KUSTOMIZE_PLUGIN_CONFIG_ROOT="+p.h.Loader().Root())
 	return env
 }
+
+// Returns a new copy of the given ResMap with the ResIds annotated in each Resource
+func (p *ExecPlugin) getResMapWithIdAnnotation(rm resmap.ResMap) (resmap.ResMap, error) {
+	inputRM := rm.DeepCopy()
+	for _, r := range inputRM.Resources() {
+		idString, err := yaml.Marshal(r.CurId())
+		if err != nil {
+			return nil, err
+		}
+		annotations := r.GetAnnotations()
+		if annotations == nil {
+			annotations = make(map[string]string)
+		}
+		annotations[idAnnotation] = string(idString)
+		r.SetAnnotations(annotations)
+	}
+	return inputRM, nil
+}
+
+// updateResMapValues updates the Resource value in the given ResMap
+// with the emitted Resource values in output.
+func (p *ExecPlugin) updateResMapValues(output []byte, rm resmap.ResMap) error {
+	outputRM, err := p.h.ResmapFactory().NewResMapFromBytes(output)
+	if err != nil {
+		return err
+	}
+	for _, r := range outputRM.Resources() {
+		// for each emitted Resource, find the matching Resource in the original ResMap
+		// using its id
+		annotations := r.GetAnnotations()
+		idString, ok := annotations[idAnnotation]
+		if !ok {
+			return fmt.Errorf("the transformer %s should not remove annotation %s",
+				p.path, idAnnotation)
+		}
+		id := resid.ResId{}
+		err := yaml.Unmarshal([]byte(idString), &id)
+		if err != nil {
+			return err
+		}
+		res, err := rm.GetByCurrentId(id)
+		if err != nil {
+			return fmt.Errorf("unable to find unique match to %s", id.String())
+		}
+		// remove the annotation set by Kustomize to track the resource
+		delete(annotations, idAnnotation)
+		if len(annotations) == 0 {
+			annotations = nil
+		}
+		r.SetAnnotations(annotations)
+
+		// update the ResMap resource value with the transformed object
+		res.Kunstructured = r.Kunstructured
+	}
+	return nil
+}
+
+// updateResourceOptions updates the generator options for each resource in the
+// given ResMap based on plugin provided annotations.
+func (p *ExecPlugin) UpdateResourceOptions(rm resmap.ResMap) (resmap.ResMap, error) {
+	for _, r := range rm.Resources() {
+		// Disable name hashing by default and require plugin to explicitly
+		// request it for each resource.
+		annotations := r.GetAnnotations()
+		behavior := annotations[BehaviorAnnotation]
+		var needsHash bool
+		if val, ok := annotations[HashAnnotation]; ok {
+			b, err := strconv.ParseBool(val)
+			if err != nil {
+				return nil, fmt.Errorf(
+					"the annotation %q contains an invalid value (%q)",
+					HashAnnotation, val)
+			}
+			needsHash = b
+		}
+		delete(annotations, HashAnnotation)
+		delete(annotations, BehaviorAnnotation)
+		if len(annotations) == 0 {
+			annotations = nil
+		}
+		r.SetAnnotations(annotations)
+		r.SetOptions(types.NewGenArgs(
+			&types.GeneratorArgs{
+				Behavior: behavior,
+				Options:  &types.GeneratorOptions{DisableNameSuffixHash: !needsHash}}))
+	}
+	return rm, nil
+}

api/internal/plugins/execplugin/execplugin_test.go

@@ -4,6 +4,7 @@
 package execplugin_test
 
 import (
+	"fmt"
 	"strings"
 	"testing"
 
@@ -16,6 +17,7 @@ import (
 	"sigs.k8s.io/kustomize/api/resmap"
 	"sigs.k8s.io/kustomize/api/resource"
 	valtest_test "sigs.k8s.io/kustomize/api/testutils/valtest"
+	"sigs.k8s.io/kustomize/api/types"
 )
 
 func TestExecPluginConfig(t *testing.T) {
@@ -89,3 +91,107 @@ metadata:
 		t.Fatalf("unexpected arg array: %#v", p.Args())
 	}
 }
+
+func makeConfigMap(rf *resource.Factory, name, behavior string, hashValue *string) *resource.Resource {
+	r := rf.FromMap(map[string]interface{}{
+		"apiVersion": "v1",
+		"kind":       "ConfigMap",
+		"metadata":   map[string]interface{}{"name": name},
+	})
+	annotations := map[string]string{}
+	if behavior != "" {
+		annotations[BehaviorAnnotation] = behavior
+	}
+	if hashValue != nil {
+		annotations[HashAnnotation] = *hashValue
+	}
+	if len(annotations) > 0 {
+		r.SetAnnotations(annotations)
+	}
+	return r
+}
+
+func makeConfigMapOptions(rf *resource.Factory, name, behavior string, disableHash bool) *resource.Resource {
+	return rf.FromMapAndOption(map[string]interface{}{
+		"apiVersion": "v1",
+		"kind":       "ConfigMap",
+		"metadata":   map[string]interface{}{"name": name},
+	}, &types.GeneratorArgs{
+		Behavior: behavior,
+		Options:  &types.GeneratorOptions{DisableNameSuffixHash: disableHash}})
+}
+
+func strptr(s string) *string {
+	return &s
+}
+
+func TestUpdateResourceOptions(t *testing.T) {
+	p := NewExecPlugin("")
+	if err := p.ErrIfNotExecutable(); err == nil {
+		t.Fatalf("expected unexecutable error")
+	}
+	rf := resource.NewFactory(kunstruct.NewKunstructuredFactoryImpl())
+	in := resmap.New()
+	expected := resmap.New()
+	cases := []struct {
+		behavior  string
+		needsHash bool
+		hashValue *string
+	}{
+		{hashValue: strptr("false")},
+		{hashValue: strptr("true"), needsHash: true},
+		{behavior: "replace"},
+		{behavior: "merge"},
+		{behavior: "create"},
+		{behavior: "nonsense"},
+		{behavior: "merge", hashValue: strptr("false")},
+		{behavior: "merge", hashValue: strptr("true"), needsHash: true},
+	}
+	for i, c := range cases {
+		name := fmt.Sprintf("test%d", i)
+		in.Append(makeConfigMap(rf, name, c.behavior, c.hashValue))
+		expected.Append(makeConfigMapOptions(rf, name, c.behavior, !c.needsHash))
+	}
+	actual, err := p.UpdateResourceOptions(in)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err.Error())
+	}
+	for i, a := range expected.Resources() {
+		b := actual.GetByIndex(i)
+		if b == nil {
+			t.Fatalf("resource %d missing from processed map", i)
+		}
+		if !a.Equals(b) {
+			t.Errorf("expected %v got %v", a, b)
+		}
+		if a.NeedHashSuffix() != b.NeedHashSuffix() {
+			t.Errorf("")
+		}
+		if a.Behavior() != b.Behavior() {
+			t.Errorf("expected %v got %v", a.Behavior(), b.Behavior())
+		}
+	}
+}
+
+func TestUpdateResourceOptionsWithInvalidHashAnnotationValues(t *testing.T) {
+	p := NewExecPlugin("")
+	if err := p.ErrIfNotExecutable(); err == nil {
+		t.Fatalf("expected unexecutable error")
+	}
+	rf := resource.NewFactory(kunstruct.NewKunstructuredFactoryImpl())
+	cases := []string{
+		"",
+		"FaLsE",
+		"TrUe",
+		"potato",
+	}
+	for i, c := range cases {
+		name := fmt.Sprintf("test%d", i)
+		in := resmap.New()
+		in.Append(makeConfigMap(rf, name, "", &c))
+		_, err := p.UpdateResourceOptions(in)
+		if err == nil {
+			t.Errorf("expected error from value %q", c)
+		}
+	}
+}

api/internal/plugins/fnplugin/fnplugin.go

@@ -1,197 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package fnplugin
-
-import (
-	"bytes"
-	"fmt"
-
-	"github.com/pkg/errors"
-
-	"sigs.k8s.io/kustomize/api/internal/plugins/utils"
-	"sigs.k8s.io/kustomize/api/resmap"
-	"sigs.k8s.io/kustomize/api/resource"
-	"sigs.k8s.io/kustomize/api/types"
-	"sigs.k8s.io/kustomize/kyaml/fn/runtime/runtimeutil"
-	"sigs.k8s.io/kustomize/kyaml/runfn"
-	"sigs.k8s.io/kustomize/kyaml/yaml"
-)
-
-// FnPlugin is the struct to hold function information
-type FnPlugin struct {
-	// Function runner
-	runFns runfn.RunFns
-
-	// Plugin configuration data.
-	cfg []byte
-
-	// Plugin name cache for error output
-	pluginName string
-
-	// PluginHelpers
-	h *resmap.PluginHelpers
-}
-
-func bytesToRNode(yml []byte) (*yaml.RNode, error) {
-	rnode, err := yaml.Parse(string(yml))
-	if err != nil {
-		return nil, err
-	}
-	return rnode, nil
-}
-
-func resourceToRNode(res *resource.Resource) (*yaml.RNode, error) {
-	yml, err := res.AsYAML()
-	if err != nil {
-		return nil, err
-	}
-
-	return bytesToRNode(yml)
-}
-
-// GetFunctionSpec return function spec is there is. Otherwise return nil
-func GetFunctionSpec(res *resource.Resource) *runtimeutil.FunctionSpec {
-	rnode, err := resourceToRNode(res)
-	if err != nil {
-		return nil
-	}
-
-	return runtimeutil.GetFunctionSpec(rnode)
-}
-
-func toStorageMounts(mounts []string) []runtimeutil.StorageMount {
-	var sms []runtimeutil.StorageMount
-	for _, mount := range mounts {
-		sms = append(sms, runtimeutil.StringToStorageMount(mount))
-	}
-	return sms
-}
-
-// NewFnPlugin creates a FnPlugin struct
-func NewFnPlugin(o *types.FnPluginLoadingOptions) *FnPlugin {
-	return &FnPlugin{
-		runFns: runfn.RunFns{
-			Functions:      []*yaml.RNode{},
-			Network:        o.Network,
-			NetworkName:    o.NetworkName,
-			EnableStarlark: o.EnableStar,
-			EnableExec:     o.EnableExec,
-			StorageMounts:  toStorageMounts(o.Mounts),
-		},
-	}
-}
-
-// Cfg returns function config
-func (p *FnPlugin) Cfg() []byte {
-	return p.cfg
-}
-
-// Config is called by kustomize to pass-in config information
-func (p *FnPlugin) Config(h *resmap.PluginHelpers, config []byte) error {
-	p.h = h
-	p.cfg = config
-
-	fn, err := bytesToRNode(p.cfg)
-	if err != nil {
-		return err
-	}
-
-	meta, err := fn.GetMeta()
-	if err != nil {
-		return err
-	}
-
-	p.pluginName = fmt.Sprintf("api: %s, kind: %s, name: %s",
-		meta.APIVersion, meta.Kind, meta.Name)
-
-	return nil
-}
-
-// Generate is called when run as generator
-func (p *FnPlugin) Generate() (resmap.ResMap, error) {
-	output, err := p.invokePlugin(nil)
-	if err != nil {
-		return nil, err
-	}
-	rm, err := p.h.ResmapFactory().NewResMapFromBytes(output)
-	if err != nil {
-		return nil, err
-	}
-	return utils.UpdateResourceOptions(rm)
-}
-
-// Transform is called when run as transformer
-func (p *FnPlugin) Transform(rm resmap.ResMap) error {
-	// add ResIds as annotations to all objects so that we can add them back
-	inputRM, err := utils.GetResMapWithIDAnnotation(rm)
-	if err != nil {
-		return err
-	}
-
-	// encode the ResMap so it can be fed to the plugin
-	resources, err := inputRM.AsYaml()
-	if err != nil {
-		return err
-	}
-
-	// invoke the plugin with resources as the input
-	output, err := p.invokePlugin(resources)
-	if err != nil {
-		return fmt.Errorf("%v %s", err, string(output))
-	}
-
-	// update the original ResMap based on the output
-	return utils.UpdateResMapValues(p.pluginName, p.h, output, rm)
-}
-
-func injectAnnotation(input *yaml.RNode, k, v string) error {
-	err := input.PipeE(yaml.SetAnnotation(k, v))
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-// invokePlugin uses Function runner to run function as plugin
-func (p *FnPlugin) invokePlugin(input []byte) ([]byte, error) {
-	// get function config rnode
-	functionConfig, err := bytesToRNode(p.cfg)
-	if err != nil {
-		return nil, err
-	}
-
-	// This annotation will let kustomize ingnore this item in output
-	err = injectAnnotation(functionConfig, "config.kubernetes.io/local-config", "true")
-	if err != nil {
-		return nil, err
-	}
-	// we need to add config as input for generators. Some of them don't work with FunctionConfig
-	// and in addition kio.Pipeline won't create anything if there are no objects
-	// see https://github.com/kubernetes-sigs/kustomize/blob/master/kyaml/kio/kio.go#L93
-	// Since we added `local-config` annotation so it will be ignored in generator output
-	// TODO(donnyxia): This is actually not used by generator and only used to bypass a kio limitation.
-	// Need better solution.
-	if input == nil {
-		yml, err := functionConfig.String()
-		if err != nil {
-			return nil, err
-		}
-		input = []byte(yml)
-	}
-
-	// Configure and Execute Fn. We don't need to convert resources to ResourceList here
-	// because function runtime will do that. See kyaml/fn/runtime/runtimeutil/runtimeutil.go
-	var ouputBuffer bytes.Buffer
-	p.runFns.Input = bytes.NewReader(input)
-	p.runFns.Functions = append(p.runFns.Functions, functionConfig)
-	p.runFns.Output = &ouputBuffer
-
-	err = p.runFns.Execute()
-	if err != nil {
-		return nil, errors.Wrap(
-			err, "couldn't execute function")
-	}
-
-	return ouputBuffer.Bytes(), nil
-}

api/internal/plugins/loader/loader.go

@@ -16,7 +16,6 @@ import (
 	"sigs.k8s.io/kustomize/api/ifc"
 	"sigs.k8s.io/kustomize/api/internal/plugins/builtinhelpers"
 	"sigs.k8s.io/kustomize/api/internal/plugins/execplugin"
-	"sigs.k8s.io/kustomize/api/internal/plugins/fnplugin"
 	"sigs.k8s.io/kustomize/api/internal/plugins/utils"
 	"sigs.k8s.io/kustomize/api/konfig"
 	"sigs.k8s.io/kustomize/api/resid"
@@ -117,7 +116,7 @@ func (l *Loader) loadAndConfigurePlugin(
 	if isBuiltinPlugin(res) {
 		switch l.pc.BpLoadingOptions {
 		case types.BploLoadFromFileSys:
-			c, err = l.loadPlugin(res)
+			c, err = l.loadPlugin(res.OrgId())
 		case types.BploUseStaticallyLinked:
 			// Instead of looking for and loading a .so file,
 			// instantiate the plugin from a generated factory
@@ -132,7 +131,7 @@ func (l *Loader) loadAndConfigurePlugin(
 	} else {
 		switch l.pc.PluginRestrictions {
 		case types.PluginRestrictionsNone:
-			c, err = l.loadPlugin(res)
+			c, err = l.loadPlugin(res.OrgId())
 		case types.PluginRestrictionsBuiltinsOnly:
 			err = types.NewErrOnlyBuiltinPluginsAllowed(res.OrgId().Kind)
 		default:
@@ -167,15 +166,7 @@ func (l *Loader) makeBuiltinPlugin(r resid.Gvk) (resmap.Configurable, error) {
 	return nil, errors.Errorf("unable to load builtin %s", r)
 }
 
-func (l *Loader) loadPlugin(res *resource.Resource) (resmap.Configurable, error) {
-	spec := fnplugin.GetFunctionSpec(res)
-	if spec != nil {
-		return fnplugin.NewFnPlugin(&l.pc.FnpLoadingOptions), nil
-	}
-	return l.loadExecOrGoPlugin(res.OrgId())
-}
-
-func (l *Loader) loadExecOrGoPlugin(resId resid.ResId) (resmap.Configurable, error) {
+func (l *Loader) loadPlugin(resId resid.ResId) (resmap.Configurable, error) {
 	// First try to load the plugin as an executable.
 	p := execplugin.NewExecPlugin(l.absolutePluginPath(resId))
 	err := p.ErrIfNotExecutable()

api/internal/plugins/utils/utils.go

@@ -4,25 +4,13 @@
 package utils
 
 import (
-	"fmt"
 	"os"
 	"path/filepath"
 	"runtime"
-	"strconv"
 	"time"
 
 	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/api/konfig"
-	"sigs.k8s.io/kustomize/api/resid"
-	"sigs.k8s.io/kustomize/api/resmap"
-	"sigs.k8s.io/kustomize/api/types"
-	"sigs.k8s.io/yaml"
-)
-
-const (
-	idAnnotation       = "kustomize.config.k8s.io/id"
-	HashAnnotation     = "kustomize.config.k8s.io/needs-hash"
-	BehaviorAnnotation = "kustomize.config.k8s.io/behavior"
 )
 
 func GoBin() string {
@@ -125,91 +113,3 @@ func FileExists(path string) bool {
 	}
 	return true
 }
-
-// GetResMapWithIDAnnotation returns a new copy of the given ResMap with the ResIds annotated in each Resource
-func GetResMapWithIDAnnotation(rm resmap.ResMap) (resmap.ResMap, error) {
-	inputRM := rm.DeepCopy()
-	for _, r := range inputRM.Resources() {
-		idString, err := yaml.Marshal(r.CurId())
-		if err != nil {
-			return nil, err
-		}
-		annotations := r.GetAnnotations()
-		if annotations == nil {
-			annotations = make(map[string]string)
-		}
-		annotations[idAnnotation] = string(idString)
-		r.SetAnnotations(annotations)
-	}
-	return inputRM, nil
-}
-
-// UpdateResMapValues updates the Resource value in the given ResMap
-// with the emitted Resource values in output.
-func UpdateResMapValues(pluginName string, h *resmap.PluginHelpers, output []byte, rm resmap.ResMap) error {
-	outputRM, err := h.ResmapFactory().NewResMapFromBytes(output)
-	if err != nil {
-		return err
-	}
-	for _, r := range outputRM.Resources() {
-		// for each emitted Resource, find the matching Resource in the original ResMap
-		// using its id
-		annotations := r.GetAnnotations()
-		idString, ok := annotations[idAnnotation]
-		if !ok {
-			return fmt.Errorf("the transformer %s should not remove annotation %s",
-				pluginName, idAnnotation)
-		}
-		id := resid.ResId{}
-		err := yaml.Unmarshal([]byte(idString), &id)
-		if err != nil {
-			return err
-		}
-		res, err := rm.GetByCurrentId(id)
-		if err != nil {
-			return fmt.Errorf("unable to find unique match to %s", id.String())
-		}
-		// remove the annotation set by Kustomize to track the resource
-		delete(annotations, idAnnotation)
-		if len(annotations) == 0 {
-			annotations = nil
-		}
-		r.SetAnnotations(annotations)
-
-		// update the resource value with the transformed object
-		res.ResetPrimaryData(r)
-	}
-	return nil
-}
-
-// UpdateResourceOptions updates the generator options for each resource in the
-// given ResMap based on plugin provided annotations.
-func UpdateResourceOptions(rm resmap.ResMap) (resmap.ResMap, error) {
-	for _, r := range rm.Resources() {
-		// Disable name hashing by default and require plugin to explicitly
-		// request it for each resource.
-		annotations := r.GetAnnotations()
-		behavior := annotations[BehaviorAnnotation]
-		var needsHash bool
-		if val, ok := annotations[HashAnnotation]; ok {
-			b, err := strconv.ParseBool(val)
-			if err != nil {
-				return nil, fmt.Errorf(
-					"the annotation %q contains an invalid value (%q)",
-					HashAnnotation, val)
-			}
-			needsHash = b
-		}
-		delete(annotations, HashAnnotation)
-		delete(annotations, BehaviorAnnotation)
-		if len(annotations) == 0 {
-			annotations = nil
-		}
-		r.SetAnnotations(annotations)
-		r.SetOptions(types.NewGenArgs(
-			&types.GeneratorArgs{
-				Behavior: behavior,
-				Options:  &types.GeneratorOptions{DisableNameSuffixHash: !needsHash}}))
-	}
-	return rm, nil
-}

api/internal/plugins/utils/utils_test.go

@@ -4,17 +4,12 @@
 package utils
 
 import (
-	"fmt"
 	"path/filepath"
 	"strings"
 	"testing"
 
 	"sigs.k8s.io/kustomize/api/filesys"
-	"sigs.k8s.io/kustomize/api/k8sdeps/kunstruct"
 	"sigs.k8s.io/kustomize/api/konfig"
-	"sigs.k8s.io/kustomize/api/resmap"
-	"sigs.k8s.io/kustomize/api/resource"
-	"sigs.k8s.io/kustomize/api/types"
 )
 
 func TestDeterminePluginSrcRoot(t *testing.T) {
@@ -29,99 +24,3 @@ func TestDeterminePluginSrcRoot(t *testing.T) {
 		t.Errorf("expected suffix '%s' in '%s'", konfig.RelPluginHome, actual)
 	}
 }
-
-func makeConfigMap(rf *resource.Factory, name, behavior string, hashValue *string) *resource.Resource {
-	r := rf.FromMap(map[string]interface{}{
-		"apiVersion": "v1",
-		"kind":       "ConfigMap",
-		"metadata":   map[string]interface{}{"name": name},
-	})
-	annotations := map[string]string{}
-	if behavior != "" {
-		annotations[BehaviorAnnotation] = behavior
-	}
-	if hashValue != nil {
-		annotations[HashAnnotation] = *hashValue
-	}
-	if len(annotations) > 0 {
-		r.SetAnnotations(annotations)
-	}
-	return r
-}
-
-func makeConfigMapOptions(rf *resource.Factory, name, behavior string, disableHash bool) *resource.Resource {
-	return rf.FromMapAndOption(map[string]interface{}{
-		"apiVersion": "v1",
-		"kind":       "ConfigMap",
-		"metadata":   map[string]interface{}{"name": name},
-	}, &types.GeneratorArgs{
-		Behavior: behavior,
-		Options:  &types.GeneratorOptions{DisableNameSuffixHash: disableHash}})
-}
-
-func strptr(s string) *string {
-	return &s
-}
-
-func TestUpdateResourceOptions(t *testing.T) {
-	rf := resource.NewFactory(kunstruct.NewKunstructuredFactoryImpl())
-	in := resmap.New()
-	expected := resmap.New()
-	cases := []struct {
-		behavior  string
-		needsHash bool
-		hashValue *string
-	}{
-		{hashValue: strptr("false")},
-		{hashValue: strptr("true"), needsHash: true},
-		{behavior: "replace"},
-		{behavior: "merge"},
-		{behavior: "create"},
-		{behavior: "nonsense"},
-		{behavior: "merge", hashValue: strptr("false")},
-		{behavior: "merge", hashValue: strptr("true"), needsHash: true},
-	}
-	for i, c := range cases {
-		name := fmt.Sprintf("test%d", i)
-		in.Append(makeConfigMap(rf, name, c.behavior, c.hashValue))
-		expected.Append(makeConfigMapOptions(rf, name, c.behavior, !c.needsHash))
-	}
-	actual, err := UpdateResourceOptions(in)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err.Error())
-	}
-	for i, a := range expected.Resources() {
-		b := actual.GetByIndex(i)
-		if b == nil {
-			t.Fatalf("resource %d missing from processed map", i)
-		}
-		if !a.Equals(b) {
-			t.Errorf("expected %v got %v", a, b)
-		}
-		if a.NeedHashSuffix() != b.NeedHashSuffix() {
-			t.Errorf("")
-		}
-		if a.Behavior() != b.Behavior() {
-			t.Errorf("expected %v got %v", a.Behavior(), b.Behavior())
-		}
-	}
-}
-
-func TestUpdateResourceOptionsWithInvalidHashAnnotationValues(t *testing.T) {
-	rf := resource.NewFactory(kunstruct.NewKunstructuredFactoryImpl())
-	cases := []string{
-		"",
-		"FaLsE",
-		"TrUe",
-		"potato",
-	}
-	for i, c := range cases {
-		name := fmt.Sprintf("test%d", i)
-		in := resmap.New()
-		in.Append(makeConfigMap(rf, name, "", &c))
-		_, err := UpdateResourceOptions(in)
-		if err == nil {
-			t.Errorf("expected error from value %q", c)
-		}
-	}
-}

api/internal/target/kusttarget.go

@@ -4,6 +4,7 @@
 package target
 
 import (
+	"bytes"
 	"encoding/json"
 	"fmt"
 	"strings"
@@ -17,6 +18,7 @@ import (
 	"sigs.k8s.io/kustomize/api/internal/plugins/loader"
 	"sigs.k8s.io/kustomize/api/konfig"
 	"sigs.k8s.io/kustomize/api/resmap"
+	"sigs.k8s.io/kustomize/api/transform"
 	"sigs.k8s.io/kustomize/api/types"
 	"sigs.k8s.io/yaml"
 )
@@ -27,6 +29,7 @@ type KustTarget struct {
 	ldr           ifc.Loader
 	validator     ifc.Validator
 	rFactory      *resmap.Factory
+	tFactory      resmap.PatchFactory
 	pLdr          *loader.Loader
 }
 
@@ -35,11 +38,13 @@ func NewKustTarget(
 	ldr ifc.Loader,
 	validator ifc.Validator,
 	rFactory *resmap.Factory,
+	tFactory resmap.PatchFactory,
 	pLdr *loader.Loader) *KustTarget {
 	return &KustTarget{
 		ldr:       ldr,
 		validator: validator,
 		rFactory:  rFactory,
+		tFactory:  tFactory,
 		pLdr:      pLdr,
 	}
 }
@@ -55,7 +60,7 @@ func (kt *KustTarget) Load() error {
 		return err
 	}
 	var k types.Kustomization
-	err = k.Unmarshal(content)
+	err = unmarshal(content, &k)
 	if err != nil {
 		return err
 	}
@@ -99,8 +104,18 @@ func loadKustFile(ldr ifc.Loader) ([]byte, error) {
 	}
 }
 
+func unmarshal(y []byte, o interface{}) error {
+	j, err := yaml.YAMLToJSON(y)
+	if err != nil {
+		return err
+	}
+	dec := json.NewDecoder(bytes.NewReader(j))
+	dec.DisallowUnknownFields()
+	return dec.Decode(o)
+}
+
 // MakeCustomizedResMap creates a fully customized ResMap
-// per the instructions contained in its kustomization instance.
+// per the instructions contained in its kustomiztion instance.
 func (kt *KustTarget) MakeCustomizedResMap() (resmap.ResMap, error) {
 	return kt.makeCustomizedResMap()
 }
@@ -194,10 +209,6 @@ func (kt *KustTarget) accumulateTarget(ra *accumulator.ResAccumulator) (
 	if err != nil {
 		return nil, err
 	}
-	err = kt.runValidators(ra)
-	if err != nil {
-		return nil, err
-	}
 	err = ra.MergeVars(kt.kustomization.Vars)
 	if err != nil {
 		return nil, errors.Wrapf(
@@ -249,61 +260,24 @@ func (kt *KustTarget) runTransformers(ra *accumulator.ResAccumulator) error {
 		return err
 	}
 	r = append(r, lts...)
-	lts, err = kt.configureExternalTransformers(kt.kustomization.Transformers)
+	lts, err = kt.configureExternalTransformers()
 	if err != nil {
 		return err
 	}
 	r = append(r, lts...)
-	return ra.Transform(newMultiTransformer(r))
+	t := transform.NewMultiTransformer(r)
+	return ra.Transform(t)
 }
 
-func (kt *KustTarget) configureExternalTransformers(transformers []string) ([]resmap.Transformer, error) {
+func (kt *KustTarget) configureExternalTransformers() ([]resmap.Transformer, error) {
 	ra := accumulator.MakeEmptyAccumulator()
-	ra, err := kt.accumulateResources(ra, transformers)
-
+	ra, err := kt.accumulateResources(ra, kt.kustomization.Transformers)
 	if err != nil {
 		return nil, err
 	}
 	return kt.pLdr.LoadTransformers(kt.ldr, kt.validator, ra.ResMap())
 }
 
-func (kt *KustTarget) runValidators(ra *accumulator.ResAccumulator) error {
-	validators, err := kt.configureExternalTransformers(kt.kustomization.Validators)
-	if err != nil {
-		return err
-	}
-	for _, v := range validators {
-		// Validators shouldn't modify the resource map
-		orignal := ra.ResMap().DeepCopy()
-		err = v.Transform(ra.ResMap())
-		if err != nil {
-			return err
-		}
-		new := ra.ResMap().DeepCopy()
-		kt.removeValidatedByLabel(new)
-		if err = orignal.ErrorIfNotEqualSets(new); err != nil {
-			return fmt.Errorf("validator shouldn't modify the resource map: %v", err)
-		}
-	}
-	return nil
-}
-
-func (kt *KustTarget) removeValidatedByLabel(rm resmap.ResMap) {
-	resources := rm.Resources()
-	for _, r := range resources {
-		labels := r.GetLabels()
-		if _, found := labels[konfig.ValidatedByLabelKey]; !found {
-			continue
-		}
-		delete(labels, konfig.ValidatedByLabelKey)
-		if len(labels) == 0 {
-			r.SetLabels(nil)
-		} else {
-			r.SetLabels(labels)
-		}
-	}
-}
-
 // accumulateResources fills the given resourceAccumulator
 // with resources read from the given list of paths.
 func (kt *KustTarget) accumulateResources(
@@ -347,7 +321,8 @@ func (kt *KustTarget) accumulateComponents(
 func (kt *KustTarget) accumulateDirectory(
 	ra *accumulator.ResAccumulator, ldr ifc.Loader, isComponent bool) (*accumulator.ResAccumulator, error) {
 	defer ldr.Cleanup()
-	subKt := NewKustTarget(ldr, kt.validator, kt.rFactory, kt.pLdr)
+	subKt := NewKustTarget(
+		ldr, kt.validator, kt.rFactory, kt.tFactory, kt.pLdr)
 	err := subKt.Load()
 	if err != nil {
 		return nil, errors.Wrapf(

api/internal/target/kusttarget_test.go

@@ -187,7 +187,7 @@ metadata:
 			"apiVersion": "v1",
 			"kind":       "Namespace",
 			"metadata": map[string]interface{}{
-				"name": "ns1",
+				"name": "foo-ns1-bar",
 				"labels": map[string]interface{}{
 					"app": "nginx",
 				},
@@ -201,7 +201,7 @@ metadata:
 				"apiVersion": "v1",
 				"kind":       "ConfigMap",
 				"metadata": map[string]interface{}{
-					"name":      "foo-literalConfigMap-bar-g5f6t456f5",
+					"name":      "foo-literalConfigMap-bar-8d2dkb8k24",
 					"namespace": "ns1",
 					"labels": map[string]interface{}{
 						"app": "nginx",
@@ -220,7 +220,7 @@ metadata:
 				"apiVersion": "v1",
 				"kind":       "Secret",
 				"metadata": map[string]interface{}{
-					"name":      "foo-secret-bar-82c2g5f8f6",
+					"name":      "foo-secret-bar-9btc7bt4kb",
 					"namespace": "ns1",
 					"labels": map[string]interface{}{
 						"app": "nginx",

api/internal/target/maker_test.go

@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	"sigs.k8s.io/kustomize/api/filesys"
-	"sigs.k8s.io/kustomize/api/internal/k8sdeps/merge"
+	"sigs.k8s.io/kustomize/api/internal/k8sdeps/transformer"
 	pLdr "sigs.k8s.io/kustomize/api/internal/plugins/loader"
 	"sigs.k8s.io/kustomize/api/internal/target"
 	"sigs.k8s.io/kustomize/api/k8sdeps/kunstruct"
@@ -35,17 +35,17 @@ func makeKustTargetWithRf(
 	t *testing.T,
 	fSys filesys.FileSystem,
 	root string,
-	resourceFactory *resource.Factory) *target.KustTarget {
+	resFact *resource.Factory) *target.KustTarget {
+	rf := resmap.NewFactory(resFact, transformer.NewFactoryImpl())
+	pc := konfig.DisabledPluginConfig()
 	ldr, err := fLdr.NewLoader(fLdr.RestrictionRootOnly, root, fSys)
 	if err != nil {
 		t.Fatal(err)
 	}
-	rf := resmap.NewFactory(
-		resourceFactory, merge.NewMerginator(resourceFactory))
-	pc := konfig.DisabledPluginConfig()
 	return target.NewKustTarget(
 		ldr,
 		valtest_test.MakeFakeValidator(),
 		rf,
+		transformer.NewFactoryImpl(),
 		pLdr.NewLoader(pc, rf))
 }

api/internal/validate/fieldvalidator.go

@@ -1,64 +0,0 @@
-// Copyright 2020 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package validate
-
-import (
-	"sigs.k8s.io/kustomize/api/ifc"
-)
-
-// FieldValidator implements ifc.Validator to check
-// the values of various KRM string fields,
-// e.g. labels, annotations, names, namespaces.
-type FieldValidator struct {
-}
-
-var _ ifc.Validator = (*FieldValidator)(nil)
-
-func NewFieldValidator() *FieldValidator {
-	return &FieldValidator{}
-}
-
-// TODO(#FieldValidator): implement MakeAnnotationValidator
-func (f FieldValidator) MakeAnnotationValidator() func(map[string]string) error {
-	return func(x map[string]string) error {
-		return nil
-	}
-}
-
-// TODO(#FieldValidator): implement MakeAnnotationNameValidator
-func (f FieldValidator) MakeAnnotationNameValidator() func([]string) error {
-	return func(x []string) error {
-		return nil
-	}
-}
-
-// TODO(#FieldValidator): implement MakeLabelValidator
-func (f FieldValidator) MakeLabelValidator() func(map[string]string) error {
-	return func(x map[string]string) error {
-		return nil
-	}
-}
-
-// TODO(#FieldValidator): implement MakeLabelNameValidator
-func (f FieldValidator) MakeLabelNameValidator() func([]string) error {
-	return func(x []string) error {
-		return nil
-	}
-}
-
-// TODO(#FieldValidator): implement ValidateNamespace
-func (f FieldValidator) ValidateNamespace(s string) []string {
-	var errs []string
-	return errs
-}
-
-// TODO(#FieldValidator): implement ErrIfInvalidKey
-func (f FieldValidator) ErrIfInvalidKey(s string) error {
-	return nil
-}
-
-// TODO(#FieldValidator): implement IsEnvVarName
-func (f FieldValidator) IsEnvVarName(k string) error {
-	return nil
-}

api/internal/validate/fieldvalidator_test.go

@@ -1,4 +0,0 @@
-// Copyright 2020 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package validate_test

api/internal/wrappy/factory.go

@@ -1,41 +0,0 @@
-// Copyright 2020 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package wrappy
-
-import (
-	"sigs.k8s.io/kustomize/api/ifc"
-	"sigs.k8s.io/kustomize/api/types"
-)
-
-// WNodeFactory makes instances of WNode.
-// These instances in turn adapt
-//   sigs.k8s.io/kustomize/kyaml/yaml.RNode
-// to implement ifc.Unstructured.
-// This factory is meant to implement ifc.KunstructuredFactory.
-type WNodeFactory struct {
-}
-
-var _ ifc.KunstructuredFactory = (*WNodeFactory)(nil)
-
-func (k *WNodeFactory) SliceFromBytes(bs []byte) ([]ifc.Kunstructured, error) {
-	panic("TODO(#WNodeFactory): implement SliceFromBytes")
-}
-
-func (k *WNodeFactory) FromMap(m map[string]interface{}) ifc.Kunstructured {
-	panic("TODO(#WNodeFactory): implement FromMap")
-}
-
-func (k *WNodeFactory) Hasher() ifc.KunstructuredHasher {
-	panic("TODO(#WNodeFactory): implement Hasher")
-}
-
-func (k *WNodeFactory) MakeConfigMap(
-	kvLdr ifc.KvLoader, args *types.ConfigMapArgs) (ifc.Kunstructured, error) {
-	panic("TODO(#WNodeFactory): implement MakeConfigMap")
-}
-
-func (k *WNodeFactory) MakeSecret(
-	kvLdr ifc.KvLoader, args *types.SecretArgs) (ifc.Kunstructured, error) {
-	panic("TODO(#WNodeFactory): implement MakeSecret")
-}

api/internal/wrappy/factory_test.go

@@ -1,4 +0,0 @@
-// Copyright 2020 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package wrappy_test

api/internal/wrappy/wnode.go

@@ -1,143 +0,0 @@
-// Copyright 2020 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package wrappy
-
-import (
-	"log"
-
-	"sigs.k8s.io/kustomize/api/ifc"
-	"sigs.k8s.io/kustomize/api/resid"
-	"sigs.k8s.io/kustomize/kyaml/yaml"
-)
-
-// WNode implements ifc.Kunstructured using yaml.RNode.
-//
-// It exists only to help manage a switch from
-// kunstruct.UnstructAdapter to yaml.RNode as the core
-// representation of KRM objects in kustomize.
-//
-// It's got a silly name because we don't want it around for long,
-// and want its use to be obvious.
-type WNode struct {
-	node *yaml.RNode
-}
-
-var _ ifc.Kunstructured = (*WNode)(nil)
-
-func NewWNode() *WNode {
-	return FromRNode(yaml.NewRNode(nil))
-}
-
-func FromRNode(node *yaml.RNode) *WNode {
-	return &WNode{node: node}
-}
-
-func (wn *WNode) demandMetaData(label string) yaml.ResourceMeta {
-	meta, err := wn.node.GetMeta()
-	if err != nil {
-		// Log and die since interface doesn't allow error.
-		log.Fatalf("for %s', expected valid resource: %v", label, err)
-	}
-	return meta
-}
-
-// Copy implements ifc.Kunstructured.
-func (wn *WNode) Copy() ifc.Kunstructured {
-	return &WNode{node: wn.node.Copy()}
-}
-
-// GetAnnotations implements ifc.Kunstructured.
-func (wn *WNode) GetAnnotations() map[string]string {
-	return wn.demandMetaData("GetAnnotations").Annotations
-}
-
-// GetFieldValue implements ifc.Kunstructured.
-func (wn *WNode) GetFieldValue(path string) (interface{}, error) {
-	// The argument is a json path, e.g. "metadata.name"
-	// fields := strings.Split(path, ".")
-	// return wn.node.Pipe(yaml.Lookup(fields...))
-	panic("TODO(#WNode): GetFieldValue; implement or drop from API")
-}
-
-// GetGvk implements ifc.Kunstructured.
-func (wn *WNode) GetGvk() resid.Gvk {
-	meta := wn.demandMetaData("GetGvk")
-	g, v := resid.ParseGroupVersion(meta.APIVersion)
-	return resid.Gvk{Group: g, Version: v, Kind: meta.Kind}
-}
-
-// GetKind implements ifc.Kunstructured.
-func (wn *WNode) GetKind() string {
-	return wn.demandMetaData("GetKind").Kind
-}
-
-// GetLabels implements ifc.Kunstructured.
-func (wn *WNode) GetLabels() map[string]string {
-	return wn.demandMetaData("GetLabels").Labels
-}
-
-// GetName implements ifc.Kunstructured.
-func (wn *WNode) GetName() string {
-	return wn.demandMetaData("GetName").Name
-}
-
-// GetSlice implements ifc.Kunstructured.
-func (wn *WNode) GetSlice(string) ([]interface{}, error) {
-	panic("TODO(#WNode) GetSlice; implement or drop from API")
-}
-
-// GetSlice implements ifc.Kunstructured.
-func (wn *WNode) GetString(string) (string, error) {
-	panic("TODO(#WNode) GetString; implement or drop from API")
-}
-
-// Map implements ifc.Kunstructured.
-func (wn *WNode) Map() map[string]interface{} {
-	panic("TODO(#WNode) Map; implement or drop from API")
-}
-
-// MarshalJSON implements ifc.Kunstructured.
-func (wn *WNode) MarshalJSON() ([]byte, error) {
-	return wn.node.MarshalJSON()
-}
-
-// MatchesAnnotationSelector implements ifc.Kunstructured.
-func (wn *WNode) MatchesAnnotationSelector(string) (bool, error) {
-	panic("TODO(#WNode) MatchesAnnotationSelector; implement or drop from API")
-}
-
-// MatchesLabelSelector implements ifc.Kunstructured.
-func (wn *WNode) MatchesLabelSelector(string) (bool, error) {
-	panic("TODO(#WNode) MatchesLabelSelector; implement or drop from API")
-}
-
-// SetAnnotations implements ifc.Kunstructured.
-func (wn *WNode) SetAnnotations(map[string]string) {
-	panic("TODO(#WNode) SetAnnotations; implement or drop from API")
-}
-
-// SetGvk implements ifc.Kunstructured.
-func (wn *WNode) SetGvk(resid.Gvk) {
-	panic("TODO(#WNode) SetGvk; implement or drop from API")
-}
-
-// SetLabels implements ifc.Kunstructured.
-func (wn *WNode) SetLabels(map[string]string) {
-	panic("TODO(#WNode) SetLabels; implement or drop from API")
-}
-
-// SetName implements ifc.Kunstructured.
-func (wn *WNode) SetName(string) {
-	panic("TODO(#WNode) SetName; implement or drop from API")
-}
-
-// SetNamespace implements ifc.Kunstructured.
-func (wn *WNode) SetNamespace(string) {
-	panic("TODO(#WNode) SetNamespace; implement or drop from API")
-}
-
-// UnmarshalJSON implements ifc.Kunstructured.
-func (wn *WNode) UnmarshalJSON(data []byte) error {
-	return wn.node.UnmarshalJSON(data)
-}

api/internal/wrappy/wnode_test.go

@@ -1,339 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package wrappy_test
-
-import (
-	"strings"
-	"testing"
-
-	"gopkg.in/yaml.v3"
-	. "sigs.k8s.io/kustomize/api/internal/wrappy"
-	kyaml "sigs.k8s.io/kustomize/kyaml/yaml"
-)
-
-const (
-	deploymentLittleJson = `{"apiVersion":"apps/v1","kind":"Deployment",` +
-		`"metadata":{"name":"homer","namespace":"simpsons"}}`
-
-	deploymentBiggerJson = `
-{
-  "apiVersion": "apps/v1",
-  "kind": "Deployment",
-  "metadata": {
-    "name": "homer",
-    "namespace": "simpsons",
-    "labels": {
-      "fruit": "apple",
-      "veggie": "carrot"
-    },
-    "annotations": {
-      "area": "51",
-      "greeting": "Take me to your leader."
-    }
-  }
-}
-`
-	bigMapYaml = `Kind: Service
-complextree:
-  - field1:
-      - boolfield: true
-        floatsubfield: 1.01
-        intsubfield: 1010
-        stringsubfield: idx1010
-      - boolfield: false
-        floatsubfield: 1.011
-        intsubfield: 1011
-        stringsubfield: idx1011
-    field2:
-      - boolfield: true
-        floatsubfield: 1.02
-        intsubfield: 1020
-        stringsubfield: idx1020
-      - boolfield: false
-        floatsubfield: 1.021
-        intsubfield: 1021
-        stringsubfield: idx1021
-  - field1:
-      - boolfield: true
-        floatsubfield: 1.11
-        intsubfield: 1110
-        stringsubfield: idx1110
-      - boolfield: false
-        floatsubfield: 1.111
-        intsubfield: 1111
-        stringsubfield: idx1111
-    field2:
-      - boolfield: true
-        floatsubfield: 1.112
-        intsubfield: 1120
-        stringsubfield: idx1120
-      - boolfield: false
-        floatsubfield: 1.1121
-        intsubfield: 1121
-        stringsubfield: idx1121
-metadata:
-    labels:
-        app: application-name
-    name: service-name
-spec:
-    ports:
-        port: 80
-that:
-  - idx0
-  - idx1
-  - idx2
-  - idx3
-these:
-  - field1:
-      - idx010
-      - idx011
-    field2:
-      - idx020
-      - idx021
-  - field1:
-      - idx110
-      - idx111
-    field2:
-      - idx120
-      - idx121
-  - field1:
-      - idx210
-      - idx211
-    field2:
-      - idx220
-      - idx221
-this:
-    is:
-        aBool: true
-        aFloat: 1.001
-        aNilValue: null
-        aNumber: 1000
-        anEmptyMap: {}
-        anEmptySlice: []
-those:
-  - field1: idx0foo
-    field2: idx0bar
-  - field1: idx1foo
-    field2: idx1bar
-  - field1: idx2foo
-    field2: idx2bar
-`
-)
-
-func makeBigMap() map[string]interface{} {
-	return map[string]interface{}{
-		"Kind": "Service",
-		"metadata": map[string]interface{}{
-			"labels": map[string]interface{}{
-				"app": "application-name",
-			},
-			"name": "service-name",
-		},
-		"spec": map[string]interface{}{
-			"ports": map[string]interface{}{
-				"port": int64(80),
-			},
-		},
-		"this": map[string]interface{}{
-			"is": map[string]interface{}{
-				"aNumber":      int64(1000),
-				"aFloat":       float64(1.001),
-				"aNilValue":    nil,
-				"aBool":        true,
-				"anEmptyMap":   map[string]interface{}{},
-				"anEmptySlice": []interface{}{},
-				/*
-					TODO: test for unrecognizable (e.g. a function)
-						"unrecognizable": testing.InternalExample{
-							Name: "fooBar",
-						},
-				*/
-			},
-		},
-		"that": []interface{}{
-			"idx0",
-			"idx1",
-			"idx2",
-			"idx3",
-		},
-		"those": []interface{}{
-			map[string]interface{}{
-				"field1": "idx0foo",
-				"field2": "idx0bar",
-			},
-			map[string]interface{}{
-				"field1": "idx1foo",
-				"field2": "idx1bar",
-			},
-			map[string]interface{}{
-				"field1": "idx2foo",
-				"field2": "idx2bar",
-			},
-		},
-		"these": []interface{}{
-			map[string]interface{}{
-				"field1": []interface{}{"idx010", "idx011"},
-				"field2": []interface{}{"idx020", "idx021"},
-			},
-			map[string]interface{}{
-				"field1": []interface{}{"idx110", "idx111"},
-				"field2": []interface{}{"idx120", "idx121"},
-			},
-			map[string]interface{}{
-				"field1": []interface{}{"idx210", "idx211"},
-				"field2": []interface{}{"idx220", "idx221"},
-			},
-		},
-		"complextree": []interface{}{
-			map[string]interface{}{
-				"field1": []interface{}{
-					map[string]interface{}{
-						"stringsubfield": "idx1010",
-						"intsubfield":    int64(1010),
-						"floatsubfield":  float64(1.010),
-						"boolfield":      true,
-					},
-					map[string]interface{}{
-						"stringsubfield": "idx1011",
-						"intsubfield":    int64(1011),
-						"floatsubfield":  float64(1.011),
-						"boolfield":      false,
-					},
-				},
-				"field2": []interface{}{
-					map[string]interface{}{
-						"stringsubfield": "idx1020",
-						"intsubfield":    int64(1020),
-						"floatsubfield":  float64(1.020),
-						"boolfield":      true,
-					},
-					map[string]interface{}{
-						"stringsubfield": "idx1021",
-						"intsubfield":    int64(1021),
-						"floatsubfield":  float64(1.021),
-						"boolfield":      false,
-					},
-				},
-			},
-			map[string]interface{}{
-				"field1": []interface{}{
-					map[string]interface{}{
-						"stringsubfield": "idx1110",
-						"intsubfield":    int64(1110),
-						"floatsubfield":  float64(1.110),
-						"boolfield":      true,
-					},
-					map[string]interface{}{
-						"stringsubfield": "idx1111",
-						"intsubfield":    int64(1111),
-						"floatsubfield":  float64(1.111),
-						"boolfield":      false,
-					},
-				},
-				"field2": []interface{}{
-					map[string]interface{}{
-						"stringsubfield": "idx1120",
-						"intsubfield":    int64(1120),
-						"floatsubfield":  float64(1.1120),
-						"boolfield":      true,
-					},
-					map[string]interface{}{
-						"stringsubfield": "idx1121",
-						"intsubfield":    int64(1121),
-						"floatsubfield":  float64(1.1121),
-						"boolfield":      false,
-					},
-				},
-			},
-		},
-	}
-}
-
-func TestBasicYamlOperationFromMap(t *testing.T) {
-	bytes, err := yaml.Marshal(makeBigMap())
-	if err != nil {
-		t.Fatalf("unexpected yaml.Marshal err: %v", err)
-	}
-	if string(bytes) != bigMapYaml {
-		t.Fatalf("unexpected string equality")
-	}
-	rNode, err := kyaml.Parse(string(bytes))
-	if err != nil {
-		t.Fatalf("unexpected yaml.Marshal err: %v", err)
-	}
-	rNodeString := rNode.MustString()
-	// The result from MustString has more indentation
-	// than bigMapYaml.
-	rNodeStrings := strings.Split(rNodeString, "\n")
-	bigMapStrings := strings.Split(bigMapYaml, "\n")
-	if len(rNodeStrings) != len(bigMapStrings) {
-		t.Fatalf("line count mismatch")
-	}
-	for i := range rNodeStrings {
-		s1 := strings.TrimSpace(rNodeStrings[i])
-		s2 := strings.TrimSpace(bigMapStrings[i])
-		if s1 != s2 {
-			t.Fatalf("expected '%s'=='%s'", s1, s2)
-		}
-	}
-}
-
-func TestRoundTripJSON(t *testing.T) {
-	wn := NewWNode()
-	err := wn.UnmarshalJSON([]byte(deploymentLittleJson))
-	if err != nil {
-		t.Fatalf("unexpected UnmarshalJSON err: %v", err)
-	}
-	data, err := wn.MarshalJSON()
-	if err != nil {
-		t.Fatalf("unexpected MarshalJSON err: %v", err)
-	}
-	actual := string(data)
-	if actual != deploymentLittleJson {
-		t.Fatalf("expected %s, got %s", deploymentLittleJson, actual)
-	}
-}
-
-func TestGettingFields(t *testing.T) {
-	wn := NewWNode()
-	err := wn.UnmarshalJSON([]byte(deploymentBiggerJson))
-	if err != nil {
-		t.Fatalf("unexpected unmarshaljson err: %v", err)
-	}
-	gvk := wn.GetGvk()
-	expected := "apps"
-	actual := gvk.Group
-	if expected != actual {
-		t.Fatalf("expected '%s', got '%s'", expected, actual)
-	}
-	expected = "v1"
-	actual = gvk.Version
-	if expected != actual {
-		t.Fatalf("expected '%s', got '%s'", expected, actual)
-	}
-	expected = "Deployment"
-	actual = gvk.Kind
-	if expected != actual {
-		t.Fatalf("expected '%s', got '%s'", expected, actual)
-	}
-	actual = wn.GetKind()
-	if expected != actual {
-		t.Fatalf("expected '%s', got '%s'", expected, actual)
-	}
-	expected = "homer"
-	actual = wn.GetName()
-	if expected != actual {
-		t.Fatalf("expected '%s', got '%s'", expected, actual)
-	}
-	actualMap := wn.GetLabels()
-	v, ok := actualMap["fruit"]
-	if !ok || v != "apple" {
-		t.Fatalf("unexpected labels '%v'", actualMap)
-	}
-	actualMap = wn.GetAnnotations()
-	v, ok = actualMap["greeting"]
-	if !ok || v != "Take me to your leader." {
-		t.Fatalf("unexpected annotations '%v'", actualMap)
-	}
-}

api/k8sdeps/kunstruct/factory.go

@@ -17,11 +17,7 @@ import (
 	"sigs.k8s.io/kustomize/api/types"
 )
 
-// KunstructuredFactoryImpl makes instances of UnstructAdapter.
-// These instances in turn adapt structs in
-//   k8s.io/apimachinery/pkg/apis/meta/v1/unstructured
-// to implement ifc.Kunstructured.
-// This factory is meant to implement ifc.KunstructuredFactory.
+// KunstructuredFactoryImpl hides construction using apimachinery types.
 type KunstructuredFactoryImpl struct {
 	hasher *kustHash
 }

api/k8sdeps/kunstruct/hasher.go

@@ -4,9 +4,13 @@
 package kunstruct
 
 import (
+	"encoding/json"
+	"fmt"
+
+	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"sigs.k8s.io/kustomize/api/hasher"
 	"sigs.k8s.io/kustomize/api/ifc"
-	"sigs.k8s.io/kustomize/kyaml/filtersutil"
 )
 
 // kustHash computes a hash of an unstructured object.
@@ -17,11 +21,109 @@ func NewKustHash() *kustHash {
 	return &kustHash{}
 }
 
-// Hash returns a hash of the given object
+// Hash returns a hash of either a ConfigMap or a Secret
 func (h *kustHash) Hash(m ifc.Kunstructured) (string, error) {
-	node, err := filtersutil.GetRNode(m)
+	u := unstructured.Unstructured{
+		Object: m.Map(),
+	}
+	kind := u.GetKind()
+	switch kind {
+	case "ConfigMap":
+		cm, err := unstructuredToConfigmap(u)
+		if err != nil {
+			return "", err
+		}
+		return configMapHash(cm)
+	case "Secret":
+		sec, err := unstructuredToSecret(u)
+
+		if err != nil {
+			return "", err
+		}
+		return secretHash(sec)
+	default:
+		return "", fmt.Errorf(
+			"type %s is not supported for hashing in %v",
+			kind, m.Map())
+	}
+}
+
+// configMapHash returns a hash of the ConfigMap.
+// The Data, Kind, and Name are taken into account.
+func configMapHash(cm *corev1.ConfigMap) (string, error) {
+	encoded, err := encodeConfigMap(cm)
 	if err != nil {
 		return "", err
 	}
-	return hasher.HashRNode(node)
+	h, err := hasher.Encode(hasher.Hash(encoded))
+	if err != nil {
+		return "", err
+	}
+	return h, nil
+}
+
+// SecretHash returns a hash of the Secret.
+// The Data, Kind, Name, and Type are taken into account.
+func secretHash(sec *corev1.Secret) (string, error) {
+	encoded, err := encodeSecret(sec)
+	if err != nil {
+		return "", err
+	}
+	h, err := hasher.Encode(hasher.Hash(encoded))
+	if err != nil {
+		return "", err
+	}
+	return h, nil
+}
+
+// encodeConfigMap encodes a ConfigMap.
+// Data, Kind, and Name are taken into account.
+// BinaryData is included if it's not empty to avoid useless key in output.
+func encodeConfigMap(cm *corev1.ConfigMap) (string, error) {
+	// json.Marshal sorts the keys in a stable order in the encoding
+	m := map[string]interface{}{"kind": "ConfigMap", "name": cm.Name, "data": cm.Data}
+	if len(cm.BinaryData) > 0 {
+		m["binaryData"] = cm.BinaryData
+	}
+	data, err := json.Marshal(m)
+	if err != nil {
+		return "", err
+	}
+	return string(data), nil
+}
+
+// encodeSecret encodes a Secret.
+// Data, Kind, Name, and Type are taken into account.
+// StringData is included if it's not empty to avoid useless key in output.
+func encodeSecret(sec *corev1.Secret) (string, error) {
+	// json.Marshal sorts the keys in a stable order in the encoding
+	m := map[string]interface{}{"kind": "Secret", "type": sec.Type, "name": sec.Name, "data": sec.Data}
+	if len(sec.StringData) > 0 {
+		m["stringData"] = sec.StringData
+	}
+	data, err := json.Marshal(m)
+	if err != nil {
+		return "", err
+	}
+	return string(data), nil
+}
+
+func unstructuredToConfigmap(u unstructured.Unstructured) (*corev1.ConfigMap, error) {
+	marshaled, err := json.Marshal(u.Object)
+	if err != nil {
+		return nil, err
+	}
+	var out corev1.ConfigMap
+	err = json.Unmarshal(marshaled, &out)
+	return &out, err
+}
+
+func unstructuredToSecret(u unstructured.Unstructured) (*corev1.Secret, error) {
+	marshaled, err := json.Marshal(u.Object)
+	if err != nil {
+		return nil, err
+	}
+	var out corev1.Secret
+	err = json.Unmarshal(marshaled, &out)
+	return &out, err
 }

api/k8sdeps/kunstruct/hasher_test.go

@@ -1,34 +1,190 @@
+// Copyright 2019 The Kubernetes Authors.
+// SPDX-License-Identifier: Apache-2.0
+
 package kunstruct
 
 import (
+	"reflect"
+	"strings"
 	"testing"
+
+	corev1 "k8s.io/api/core/v1"
 )
 
-func TestHasher(t *testing.T) {
-	input := `
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: foo
-data:
-  one: ""
-binaryData:
-  two: ""
-`
-	expect := "698h7c7t9m"
-
-	factory := NewKunstructuredFactoryImpl()
-	k, err := factory.SliceFromBytes([]byte(input))
-	if err != nil {
-		t.Fatal(err)
+func TestConfigMapHash(t *testing.T) {
+	cases := []struct {
+		desc string
+		cm   *corev1.ConfigMap
+		hash string
+		err  string
+	}{
+		// empty map
+		{"empty data", &corev1.ConfigMap{Data: map[string]string{}, BinaryData: map[string][]byte{}}, "42745tchd9", ""},
+		// one key
+		{"one key", &corev1.ConfigMap{Data: map[string]string{"one": ""}}, "9g67k2htb6", ""},
+		// three keys (tests sorting order)
+		{"three keys", &corev1.ConfigMap{Data: map[string]string{"two": "2", "one": "", "three": "3"}}, "f5h7t85m9b", ""},
+		// empty binary data map
+		{"empty binary data", &corev1.ConfigMap{BinaryData: map[string][]byte{}}, "dk855m5d49", ""},
+		// one key with binary data
+		{"one key with binary data", &corev1.ConfigMap{BinaryData: map[string][]byte{"one": []byte("")}}, "mk79584b8c", ""},
+		// three keys with binary data (tests sorting order)
+		{"three keys with binary data", &corev1.ConfigMap{BinaryData: map[string][]byte{"two": []byte("2"), "one": []byte(""), "three": []byte("3")}}, "t458mc6db2", ""},
+		// two keys, one with string and another with binary data
+		{"two keys with one each", &corev1.ConfigMap{Data: map[string]string{"one": ""}, BinaryData: map[string][]byte{"two": []byte("")}}, "698h7c7t9m", ""},
 	}
 
-	hasher := NewKustHash()
-	result, err := hasher.Hash(k[0])
-	if err != nil {
-		t.Fatal(err)
-	}
-	if result != expect {
-		t.Fatalf("expect %s but got %s", expect, result)
+	for _, c := range cases {
+		h, err := configMapHash(c.cm)
+		if SkipRest(t, c.desc, err, c.err) {
+			continue
+		}
+		if c.hash != h {
+			t.Errorf("case %q, expect hash %q but got %q", c.desc, c.hash, h)
+		}
 	}
 }
+
+func TestSecretHash(t *testing.T) {
+	cases := []struct {
+		desc   string
+		secret *corev1.Secret
+		hash   string
+		err    string
+	}{
+		// empty map
+		{"empty data", &corev1.Secret{Type: "my-type", Data: map[string][]byte{}}, "t75bgf6ctb", ""},
+		// one key
+		{"one key", &corev1.Secret{Type: "my-type", Data: map[string][]byte{"one": []byte("")}}, "74bd68bm66", ""},
+		// three keys (tests sorting order)
+		{"three keys", &corev1.Secret{Type: "my-type", Data: map[string][]byte{"two": []byte("2"), "one": []byte(""), "three": []byte("3")}}, "dgcb6h9tmk", ""},
+		// with stringdata
+		{"stringdata", &corev1.Secret{Type: "my-type", Data: map[string][]byte{"one": []byte("")}, StringData: map[string]string{"two": "2"}}, "ckm7f798g2", ""},
+		// empty stringdata
+		{"empty stringdata", &corev1.Secret{Type: "my-type", Data: map[string][]byte{"one": []byte("")}, StringData: map[string]string{}}, "74bd68bm66", ""},
+	}
+
+	for _, c := range cases {
+		h, err := secretHash(c.secret)
+		if SkipRest(t, c.desc, err, c.err) {
+			continue
+		}
+		if c.hash != h {
+			t.Errorf("case %q, expect hash %q but got %q", c.desc, c.hash, h)
+		}
+	}
+}
+
+func TestEncodeConfigMap(t *testing.T) {
+	cases := []struct {
+		desc   string
+		cm     *corev1.ConfigMap
+		expect string
+		err    string
+	}{
+		// empty map
+		{"empty data", &corev1.ConfigMap{Data: map[string]string{}}, `{"data":{},"kind":"ConfigMap","name":""}`, ""},
+		// one key
+		{"one key", &corev1.ConfigMap{Data: map[string]string{"one": ""}}, `{"data":{"one":""},"kind":"ConfigMap","name":""}`, ""},
+		// three keys (tests sorting order)
+		{"three keys", &corev1.ConfigMap{Data: map[string]string{"two": "2", "one": "", "three": "3"}},
+			`{"data":{"one":"","three":"3","two":"2"},"kind":"ConfigMap","name":""}`, ""},
+		// empty binary map
+		{"empty data", &corev1.ConfigMap{BinaryData: map[string][]byte{}}, `{"data":null,"kind":"ConfigMap","name":""}`, ""},
+		// one key with binary data
+		{"one key", &corev1.ConfigMap{BinaryData: map[string][]byte{"one": []byte("")}},
+			`{"binaryData":{"one":""},"data":null,"kind":"ConfigMap","name":""}`, ""},
+		// three keys with binary data (tests sorting order)
+		{"three keys", &corev1.ConfigMap{BinaryData: map[string][]byte{"two": []byte("2"), "one": []byte(""), "three": []byte("3")}},
+			`{"binaryData":{"one":"","three":"Mw==","two":"Mg=="},"data":null,"kind":"ConfigMap","name":""}`, ""},
+		// two keys, one string and one binary values
+		{"two keys with one each", &corev1.ConfigMap{Data: map[string]string{"one": ""}, BinaryData: map[string][]byte{"two": []byte("")}},
+			`{"binaryData":{"two":""},"data":{"one":""},"kind":"ConfigMap","name":""}`, ""},
+	}
+	for _, c := range cases {
+		s, err := encodeConfigMap(c.cm)
+		if SkipRest(t, c.desc, err, c.err) {
+			continue
+		}
+		if s != c.expect {
+			t.Errorf("case %q, expect %q but got %q from encode %#v", c.desc, c.expect, s, c.cm)
+		}
+	}
+}
+
+func TestEncodeSecret(t *testing.T) {
+	cases := []struct {
+		desc   string
+		secret *corev1.Secret
+		expect string
+		err    string
+	}{
+		// empty map
+		{"empty data", &corev1.Secret{Type: "my-type", Data: map[string][]byte{}}, `{"data":{},"kind":"Secret","name":"","type":"my-type"}`, ""},
+		// one key
+		{"one key", &corev1.Secret{Type: "my-type", Data: map[string][]byte{"one": []byte("")}}, `{"data":{"one":""},"kind":"Secret","name":"","type":"my-type"}`, ""},
+		// three keys (tests sorting order) - note json.Marshal base64 encodes the values because they come in as []byte
+		{"three keys", &corev1.Secret{
+			Type: "my-type",
+			Data: map[string][]byte{"two": []byte("2"), "one": []byte(""), "three": []byte("3")},
+		},
+			`{"data":{"one":"","three":"Mw==","two":"Mg=="},"kind":"Secret","name":"","type":"my-type"}`, ""},
+		// with stringdata
+		{"stringdata", &corev1.Secret{Type: "my-type", Data: map[string][]byte{"one": []byte("")}, StringData: map[string]string{"two": "2"}},
+			`{"data":{"one":""},"kind":"Secret","name":"","stringData":{"two":"2"},"type":"my-type"}`, ""},
+		// empty stringdata
+		{"empty stringdata", &corev1.Secret{Type: "my-type", Data: map[string][]byte{"one": []byte("")}, StringData: map[string]string{}},
+			`{"data":{"one":""},"kind":"Secret","name":"","type":"my-type"}`, ""},
+	}
+	for _, c := range cases {
+		s, err := encodeSecret(c.secret)
+		if SkipRest(t, c.desc, err, c.err) {
+			continue
+		}
+		if s != c.expect {
+			t.Errorf("case %q, expect %q but got %q from encode %#v", c.desc, c.expect, s, c.secret)
+		}
+	}
+}
+
+// warn devs who change types that they might have to update a hash function
+// not perfect, as it only checks the number of top-level fields
+func TestTypeStability(t *testing.T) {
+	errfmt := `case %q, expected %d fields but got %d
+Depending on the field(s) you added, you may need to modify the hash function for this type.
+To guide you: the hash function targets fields that comprise the contents of objects,
+not their metadata (e.g. the Data of a ConfigMap, but nothing in ObjectMeta).
+`
+	cases := []struct {
+		typeName string
+		obj      interface{}
+		expect   int
+	}{
+		{"ConfigMap", corev1.ConfigMap{}, 4},
+		{"Secret", corev1.Secret{}, 5},
+	}
+	for _, c := range cases {
+		val := reflect.ValueOf(c.obj)
+		if num := val.NumField(); c.expect != num {
+			t.Errorf(errfmt, c.typeName, c.expect, num)
+		}
+	}
+}
+
+// SkipRest returns true if there was a non-nil error or if we expected an error that didn't happen,
+// and logs the appropriate error on the test object.
+// The return value indicates whether we should skip the rest of the test case due to the error result.
+func SkipRest(t *testing.T, desc string, err error, contains string) bool {
+	if err != nil {
+		if len(contains) == 0 {
+			t.Errorf("case %q, expect nil error but got %q", desc, err.Error())
+		} else if !strings.Contains(err.Error(), contains) {
+			t.Errorf("case %q, expect error to contain %q but got %q", desc, contains, err.Error())
+		}
+		return true
+	} else if len(contains) > 0 {
+		t.Errorf("case %q, expect error to contain %q but got nil error", desc, contains)
+		return true
+	}
+	return false
+}

api/k8sdeps/kunstruct/unstructadapter_test.go

@@ -466,6 +466,278 @@ func TestGetString(t *testing.T) {
 	}
 }
 
+func TestGetInt64(t *testing.T) {
+	tests := []struct {
+		name          string
+		pathToField   string
+		expectedValue int64
+		errorExpected bool
+		errorMsg      string
+	}{
+		{
+			name:          "numberAsValue",
+			pathToField:   "this.is.aNumber",
+			errorExpected: false,
+			expectedValue: int64(1000),
+		},
+		{
+			name:          "validStructSubFieldIndexSubfield",
+			pathToField:   "complextree[1].field2[1].intsubfield",
+			errorExpected: false,
+			expectedValue: int64(1121),
+		},
+		{
+			name:          "twoFieldsOneMissing",
+			pathToField:   "metadata.banana",
+			errorExpected: true,
+			errorMsg:      "no field named 'metadata.banana'",
+		},
+		{
+			name:          "validStructSubFieldOutOfBoundIndex",
+			pathToField:   "these[1].field2[99]",
+			errorExpected: true,
+			errorMsg:      "no field named 'these[1].field2[99]'",
+		},
+		{
+			name:          "validDownwardAPISpecs",
+			pathToField:   `spec.ports['port']`,
+			errorExpected: false,
+			expectedValue: int64(80),
+		},
+	}
+
+	for _, test := range tests {
+		s, err := kunstructured.GetInt64(test.pathToField)
+		if test.errorExpected {
+			compareExpectedError(t, test.name, test.pathToField, err, test.errorMsg)
+			continue
+		}
+		if err != nil {
+			unExpectedError(t, test.name, test.pathToField, err)
+		}
+		compareValues(t, test.name, test.pathToField, test.expectedValue, s)
+	}
+}
+
+func TestGetFloat64(t *testing.T) {
+	tests := []struct {
+		name          string
+		pathToField   string
+		expectedValue float64
+		errorExpected bool
+		errorMsg      string
+	}{
+		{
+			name:          "floatAsValue",
+			pathToField:   "this.is.aFloat",
+			errorExpected: false,
+			expectedValue: float64(1.001),
+		},
+		{
+			name:          "validStructSubFieldIndexSubfield",
+			pathToField:   "complextree[1].field2[1].floatsubfield",
+			errorExpected: false,
+			expectedValue: float64(1.1121),
+		},
+		{
+			name:          "validDownwardAPIThis",
+			pathToField:   `this.is[aFloat]`,
+			errorExpected: false,
+			expectedValue: float64(1.001),
+		},
+		{
+			name:          "twoFieldsOneMissing",
+			pathToField:   "metadata.banana",
+			errorExpected: true,
+			errorMsg:      "no field named 'metadata.banana'",
+		},
+		{
+			name:          "validStructSubFieldOutOfBoundIndex",
+			pathToField:   "these[1].field2[99]",
+			errorExpected: true,
+			errorMsg:      "index 99 is out of bounds",
+		},
+	}
+
+	for _, test := range tests {
+		s, err := kunstructured.GetFloat64(test.pathToField)
+		if test.errorExpected {
+			compareExpectedError(t, test.name, test.pathToField, err, test.errorMsg)
+			continue
+		}
+		if err != nil {
+			unExpectedError(t, test.name, test.pathToField, err)
+		}
+		compareValues(t, test.name, test.pathToField, test.expectedValue, s)
+	}
+}
+
+func TestGetBool(t *testing.T) {
+	tests := []struct {
+		name          string
+		pathToField   string
+		expectedValue bool
+		errorExpected bool
+		errorMsg      string
+	}{
+		{
+			name:          "boolAsValue",
+			pathToField:   "this.is.aBool",
+			errorExpected: false,
+			expectedValue: true,
+		},
+		{
+			name:          "validStructSubFieldIndexSubfield",
+			pathToField:   "complextree[1].field2[1].boolfield",
+			errorExpected: false,
+			expectedValue: false,
+		},
+		{
+			name:          "twoFieldsOneMissing",
+			pathToField:   "metadata.banana",
+			errorExpected: true,
+			errorMsg:      "no field named 'metadata.banana'",
+		},
+		{
+			name:          "validStructSubFieldOutOfBoundIndex",
+			pathToField:   "these[1].field2[99]",
+			errorExpected: true,
+			errorMsg:      "no field named 'these[1].field2[99]'",
+		},
+	}
+
+	for _, test := range tests {
+		s, err := kunstructured.GetBool(test.pathToField)
+		if test.errorExpected {
+			compareExpectedError(t, test.name, test.pathToField, err, test.errorMsg)
+			continue
+		}
+		if err != nil {
+			unExpectedError(t, test.name, test.pathToField, err)
+		}
+		compareValues(t, test.name, test.pathToField, test.expectedValue, s)
+	}
+}
+
+func TestGetStringMap(t *testing.T) {
+	tests := []struct {
+		name          string
+		pathToField   string
+		errorExpected bool
+		errorMsg      string
+	}{
+		{
+			name:          "validStringMap",
+			pathToField:   "those[2]",
+			errorExpected: false,
+		},
+		{
+			name:          "twoFieldsOneMissing",
+			pathToField:   "metadata.banana",
+			errorExpected: true,
+			errorMsg:      "no field named 'metadata.banana'",
+		},
+		{
+			name:          "validStructSubFieldOutOfBoundIndex",
+			pathToField:   "these[1].field2[99]",
+			errorExpected: true,
+			errorMsg:      "no field named 'these[1].field2[99]'",
+		},
+	}
+
+	for _, test := range tests {
+		_, err := kunstructured.GetStringMap(test.pathToField)
+		if test.errorExpected {
+			compareExpectedError(t, test.name, test.pathToField, err, test.errorMsg)
+			continue
+		}
+		if err != nil {
+			unExpectedError(t, test.name, test.pathToField, err)
+		}
+	}
+}
+
+func TestGetMap(t *testing.T) {
+	tests := []struct {
+		name          string
+		pathToField   string
+		errorExpected bool
+		errorMsg      string
+	}{
+		{
+			name:          "validMap",
+			pathToField:   "those[2]",
+			errorExpected: false,
+		},
+		{
+			name:          "validStructSubFieldIndexSubfield",
+			pathToField:   "complextree[1].field2[1]",
+			errorExpected: false,
+		},
+		{
+			name:          "twoFieldsOneMissing",
+			pathToField:   "metadata.banana",
+			errorExpected: true,
+			errorMsg:      "no field named 'metadata.banana'",
+		},
+		{
+			name:          "validStructSubFieldOutOfBoundIndex",
+			pathToField:   "these[1].field2[99]",
+			errorExpected: true,
+			errorMsg:      "no field named 'these[1].field2[99]'",
+		},
+	}
+
+	for _, test := range tests {
+		_, err := kunstructured.GetMap(test.pathToField)
+		if test.errorExpected {
+			compareExpectedError(t, test.name, test.pathToField, err, test.errorMsg)
+			continue
+		}
+		if err != nil {
+			unExpectedError(t, test.name, test.pathToField, err)
+		}
+	}
+}
+
+func TestGetStringSlice(t *testing.T) {
+	tests := []struct {
+		name          string
+		pathToField   string
+		errorExpected bool
+		errorMsg      string
+	}{
+		{
+			name:          "validStringSlice",
+			pathToField:   "that",
+			errorExpected: false,
+		},
+		{
+			name:          "twoFieldsOneMissing",
+			pathToField:   "metadata.banana",
+			errorExpected: true,
+			errorMsg:      "no field named 'metadata.banana'",
+		},
+		{
+			name:          "validStructSubFieldOutOfBoundIndex",
+			pathToField:   "these[1].field2[99]",
+			errorExpected: true,
+			errorMsg:      "no field named 'these[1].field2[99]'",
+		},
+	}
+
+	for _, test := range tests {
+		_, err := kunstructured.GetStringSlice(test.pathToField)
+		if test.errorExpected {
+			compareExpectedError(t, test.name, test.pathToField, err, test.errorMsg)
+			continue
+		}
+		if err != nil {
+			unExpectedError(t, test.name, test.pathToField, err)
+		}
+	}
+}
+
 func TestGetSlice(t *testing.T) {
 	tests := []struct {
 		name          string

api/k8sdeps/validator/validators.go

@@ -14,14 +14,11 @@ import (
 	v1validation "k8s.io/apimachinery/pkg/apis/meta/v1/validation"
 	"k8s.io/apimachinery/pkg/util/validation"
 	"k8s.io/apimachinery/pkg/util/validation/field"
-	"sigs.k8s.io/kustomize/api/ifc"
 )
 
 // KustValidator validates Labels and annotations by apimachinery
 type KustValidator struct{}
 
-var _ ifc.Validator = (*KustValidator)(nil)
-
 // NewKustValidator returns a KustValidator object
 func NewKustValidator() *KustValidator {
 	return &KustValidator{}

api/konfig/builtinpluginconsts/images.go

@@ -4,15 +4,7 @@
 package builtinpluginconsts
 
 const (
-	imagesFieldSpecs = `
-images:
-- path: spec/containers[]/image
-  create: true
-- path: spec/initContainers[]/image
-  create: true
-- path: spec/template/spec/containers[]/image
-  create: true
-- path: spec/template/spec/initContainers[]/image
-  create: true
-`
+	// imageFieldSpecs is left empty since `containers` and `initContainers`
+	// of *ANY* kind in *ANY* path are builtin supported in code
+	imagesFieldSpecs = ``
 )

api/konfig/builtinpluginconsts/namereference.go

@@ -252,10 +252,6 @@ nameReference:
     kind: Role
   - path: rules/resourceNames
     kind: ClusterRole
-  - path: spec/template/spec/containers/env/valueFrom/secretKeyRef/name
-    kind: Service
-    group: serving.knative.dev
-    version: v1
 
 - kind: Service
   version: v1

api/konfig/builtinpluginconsts/namespace.go

@@ -8,16 +8,9 @@ const (
 namespace:
 - path: metadata/namespace
   create: true
-- path: metadata/name
-  kind: Namespace
-  create: true
 - path: subjects
   kind: RoleBinding
 - path: subjects
   kind: ClusterRoleBinding
-- path: spec/service/namespace
-  group: apiregistration.k8s.io
-  kind: APIService
-  create: true
 `
 )

api/konfig/general.go

@@ -30,13 +30,4 @@ const (
 
 	// A program name, for use in help, finding the XDG_CONFIG_DIR, etc.
 	ProgramName = "kustomize"
-
-	// Label key that indicates the resources are built from Kustomize
-	ManagedbyLabelKey = "app.kubernetes.io/managed-by"
-
-	// An environment variable to turn on/off adding the ManagedByLabelKey
-	EnableManagedbyLabelEnv = "KUSTOMIZE_ENABLE_MANAGEDBY_LABEL"
-
-	// Label key that indicates the resources are validated by a validator
-	ValidatedByLabelKey = "validated-by"
 )

api/krusty/baseandoverlaymedium_test.go

@@ -225,13 +225,13 @@ spec:
     spec:
       containers:
       - env:
-        - name: foo
-          value: bar
         - name: FOO
           valueFrom:
             configMapKeyRef:
               key: somekey
-              name: test-infra-app-env-8h5mh7f7ch
+              name: test-infra-app-env-ffmd9b969m
+        - name: foo
+          value: bar
         image: nginx:1.8.0
         name: nginx
         ports:
@@ -240,7 +240,7 @@ spec:
         - configMapRef:
             name: someConfigMap
         - configMapRef:
-            name: test-infra-app-env-8h5mh7f7ch
+            name: test-infra-app-env-ffmd9b969m
         image: busybox
         name: busybox
         volumeMounts:
@@ -248,7 +248,7 @@ spec:
           name: app-env
       volumes:
       - configMap:
-          name: test-infra-app-env-8h5mh7f7ch
+          name: test-infra-app-env-ffmd9b969m
         name: app-env
 ---
 apiVersion: v1
@@ -288,11 +288,12 @@ metadata:
     app: mungebot
     org: kubernetes
     repo: test-infra
-  name: test-infra-app-env-8h5mh7f7ch
+  name: test-infra-app-env-ffmd9b969m
 ---
 apiVersion: v1
 data:
-  nonsense: "Lorem ipsum dolor sit amet, consectetur\nadipiscing elit, sed do eiusmod tempor\nincididunt ut labore et dolore magna aliqua. \n"
+  nonsense: "Lorem ipsum dolor sit amet, consectetur\nadipiscing elit, sed do eiusmod
+    tempor\nincididunt ut labore et dolore magna aliqua. \n"
 kind: ConfigMap
 metadata:
   annotations:
@@ -301,6 +302,6 @@ metadata:
     app: mungebot
     org: kubernetes
     repo: test-infra
-  name: test-infra-app-config-49d6f5h7b5
+  name: test-infra-app-config-f462h769f9
 `)
 }

api/krusty/baseandoverlaysmall_test.go

@@ -70,7 +70,7 @@ metadata:
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: myNs
+  name: p-b-myNs
 ---
 apiVersion: v1
 kind: Role
@@ -95,7 +95,7 @@ metadata:
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: myNs2
+  name: p-myNs2
 `)
 }
 
@@ -132,54 +132,6 @@ spec:
 `)
 }
 
-func TestTinyOverlay(t *testing.T) {
-	th := kusttest_test.MakeHarness(t)
-	th.WriteK("base", `
-namePrefix: a-
-resources:
-- deployment.yaml
-`)
-	th.WriteF("base/deployment.yaml", `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: myDeployment
-spec:
-  template:
-    spec:
-      containers:
-      - image: whatever
-`)
-	th.WriteK("overlay", `
-namePrefix: b-
-resources:
-- ../base
-patchesStrategicMerge:
-- depPatch.yaml
-`)
-	th.WriteF("overlay/depPatch.yaml", `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: myDeployment
-spec:
-  replicas: 999
-`)
-	m := th.Run("overlay", th.MakeDefaultOptions())
-	th.AssertActualEqualsExpected(m, `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: b-a-myDeployment
-spec:
-  replicas: 999
-  template:
-    spec:
-      containers:
-      - image: whatever
-`)
-}
-
 func writeSmallBase(th kusttest_test.Harness) {
 	th.WriteK("/app/base", `
 namePrefix: a-

api/krusty/component_test.go

@@ -39,8 +39,8 @@ resources:
 configMapGenerator:
 - name: my-configmap
   literals:	
-  - testValue=1
-  - otherValue=10
+    - testValue=1
+    - otherValue=10
 `)
 	th.WriteF("/app/base/deploy.yaml", `
 apiVersion: v1
@@ -59,13 +59,13 @@ replicas:
 - name: storefront
   count: 3
 resources:
-- stub.yaml
+  - stub.yaml
 configMapGenerator:
 - name: my-configmap
   behavior: merge
   literals:	
-  - testValue=2
-  - compValue=5
+    - testValue=2
+    - compValue=5
 `)
 	th.WriteF("/app/comp/stub.yaml", `
 apiVersion: v1
@@ -132,7 +132,7 @@ kind: ConfigMap
 metadata:
   annotations: {}
   labels: {}
-  name: comp-my-configmap-kc6k2kmkh9
+  name: comp-my-configmap-ct5bgtbccd
 ---
 apiVersion: v1
 kind: Deployment
@@ -156,7 +156,7 @@ configMapGenerator:
 - name: my-configmap
   behavior: merge
   literals:	
-  - otherValue=9
+    - otherValue=9
 `),
 				writeK("/app/prod", `
 resources:
@@ -186,7 +186,7 @@ kind: ConfigMap
 metadata:
   annotations: {}
   labels: {}
-  name: comp-my-configmap-55249mf5kb
+  name: comp-my-configmap-dgf97tmg6h
 ---
 apiVersion: v1
 kind: Deployment
@@ -211,8 +211,8 @@ components:
 configMapGenerator:
 - name: my-configmap
   behavior: merge
-  literals:
-  - otherValue=9
+  literals:	
+    - otherValue=9
 `),
 				writeK("/app/prod", `
 resources:
@@ -241,7 +241,7 @@ kind: ConfigMap
 metadata:
   annotations: {}
   labels: {}
-  name: comp-my-configmap-55249mf5kb
+  name: comp-my-configmap-dgf97tmg6h
 ---
 apiVersion: v1
 kind: Deployment
@@ -283,7 +283,7 @@ data:
   testValue: "1"
 kind: ConfigMap
 metadata:
-  name: my-configmap-2g9c94mhb8
+  name: my-configmap-7k9t4h74f8
 ---
 apiVersion: v1
 kind: Deployment
@@ -301,7 +301,7 @@ kind: ConfigMap
 metadata:
   annotations: {}
   labels: {}
-  name: comp-my-configmap-kc6k2kmkh9
+  name: comp-my-configmap-ct5bgtbccd
 ---
 apiVersion: v1
 kind: Deployment
@@ -327,8 +327,8 @@ configMapGenerator:
 - name: my-configmap
   behavior: merge
   literals:	
-  - compValue=5
-  - testValue=2
+    - compValue=5
+    - testValue=2
 `),
 			},
 			runPath: "/app/direct-component",
@@ -349,7 +349,7 @@ kind: ConfigMap
 metadata:
   annotations: {}
   labels: {}
-  name: my-configmap-kc6k2kmkh9
+  name: my-configmap-96dt22k28h
 `,
 		},
 		"missing-optional-component-api-version": {
@@ -360,7 +360,7 @@ configMapGenerator:
 - name: my-configmap
   behavior: merge
   literals:	
-  - otherValue=9
+    - otherValue=9
 `),
 			},
 			runPath: "/app/prod",
@@ -380,7 +380,7 @@ kind: ConfigMap
 metadata:
   annotations: {}
   labels: {}
-  name: my-configmap-5g7gh5mgt5
+  name: my-configmap-72cfg2mg5d
 ---
 apiVersion: v1
 kind: Deployment
@@ -427,7 +427,7 @@ data:
   testValue: "1"
 kind: ConfigMap
 metadata:
-  name: my-configmap-a-b-2g9c94mhb8
+  name: my-configmap-a-b-tfb7c5t69m
 ---
 apiVersion: v1
 kind: Deployment
@@ -442,7 +442,7 @@ data:
   testValue: "1"
 kind: ConfigMap
 metadata:
-  name: my-configmap-b-2g9c94mhb8
+  name: my-configmap-b-8h7b8862bb
 `,
 		},
 
@@ -574,7 +574,7 @@ configMapGenerator:
 - name: my-configmap
   behavior: merge
   literals:	
-  - otherValue=9
+    - otherValue=9
 `),
 			},
 			runPath:       "/app/prod",

api/krusty/configmaps_test.go

@@ -81,15 +81,16 @@ data:
   vegetable: broccoli
 kind: ConfigMap
 metadata:
-  name: blah-bob-d87t8m8tgm
+  name: blah-bob-k772g5db55
 ---
 apiVersion: v1
 data:
-  druid_segmentCache_locations: '[{"path":  "var/druid/segment-cache",  "maxSize": 32000000000,  "freeSpacePercent": 1.0}]'
+  druid_segmentCache_locations: '[{"path":  "var/druid/segment-cache",  "maxSize":
+    32000000000,  "freeSpacePercent": 1.0}]'
   v2: '[{"path": "var/druid/segment-cache"}]'
 kind: ConfigMap
 metadata:
-  name: blah-json-5298bc8g99
+  name: blah-json-9gtcc2fgb4
 ---
 apiVersion: v1
 data:
@@ -101,7 +102,7 @@ data:
   vegetable: YnJvY2NvbGk=
 kind: Secret
 metadata:
-  name: blah-bob-ftht6hfgmb
+  name: blah-bob-gmc2824f4b
 type: Opaque
 `)
 }
@@ -155,7 +156,7 @@ data:
   vegetable: broccoli
 kind: ConfigMap
 metadata:
-  name: blah-bob-db529cg5bk
+  name: blah-bob-gfkcbk5ckf
 `)
 }
 
@@ -217,7 +218,7 @@ kind: ConfigMap
 metadata:
   annotations: {}
   labels: {}
-  name: p1-com1-8tc62428t2
+  name: p1-com1-dhbbm922gd
 ---
 apiVersion: v1
 data:
@@ -226,7 +227,7 @@ kind: ConfigMap
 metadata:
   annotations: {}
   labels: {}
-  name: p2-com2-87mcggf7d7
+  name: p2-com2-c4b8md75k9
 `)
 }
 
@@ -274,7 +275,7 @@ kind: ConfigMap
 metadata:
   annotations: {}
   labels: {}
-  name: o1-cm-ft9mmdc8c6
+  name: o1-cm-28g596k77k
 ---
 apiVersion: v1
 data:
@@ -284,6 +285,6 @@ kind: ConfigMap
 metadata:
   annotations: {}
   labels: {}
-  name: cm-o2-5k95kd76ft
+  name: cm-o2-gfcc59fg5m
 `)
 }

api/krusty/customconfig_test.go

@@ -59,7 +59,6 @@ spec:
   location: SW
 `)
 	th.WriteF("/app/base/animalPark.yaml", `
-apiVersion: foo
 kind: AnimalPark
 metadata:
   name: sandiego
@@ -94,7 +93,6 @@ varReference:
 `)
 	m := th.Run("/app/base", th.MakeDefaultOptions())
 	th.AssertActualEqualsExpected(m, `
-apiVersion: foo
 kind: AnimalPark
 metadata:
   labels:
@@ -163,7 +161,6 @@ varReference:
 `)
 	m := th.Run("/app/base", th.MakeDefaultOptions())
 	th.AssertActualEqualsExpected(m, `
-apiVersion: foo
 kind: AnimalPark
 metadata:
   labels:
@@ -215,17 +212,14 @@ func TestFixedBug605_BaseCustomizationAvailableInOverlay(t *testing.T) {
 nameReference:
 - kind: Gorilla
   fieldSpecs:
-  - apiVersion: foo
-    kind: AnimalPark
+  - kind: AnimalPark
     path: spec/gorillaRef/name
 - kind: Giraffe
   fieldSpecs:
-  - apiVersion: foo
-    kind: AnimalPark
+  - kind: AnimalPark
     path: spec/giraffeRef/name
 varReference:
 - path: spec/food
-  apiVersion: foo
   kind: AnimalPark
 `)
 	th.WriteK("/app/overlay", `
@@ -248,7 +242,6 @@ spec:
 `)
 	// The following replaces the gorillaRef in the AnimalPark.
 	th.WriteF("/app/overlay/animalPark.yaml", `
-apiVersion: foo
 kind: AnimalPark
 metadata:
   name: sandiego
@@ -258,7 +251,6 @@ spec:
 `)
 	m := th.Run("/app/overlay", th.MakeDefaultOptions())
 	th.AssertActualEqualsExpected(m, `
-apiVersion: foo
 kind: AnimalPark
 metadata:
   labels: