update go.mod for release

Merge master into release-cmd/config-v0.1

.gitignore

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

Makefile

@@ -14,8 +14,11 @@ all: verify-kustomize
 verify-kustomize: \
 	lint-kustomize \
 	test-unit-kustomize-all \
-	test-examples-kustomize-against-HEAD \
-	test-examples-kustomize-against-3.8.0
+	test-examples-kustomize-against-HEAD
+# TODO: restore test-examples-kustomize-against-3.5.5 \
+# once it works.  Likely have to fix and release 3.6
+#	test-examples-kustomize-against-3.5.4 no longer works because
+# the examples tests features not in 3.5.4
 
 # The following target referenced by a file in
 # https://github.com/kubernetes/test-infra/tree/master/config/jobs/kubernetes-sigs/kustomize
@@ -23,10 +26,9 @@ 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-unit-cmd-all \
+	test-go-mod
 
 .PHONY: verify-kustomize-e2e
 verify-kustomize-e2e: test-examples-e2e-kustomize
@@ -196,7 +198,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:
@@ -233,10 +235,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.5.4: $(MYGOBIN)/mdrip
 	( \
 		set -e; \
-		tag=v3.8.0; \
+		tag=v3.5.4; \
 		/bin/rm -f $(MYGOBIN)/kustomize; \
 		echo "Installing kustomize $$tag."; \
 		GO111MODULE=on go get sigs.k8s.io/kustomize/kustomize/v3@$${tag}; \
@@ -245,6 +247,20 @@ test-examples-kustomize-against-3.8.0: $(MYGOBIN)/mdrip
 		cd kustomize; go install .; \
 	)
 
+.PHONY:
+test-examples-kustomize-against-3.5.5: $(MYGOBIN)/mdrip
+	( \
+		set -e; \
+		tag=v3.5.5; \
+		/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 .; \
+	)
+
+
 # linux only.
 # This is for testing an example plugin that
 # uses kubeval for validation.

README.md

@@ -16,9 +16,9 @@ inspired by [DAM].
 [![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](https://kubernetes-sigs.github.io/kustomize/installation/).
+these [instructions](docs/INSTALL.md).
 
-Browse the [docs](https://kubernetes-sigs.github.io/kustomize/) or jump right into the
+Browse the [docs](docs) or jump right into the
 tested [examples](examples).
 
 ## kubectl integration
@@ -132,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
 
@@ -142,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/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(
@@ -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,27 +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"}},
+// 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(
@@ -44,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
@@ -69,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
 			}
@@ -86,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
@@ -95,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/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

@@ -30,7 +30,7 @@ func (f Filter) Filter(nodes []*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.StringTag),
+					SetValue:   fsslice.SetEntry(k, f.Annotations[k], yaml.StringTag),
 					CreateKind: yaml.MappingNode, // Annotations are MappingNodes.
 					CreateTag:  "!!map",
 				}); err != nil {

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,380 +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: unsupported yaml 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,
-		},
-	},
-}
-
-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.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),
-		})
-	}
-}

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,7 +29,7 @@ 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)
@@ -46,7 +43,7 @@ func (fltr Filter) Filter(obj *yaml.RNode) (*yaml.RNode, error) {
 	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)
@@ -63,7 +60,7 @@ func (fltr Filter) filter(obj *yaml.RNode) error {
 }
 
 // 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
@@ -107,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

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,7 +4,6 @@
 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"
@@ -36,7 +35,7 @@ func (f Filter) filter(node *yaml.RNode) (*yaml.RNode, error) {
 	return node, nil
 }
 
-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/labels/labels.go

@@ -31,7 +31,7 @@ func (f Filter) Filter(nodes []*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.StringTag),
+					SetValue:   fsslice.SetEntry(k, f.Labels[k], yaml.StringTag),
 					CreateKind: yaml.MappingNode, // Labels are MappingNodes.
 					CreateTag:  "!!map",
 				}); err != nil {

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,7 +42,7 @@ 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.StringTag,
 	})
@@ -75,7 +73,7 @@ func (ns Filter) hacks(obj *yaml.RNode) error {
 // 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)

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.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/replicacount/replicacount.go

@@ -3,7 +3,6 @@ package replicacount
 import (
 	"strconv"
 
-	"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"
@@ -46,5 +45,5 @@ func (rc Filter) run(node *yaml.RNode) (*yaml.RNode, error) {
 }
 
 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/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
@@ -11,13 +11,11 @@ require (
 	github.com/stretchr/testify v1.4.0
 	github.com/yujunz/go-getter v1.4.1-lite
 	golang.org/x/tools v0.0.0-20191010075000-0337d82405ff
-	gopkg.in/yaml.v2 v2.3.0
+	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.4.1
+	sigs.k8s.io/kustomize/kyaml v0.1.11
 	sigs.k8s.io/yaml v1.2.0
 )
-
-replace sigs.k8s.io/kustomize/kyaml v0.4.1 => ../kyaml

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=
@@ -279,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=
@@ -340,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=
@@ -371,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=
@@ -424,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=
@@ -464,6 +466,7 @@ golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 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=
@@ -490,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=
@@ -549,11 +553,12 @@ 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-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=
@@ -580,7 +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.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/ifc/ifc.go

@@ -41,33 +41,33 @@ type Loader interface {
 // Kunstructured allows manipulation of k8s objects
 // that do not have Golang structs.
 type Kunstructured interface {
-	Copy() Kunstructured
-	GetAnnotations() map[string]string
-	GetBool(path string) (bool, error)
-	GetFieldValue(string) (interface{}, error)
-	GetFloat64(path string) (float64, error)
-	GetGvk() resid.Gvk
-	GetInt64(path string) (int64, error)
-	GetKind() string
-	GetLabels() map[string]string
-	GetMap(path string) (map[string]interface{}, error)
-	GetName() string
-	GetSlice(path string) ([]interface{}, error)
-	GetString(string) (string, error)
-	GetStringMap(path string) (map[string]string, error)
-	GetStringSlice(string) ([]string, error)
 	Map() map[string]interface{}
-	MarshalJSON() ([]byte, error)
-	MatchesAnnotationSelector(selector string) (bool, error)
-	MatchesLabelSelector(selector string) (bool, error)
-	Patch(Kunstructured) error
-	SetAnnotations(map[string]string)
-	SetGvk(resid.Gvk)
-	SetLabels(map[string]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)
+	UnmarshalJSON([]byte) error
+	GetGvk() resid.Gvk
+	SetGvk(resid.Gvk)
+	GetKind() string
+	GetName() string
 	SetName(string)
 	SetNamespace(string)
-	UnmarshalJSON([]byte) error
+	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/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

@@ -490,10 +490,9 @@ 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-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=
@@ -515,7 +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.4.1/go.mod h1:XJL84E6sOFeNrQ7CADiemc1B0EjIxHo3OhW4o1aJYNw=
+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/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 {
-		yaml, err := functionConfig.String()
-		if err != nil {
-			return nil, err
-		}
-		input = []byte(yaml)
-	}
-
-	// 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"
@@ -59,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
 	}
@@ -103,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()
 }
@@ -155,21 +166,11 @@ func (kt *KustTarget) addHashesToNames(
 // not yet fixed.
 func (kt *KustTarget) AccumulateTarget() (
 	ra *accumulator.ResAccumulator, err error) {
-	return kt.accumulateTarget(accumulator.MakeEmptyAccumulator())
-}
-
-// ra should be empty when this KustTarget is a Kustomization, or the ra of the parent if this KustTarget is a Component
-// (or empty if the Component does not have a parent).
-func (kt *KustTarget) accumulateTarget(ra *accumulator.ResAccumulator) (
-	resRa *accumulator.ResAccumulator, err error) {
-	ra, err = kt.accumulateResources(ra, kt.kustomization.Resources)
+	ra = accumulator.MakeEmptyAccumulator()
+	err = kt.accumulateResources(ra, kt.kustomization.Resources)
 	if err != nil {
 		return nil, errors.Wrap(err, "accumulating resources")
 	}
-	ra, err = kt.accumulateComponents(ra, kt.kustomization.Components)
-	if err != nil {
-		return nil, errors.Wrap(err, "accumulating components")
-	}
 	tConfig, err := builtinconfig.MakeTransformerConfig(
 		kt.ldr, kt.kustomization.Configurations)
 	if err != nil {
@@ -198,10 +199,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(
@@ -238,7 +235,7 @@ func (kt *KustTarget) runGenerators(
 
 func (kt *KustTarget) configureExternalGenerators() ([]resmap.Generator, error) {
 	ra := accumulator.MakeEmptyAccumulator()
-	ra, err := kt.accumulateResources(ra, kt.kustomization.Generators)
+	err := kt.accumulateResources(ra, kt.kustomization.Generators)
 	if err != nil {
 		return nil, err
 	}
@@ -253,7 +250,7 @@ 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
 	}
@@ -262,132 +259,56 @@ func (kt *KustTarget) runTransformers(ra *accumulator.ResAccumulator) error {
 	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)
-
+	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(
-	ra *accumulator.ResAccumulator, paths []string) (*accumulator.ResAccumulator, error) {
+	ra *accumulator.ResAccumulator, paths []string) error {
 	for _, path := range paths {
 		// try loading resource as file then as base (directory or git repository)
 		if errF := kt.accumulateFile(ra, path); errF != nil {
 			ldr, errL := kt.ldr.New(path)
 			if errL != nil {
-				return nil, fmt.Errorf("accumulateFile %q, loader.New %q", errF, errL)
+				return fmt.Errorf("accumulateFile %q, loader.New %q", errF, errL)
 			}
-			var errD error
-			ra, errD = kt.accumulateDirectory(ra, ldr, false)
+			errD := kt.accumulateDirectory(ra, ldr)
 			if errD != nil {
-				return nil, fmt.Errorf("accumulateFile %q, accumulateDirector: %q", errF, errD)
+				return fmt.Errorf("accumulateFile %q, accumulateDirector: %q", errF, errD)
 			}
 		}
 	}
-	return ra, nil
-}
-
-// accumulateResources fills the given resourceAccumulator
-// with resources read from the given list of paths.
-func (kt *KustTarget) accumulateComponents(
-	ra *accumulator.ResAccumulator, paths []string) (*accumulator.ResAccumulator, error) {
-	for _, path := range paths {
-		// Components always refer to directories
-		ldr, errL := kt.ldr.New(path)
-		if errL != nil {
-			return nil, fmt.Errorf("loader.New %q", errL)
-		}
-		var errD error
-		ra, errD = kt.accumulateDirectory(ra, ldr, true)
-		if errD != nil {
-			return nil, fmt.Errorf("accumulateDirectory: %q", errD)
-		}
-	}
-	return ra, nil
+	return nil
 }
 
 func (kt *KustTarget) accumulateDirectory(
-	ra *accumulator.ResAccumulator, ldr ifc.Loader, isComponent bool) (*accumulator.ResAccumulator, error) {
+	ra *accumulator.ResAccumulator, ldr ifc.Loader) error {
 	defer ldr.Cleanup()
 	subKt := NewKustTarget(
 		ldr, kt.validator, kt.rFactory, kt.tFactory, kt.pLdr)
 	err := subKt.Load()
 	if err != nil {
-		return nil, errors.Wrapf(
+		return errors.Wrapf(
 			err, "couldn't make target for path '%s'", ldr.Root())
 	}
-	if isComponent && subKt.kustomization.Kind != types.ComponentKind {
-		return nil, fmt.Errorf(
-			"expected kind '%s' for path '%s' but got '%s'", types.ComponentKind, ldr.Root(), subKt.kustomization.Kind)
-	} else if !isComponent && subKt.kustomization.Kind == types.ComponentKind {
-		return nil, fmt.Errorf(
-			"expected kind != '%s' for path '%s'", types.ComponentKind, ldr.Root())
-	}
-
-	var subRa *accumulator.ResAccumulator
-	if isComponent {
-		// Components don't create a new accumulator: the kustomization directives are added to the current accumulator
-		subRa, err = subKt.accumulateTarget(ra)
-		ra = accumulator.MakeEmptyAccumulator()
-	} else {
-		// Child Kustomizations create a new accumulator which resolves their kustomization directives, which will later
-		// be merged into the current accumulator.
-		subRa, err = subKt.AccumulateTarget()
-	}
+	subRa, err := subKt.AccumulateTarget()
 	if err != nil {
-		return nil, errors.Wrapf(
+		return errors.Wrapf(
 			err, "recursed accumulation of path '%s'", ldr.Root())
 	}
 	err = ra.MergeAccumulator(subRa)
 	if err != nil {
-		return nil, errors.Wrapf(
+		return errors.Wrapf(
 			err, "recursed merging from path '%s'", ldr.Root())
 	}
-	return ra, nil
+	return nil
 }
 
 func (kt *KustTarget) accumulateFile(

api/konfig/builtinpluginconsts/namereference.go

@@ -21,11 +21,6 @@ nameReference:
   - path: spec/scaleTargetRef/name
     kind: HorizontalPodAutoscaler
 
-- kind: StatefulSet
-  fieldSpecs:
-  - path: spec/scaleTargetRef/name
-    kind: HorizontalPodAutoscaler
-
 - kind: ConfigMap
   version: v1
   fieldSpecs:
@@ -252,10 +247,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/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-ffmd9b969m
+        - name: foo
+          value: bar
         image: nginx:1.8.0
         name: nginx
         ports:
@@ -292,7 +292,8 @@ metadata:
 ---
 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:

api/krusty/baseandoverlaysmall_test.go

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

@@ -1,670 +0,0 @@
-// Copyright 2020 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package krusty_test
-
-import (
-	"fmt"
-	"strings"
-	"testing"
-
-	"sigs.k8s.io/kustomize/api/konfig"
-	kusttest_test "sigs.k8s.io/kustomize/api/testutils/kusttest"
-)
-
-type FileGen func(kusttest_test.Harness)
-
-func writeC(path string, content string) FileGen {
-	return func(th kusttest_test.Harness) {
-		th.WriteC(path, content)
-	}
-}
-
-func writeF(path string, content string) FileGen {
-	return func(th kusttest_test.Harness) {
-		th.WriteF(path, content)
-	}
-}
-
-func writeK(path string, content string) FileGen {
-	return func(th kusttest_test.Harness) {
-		th.WriteK(path, content)
-	}
-}
-
-func writeTestBase(th kusttest_test.Harness) {
-	th.WriteK("/app/base", `
-resources:
-- deploy.yaml
-configMapGenerator:
-- name: my-configmap
-  literals:	
-  - testValue=1
-  - otherValue=10
-`)
-	th.WriteF("/app/base/deploy.yaml", `
-apiVersion: v1
-kind: Deployment
-metadata:
-  name: storefront
-spec:
-  replicas: 1
-`)
-}
-
-func writeTestComponent(th kusttest_test.Harness) {
-	th.WriteC("/app/comp", `
-namePrefix: comp-
-replicas:
-- name: storefront
-  count: 3
-resources:
-- stub.yaml
-configMapGenerator:
-- name: my-configmap
-  behavior: merge
-  literals:	
-  - testValue=2
-  - compValue=5
-`)
-	th.WriteF("/app/comp/stub.yaml", `
-apiVersion: v1
-kind: Deployment
-metadata:
-  name: stub
-spec:
-  replicas: 1
-`)
-}
-
-func writeOverlayProd(th kusttest_test.Harness) {
-	th.WriteK("/app/prod", `
-resources:
-- ../base
-- db
-
-components:
-- ../comp
-`)
-	writeDB(th)
-}
-
-func writeDB(th kusttest_test.Harness) {
-	deployment("db", "/app/prod/db")(th)
-}
-
-func deployment(name string, path string) FileGen {
-	return writeF(path, fmt.Sprintf(`
-apiVersion: v1
-kind: Deployment
-metadata:
-  name: %s
-spec:
-  type: Logical
-`, name))
-}
-
-func TestComponent(t *testing.T) {
-	testCases := map[string]struct {
-		input          []FileGen
-		runPath        string
-		expectedOutput string
-	}{
-		// Components are inserted into the resource hierarchy as the parent of those
-		// resources that come before it in the resources list of the parent Kustomization.
-		"basic-component": {
-			input:   []FileGen{writeTestBase, writeTestComponent, writeOverlayProd},
-			runPath: "/app/prod",
-			expectedOutput: `
-apiVersion: v1
-kind: Deployment
-metadata:
-  name: comp-storefront
-spec:
-  replicas: 3
----
-apiVersion: v1
-data:
-  compValue: "5"
-  otherValue: "10"
-  testValue: "2"
-kind: ConfigMap
-metadata:
-  annotations: {}
-  labels: {}
-  name: comp-my-configmap-ct5bgtbccd
----
-apiVersion: v1
-kind: Deployment
-metadata:
-  name: comp-db
-spec:
-  type: Logical
----
-apiVersion: v1
-kind: Deployment
-metadata:
-  name: comp-stub
-spec:
-  replicas: 1
-`,
-		},
-		"multiple-components": {
-			input: []FileGen{writeTestBase, writeTestComponent, writeDB,
-				writeC("/app/additionalcomp", `
-configMapGenerator:
-- name: my-configmap
-  behavior: merge
-  literals:	
-  - otherValue=9
-`),
-				writeK("/app/prod", `
-resources:
-- ../base
-- db
-
-components:
-- ../comp
-- ../additionalcomp
-`),
-			},
-			runPath: "/app/prod",
-			expectedOutput: `
-apiVersion: v1
-kind: Deployment
-metadata:
-  name: comp-storefront
-spec:
-  replicas: 3
----
-apiVersion: v1
-data:
-  compValue: "5"
-  otherValue: "9"
-  testValue: "2"
-kind: ConfigMap
-metadata:
-  annotations: {}
-  labels: {}
-  name: comp-my-configmap-dgf97tmg6h
----
-apiVersion: v1
-kind: Deployment
-metadata:
-  name: comp-db
-spec:
-  type: Logical
----
-apiVersion: v1
-kind: Deployment
-metadata:
-  name: comp-stub
-spec:
-  replicas: 1
-`,
-		},
-		"nested-components": {
-			input: []FileGen{writeTestBase, writeTestComponent, writeDB,
-				writeC("/app/additionalcomp", `
-components:
-- ../comp
-configMapGenerator:
-- name: my-configmap
-  behavior: merge
-  literals:
-  - otherValue=9
-`),
-				writeK("/app/prod", `
-resources:
-- ../base
-- db
-
-components:
-- ../additionalcomp
-`),
-			},
-			runPath: "/app/prod",
-			expectedOutput: `
-apiVersion: v1
-kind: Deployment
-metadata:
-  name: comp-storefront
-spec:
-  replicas: 3
----
-apiVersion: v1
-data:
-  compValue: "5"
-  otherValue: "9"
-  testValue: "2"
-kind: ConfigMap
-metadata:
-  annotations: {}
-  labels: {}
-  name: comp-my-configmap-dgf97tmg6h
----
-apiVersion: v1
-kind: Deployment
-metadata:
-  name: comp-db
-spec:
-  type: Logical
----
-apiVersion: v1
-kind: Deployment
-metadata:
-  name: comp-stub
-spec:
-  replicas: 1
-`,
-		},
-		// If a component sets a name prefix on a base, then that base can also be separately included
-		// without being affected by the component in another branch of the resource tree
-		"basic-component-with-repeated-base": {
-			input: []FileGen{writeTestBase, writeTestComponent, writeOverlayProd,
-				writeK("/app/repeated", `
-resources:
-- ../base
-- ../prod
-`),
-			},
-			runPath: "/app/repeated",
-			expectedOutput: `
-apiVersion: v1
-kind: Deployment
-metadata:
-  name: storefront
-spec:
-  replicas: 1
----
-apiVersion: v1
-data:
-  otherValue: "10"
-  testValue: "1"
-kind: ConfigMap
-metadata:
-  name: my-configmap-7k9t4h74f8
----
-apiVersion: v1
-kind: Deployment
-metadata:
-  name: comp-storefront
-spec:
-  replicas: 3
----
-apiVersion: v1
-data:
-  compValue: "5"
-  otherValue: "10"
-  testValue: "2"
-kind: ConfigMap
-metadata:
-  annotations: {}
-  labels: {}
-  name: comp-my-configmap-ct5bgtbccd
----
-apiVersion: v1
-kind: Deployment
-metadata:
-  name: comp-db
-spec:
-  type: Logical
----
-apiVersion: v1
-kind: Deployment
-metadata:
-  name: comp-stub
-spec:
-  replicas: 1
-`,
-		},
-		"applying-component-directly-should-be-same-as-kustomization": {
-			input: []FileGen{writeTestBase, writeTestComponent,
-				writeC("/app/direct-component", `
-resources:
-- ../base
-configMapGenerator:
-- name: my-configmap
-  behavior: merge
-  literals:	
-  - compValue=5
-  - testValue=2
-`),
-			},
-			runPath: "/app/direct-component",
-			expectedOutput: `
-apiVersion: v1
-kind: Deployment
-metadata:
-  name: storefront
-spec:
-  replicas: 1
----
-apiVersion: v1
-data:
-  compValue: "5"
-  otherValue: "10"
-  testValue: "2"
-kind: ConfigMap
-metadata:
-  annotations: {}
-  labels: {}
-  name: my-configmap-96dt22k28h
-`,
-		},
-		"missing-optional-component-api-version": {
-			input: []FileGen{writeTestBase, writeOverlayProd,
-				writeF("/app/comp/"+konfig.DefaultKustomizationFileName(), `
-kind: Component
-configMapGenerator:
-- name: my-configmap
-  behavior: merge
-  literals:	
-  - otherValue=9
-`),
-			},
-			runPath: "/app/prod",
-			expectedOutput: `
-apiVersion: v1
-kind: Deployment
-metadata:
-  name: storefront
-spec:
-  replicas: 1
----
-apiVersion: v1
-data:
-  otherValue: "9"
-  testValue: "1"
-kind: ConfigMap
-metadata:
-  annotations: {}
-  labels: {}
-  name: my-configmap-72cfg2mg5d
----
-apiVersion: v1
-kind: Deployment
-metadata:
-  name: db
-spec:
-  type: Logical
-`,
-		},
-		// See how nameSuffix "-b" is also added to the resources included by "comp-a" because they are in the
-		// accumulator when "comp-b" is accumulated.  In practice we could use simple Kustomizations for this example.
-		"components-can-add-the-same-base-if-the-first-renames-resources": {
-			input: []FileGen{writeTestBase,
-				deployment("proxy", "/app/comp-a/proxy.yaml"),
-				writeC("/app/comp-a", `
-resources:
-- ../base
-
-nameSuffix: "-a"
-`),
-				writeC("/app/comp-b", `
-resources:
-- ../base
-
-nameSuffix: "-b"
-`),
-				writeK("/app/prod", `
-components:
-- ../comp-a
-- ../comp-b`),
-			},
-			runPath: "/app/prod",
-			expectedOutput: `
-apiVersion: v1
-kind: Deployment
-metadata:
-  name: storefront-a-b
-spec:
-  replicas: 1
----
-apiVersion: v1
-data:
-  otherValue: "10"
-  testValue: "1"
-kind: ConfigMap
-metadata:
-  name: my-configmap-a-b-tfb7c5t69m
----
-apiVersion: v1
-kind: Deployment
-metadata:
-  name: storefront-b
-spec:
-  replicas: 1
----
-apiVersion: v1
-data:
-  otherValue: "10"
-  testValue: "1"
-kind: ConfigMap
-metadata:
-  name: my-configmap-b-8h7b8862bb
-`,
-		},
-
-		"multiple-bases-can-add-the-same-component-if-it-doesn-not-define-named-entities": {
-			input: []FileGen{
-				writeC("/app/comp", `
-namespace: prod
-`),
-				writeK("/app/base-a", `
-resources:
-- proxy.yaml
-
-components:
-- ../comp
-`),
-				deployment("proxy-a", "/app/base-a/proxy.yaml"),
-				writeK("/app/base-b", `
-resources:
-- proxy.yaml
-
-components:
-- ../comp
-`),
-				deployment("proxy-b", "/app/base-b/proxy.yaml"),
-				writeK("/app/prod", `
-resources:
-- proxy.yaml
-- ../base-a
-- ../base-b
-`),
-				deployment("proxy-prod", "/app/prod/proxy.yaml"),
-			},
-			runPath: "/app/prod",
-			// Note that the namepsace has not been applied to proxy-prod because it was not in scope when the
-			// component was applied
-			expectedOutput: `
-apiVersion: v1
-kind: Deployment
-metadata:
-  name: proxy-prod
-spec:
-  type: Logical
----
-apiVersion: v1
-kind: Deployment
-metadata:
-  name: proxy-a
-  namespace: prod
-spec:
-  type: Logical
----
-apiVersion: v1
-kind: Deployment
-metadata:
-  name: proxy-b
-  namespace: prod
-spec:
-  type: Logical
-`,
-		},
-	}
-
-	for tn, tc := range testCases {
-		t.Run(tn, func(t *testing.T) {
-			th := kusttest_test.MakeHarness(t)
-			for _, f := range tc.input {
-				f(th)
-			}
-			m := th.Run(tc.runPath, th.MakeDefaultOptions())
-			th.AssertActualEqualsExpected(m, tc.expectedOutput)
-		})
-	}
-}
-
-func TestComponentErrors(t *testing.T) {
-	testCases := map[string]struct {
-		input         []FileGen
-		runPath       string
-		expectedError string
-	}{
-		"components-cannot-be-added-to-resources": {
-			input: []FileGen{writeTestBase, writeTestComponent,
-				writeK("/app/compinres", `
-resources:
-- ../base
-- ../comp
-`),
-			},
-			runPath:       "app/compinres",
-			expectedError: "expected kind != 'Component' for path '/app/comp'",
-		},
-		"kustomizations-cannot-be-added-to-components": {
-			input: []FileGen{writeTestBase, writeTestComponent,
-				writeK("/app/kustincomponents", `
-components:
-- ../base
-- ../comp
-`),
-			},
-			runPath: "/app/kustincomponents",
-			expectedError: "accumulating components: accumulateDirectory: \"expected kind 'Component' for path " +
-				"'/app/base' but got 'Kustomization'",
-		},
-		"files-cannot-be-added-to-components-list": {
-			input: []FileGen{writeTestBase,
-				writeF("/app/filesincomponents/stub.yaml", `
-apiVersion: v1
-kind: Deployment
-metadata:
-  name: stub
-spec:
-  replicas: 1
-`),
-				writeK("/app/filesincomponents", `
-components:
-- stub.yaml
-- ../comp
-`),
-			},
-			runPath:       "/app/filesincomponents",
-			expectedError: "'/app/filesincomponents/stub.yaml' must be a directory to be a root",
-		},
-		"invalid-component-api-version": {
-			input: []FileGen{writeTestBase, writeOverlayProd,
-				writeF("/app/comp/"+konfig.DefaultKustomizationFileName(), `
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Component
-configMapGenerator:
-- name: my-configmap
-  behavior: merge
-  literals:	
-  - otherValue=9
-`),
-			},
-			runPath:       "/app/prod",
-			expectedError: "apiVersion for Component should be kustomize.config.k8s.io/v1alpha1",
-		},
-		"components-cannot-add-the-same-resource": {
-			input: []FileGen{writeTestBase,
-				writeC("/app/comp-a", `
-resources:
-- proxy.yaml
-`),
-				deployment("proxy", "/app/comp-a/proxy.yaml"),
-				writeC("/app/comp-b", `
-resources:
-- proxy.yaml
-`),
-				deployment("proxy", "/app/comp-b/proxy.yaml"),
-				writeK("/app/prod", `
-resources:
-- ../base
-
-components:
-- ../comp-a
-- ../comp-b`),
-			},
-			runPath:       "/app/prod",
-			expectedError: "may not add resource with an already registered id: ~G_v1_Deployment|~X|proxy",
-		},
-		"components-cannot-add-the-same-base": {
-			input: []FileGen{writeTestBase,
-				deployment("proxy", "/app/comp-a/proxy.yaml"),
-				writeC("/app/comp-a", `
-resources:
-- ../base
-`),
-				writeC("/app/comp-b", `
-resources:
-- ../base
-`),
-				writeK("/app/prod", `
-components:
-- ../comp-a
-- ../comp-b`),
-			},
-			runPath:       "/app/prod",
-			expectedError: "may not add resource with an already registered id: ~G_v1_Deployment|~X|storefront",
-		},
-		"components-cannot-add-bases-containing-the-same-resource": {
-			input: []FileGen{writeTestBase,
-				writeC("/app/comp-a", `
-resources:
-- ../base-a
-`),
-				writeK("/app/base-a", `
-resources:
-- proxy.yaml
-`),
-				deployment("proxy", "/app/base-a/proxy.yaml"),
-				writeC("/app/comp-b", `
-resources:
-- ../base-b
-`),
-				writeK("/app/base-b", `
-resources:
-- proxy.yaml
-`),
-				deployment("proxy", "/app/base-b/proxy.yaml"),
-				writeK("/app/prod", `
-resources:
-- ../base
-
-components:
-- ../comp-a
-- ../comp-b`),
-			},
-			runPath:       "/app/prod",
-			expectedError: "may not add resource with an already registered id: ~G_v1_Deployment|~X|proxy",
-		},
-	}
-
-	for tn, tc := range testCases {
-		t.Run(tn, func(t *testing.T) {
-			th := kusttest_test.MakeHarness(t)
-			for _, f := range tc.input {
-				f(th)
-			}
-			err := th.RunWithErr(tc.runPath, th.MakeDefaultOptions())
-			if err == nil || !strings.Contains(err.Error(), tc.expectedError) {
-				t.Fatalf("unexpected error: %s", err)
-			}
-		})
-	}
-}

api/krusty/configmaps_test.go

@@ -85,7 +85,8 @@ metadata:
 ---
 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:

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:

api/krusty/extendedpatch_test.go

@@ -11,7 +11,7 @@ import (
 
 func makeCommonFileForExtendedPatchTest(th kusttest_test.Harness) {
 	th.WriteF("/app/base/deployment.yaml", `
-apiVersion: apps/v1
+apiVersion: apps/v1beta2
 kind: Deployment
 metadata:
   name: nginx
@@ -36,7 +36,7 @@ spec:
           name: configmap-in-base
         name: configmap-in-base
 ---
-apiVersion: apps/v1
+apiVersion: apps/v1beta2
 kind: Deployment
 metadata:
   name: busybox
@@ -101,7 +101,7 @@ patches:
     name: busybox
 `)
 	th.WriteF("/app/base/patch.yaml", `
-apiVersion: apps/v1
+apiVersion: apps/v1beta2
 kind: Deployment
 metadata:
   name: busybox
@@ -110,7 +110,7 @@ metadata:
 `)
 	m := th.Run("/app/base", th.MakeDefaultOptions())
 	th.AssertActualEqualsExpected(m, `
-apiVersion: apps/v1
+apiVersion: apps/v1beta2
 kind: Deployment
 metadata:
   labels:
@@ -135,7 +135,7 @@ spec:
           name: configmap-in-base
         name: configmap-in-base
 ---
-apiVersion: apps/v1
+apiVersion: apps/v1beta2
 kind: Deployment
 metadata:
   annotations:
@@ -156,7 +156,8 @@ spec:
         - mountPath: /tmp/ps
           name: busybox-persistent-storage
       volumes:
-      - name: busybox-persistent-storage
+      - emptyDir: {}
+        name: busybox-persistent-storage
       - configMap:
           name: configmap-in-base
         name: configmap-in-base
@@ -202,7 +203,7 @@ patches:
     kind: Deployment
 `)
 	th.WriteF("/app/base/patch.yaml", `
-apiVersion: apps/v1
+apiVersion: apps/v1beta2
 kind: Deployment
 metadata:
   name: busybox
@@ -211,7 +212,7 @@ metadata:
 `)
 	m := th.Run("/app/base", th.MakeDefaultOptions())
 	th.AssertActualEqualsExpected(m, `
-apiVersion: apps/v1
+apiVersion: apps/v1beta2
 kind: Deployment
 metadata:
   annotations:
@@ -232,12 +233,13 @@ spec:
         - mountPath: /tmp/ps
           name: nginx-persistent-storage
       volumes:
-      - name: nginx-persistent-storage
+      - emptyDir: {}
+        name: nginx-persistent-storage
       - configMap:
           name: configmap-in-base
         name: configmap-in-base
 ---
-apiVersion: apps/v1
+apiVersion: apps/v1beta2
 kind: Deployment
 metadata:
   annotations:
@@ -258,7 +260,8 @@ spec:
         - mountPath: /tmp/ps
           name: busybox-persistent-storage
       volumes:
-      - name: busybox-persistent-storage
+      - emptyDir: {}
+        name: busybox-persistent-storage
       - configMap:
           name: configmap-in-base
         name: configmap-in-base
@@ -302,7 +305,7 @@ patches:
     labelSelector: app=nginx
 `)
 	th.WriteF("/app/base/patch.yaml", `
-apiVersion: apps/v1
+apiVersion: apps/v1beta2
 kind: Deployment
 metadata:
   name: nginx
@@ -311,7 +314,7 @@ metadata:
 `)
 	m := th.Run("/app/base", th.MakeDefaultOptions())
 	th.AssertActualEqualsExpected(m, `
-apiVersion: apps/v1
+apiVersion: apps/v1beta2
 kind: Deployment
 metadata:
   annotations:
@@ -332,12 +335,13 @@ spec:
         - mountPath: /tmp/ps
           name: nginx-persistent-storage
       volumes:
-      - name: nginx-persistent-storage
+      - emptyDir: {}
+        name: nginx-persistent-storage
       - configMap:
           name: configmap-in-base
         name: configmap-in-base
 ---
-apiVersion: apps/v1
+apiVersion: apps/v1beta2
 kind: Deployment
 metadata:
   labels:
@@ -404,7 +408,7 @@ patches:
     kind: Deployment
 `)
 	th.WriteF("/app/base/patch.yaml", `
-apiVersion: apps/v1
+apiVersion: apps/v1beta2
 kind: Deployment
 metadata:
   name: busybox
@@ -413,7 +417,7 @@ metadata:
 `)
 	m := th.Run("/app/base", th.MakeDefaultOptions())
 	th.AssertActualEqualsExpected(m, `
-apiVersion: apps/v1
+apiVersion: apps/v1beta2
 kind: Deployment
 metadata:
   labels:
@@ -438,7 +442,7 @@ spec:
           name: configmap-in-base
         name: configmap-in-base
 ---
-apiVersion: apps/v1
+apiVersion: apps/v1beta2
 kind: Deployment
 metadata:
   annotations:
@@ -459,7 +463,8 @@ spec:
         - mountPath: /tmp/ps
           name: busybox-persistent-storage
       volumes:
-      - name: busybox-persistent-storage
+      - emptyDir: {}
+        name: busybox-persistent-storage
       - configMap:
           name: configmap-in-base
         name: configmap-in-base
@@ -504,7 +509,7 @@ patches:
     labelSelector: app=busybox
 `)
 	th.WriteF("/app/base/patch.yaml", `
-apiVersion: apps/v1
+apiVersion: apps/v1beta2
 kind: Deployment
 metadata:
   name: busybox
@@ -513,7 +518,7 @@ metadata:
 `)
 	m := th.Run("/app/base", th.MakeDefaultOptions())
 	th.AssertActualEqualsExpected(m, `
-apiVersion: apps/v1
+apiVersion: apps/v1beta2
 kind: Deployment
 metadata:
   labels:
@@ -538,7 +543,7 @@ spec:
           name: configmap-in-base
         name: configmap-in-base
 ---
-apiVersion: apps/v1
+apiVersion: apps/v1beta2
 kind: Deployment
 metadata:
   annotations:
@@ -559,7 +564,8 @@ spec:
         - mountPath: /tmp/ps
           name: busybox-persistent-storage
       volumes:
-      - name: busybox-persistent-storage
+      - emptyDir: {}
+        name: busybox-persistent-storage
       - configMap:
           name: configmap-in-base
         name: configmap-in-base
@@ -606,7 +612,7 @@ patches:
     labelSelector: app=busybox
 `)
 	th.WriteF("/app/base/patch.yaml", `
-apiVersion: apps/v1
+apiVersion: apps/v1beta2
 kind: Deployment
 metadata:
   name: busybox
@@ -615,7 +621,7 @@ metadata:
 `)
 	m := th.Run("/app/base", th.MakeDefaultOptions())
 	th.AssertActualEqualsExpected(m, `
-apiVersion: apps/v1
+apiVersion: apps/v1beta2
 kind: Deployment
 metadata:
   labels:
@@ -640,7 +646,7 @@ spec:
           name: configmap-in-base
         name: configmap-in-base
 ---
-apiVersion: apps/v1
+apiVersion: apps/v1beta2
 kind: Deployment
 metadata:
   annotations:
@@ -661,7 +667,8 @@ spec:
         - mountPath: /tmp/ps
           name: busybox-persistent-storage
       volumes:
-      - name: busybox-persistent-storage
+      - emptyDir: {}
+        name: busybox-persistent-storage
       - configMap:
           name: configmap-in-base
         name: configmap-in-base
@@ -707,7 +714,7 @@ patches:
     labelSelector: app=busybox
 `)
 	th.WriteF("/app/base/patch.yaml", `
-apiVersion: apps/v1
+apiVersion: apps/v1beta2
 kind: Deployment
 metadata:
   name: busybox
@@ -716,7 +723,7 @@ metadata:
 `)
 	m := th.Run("/app/base", th.MakeDefaultOptions())
 	th.AssertActualEqualsExpected(m, `
-apiVersion: apps/v1
+apiVersion: apps/v1beta2
 kind: Deployment
 metadata:
   labels:
@@ -741,7 +748,7 @@ spec:
           name: configmap-in-base
         name: configmap-in-base
 ---
-apiVersion: apps/v1
+apiVersion: apps/v1beta2
 kind: Deployment
 metadata:
   annotations:
@@ -762,7 +769,8 @@ spec:
         - mountPath: /tmp/ps
           name: busybox-persistent-storage
       volumes:
-      - name: busybox-persistent-storage
+      - emptyDir: {}
+        name: busybox-persistent-storage
       - configMap:
           name: configmap-in-base
         name: configmap-in-base
@@ -806,7 +814,7 @@ patches:
     name: no-match
 `)
 	th.WriteF("/app/base/patch.yaml", `
-apiVersion: apps/v1
+apiVersion: apps/v1beta2
 kind: Deployment
 metadata:
   name: busybox
@@ -815,7 +823,7 @@ metadata:
 `)
 	m := th.Run("/app/base", th.MakeDefaultOptions())
 	th.AssertActualEqualsExpected(m, `
-apiVersion: apps/v1
+apiVersion: apps/v1beta2
 kind: Deployment
 metadata:
   labels:
@@ -840,7 +848,7 @@ spec:
           name: configmap-in-base
         name: configmap-in-base
 ---
-apiVersion: apps/v1
+apiVersion: apps/v1beta2
 kind: Deployment
 metadata:
   labels:
@@ -902,7 +910,7 @@ patches:
 - path: patch.yaml
 `)
 	th.WriteF("/app/base/patch.yaml", `
-apiVersion: apps/v1
+apiVersion: apps/v1beta2
 kind: Deployment
 metadata:
   name: busybox
@@ -911,7 +919,7 @@ metadata:
 `)
 	m := th.Run("/app/base", th.MakeDefaultOptions())
 	th.AssertActualEqualsExpected(m, `
-apiVersion: apps/v1
+apiVersion: apps/v1beta2
 kind: Deployment
 metadata:
   labels:
@@ -936,7 +944,7 @@ spec:
           name: configmap-in-base
         name: configmap-in-base
 ---
-apiVersion: apps/v1
+apiVersion: apps/v1beta2
 kind: Deployment
 metadata:
   annotations:
@@ -957,7 +965,8 @@ spec:
         - mountPath: /tmp/ps
           name: busybox-persistent-storage
       volumes:
-      - name: busybox-persistent-storage
+      - emptyDir: {}
+        name: busybox-persistent-storage
       - configMap:
           name: configmap-in-base
         name: configmap-in-base
@@ -1005,7 +1014,7 @@ patches:
     kind: Job
 `)
 	th.WriteF("/app/base/patch.yaml", `
-apiVersion: apps/v1
+apiVersion: apps/v1beta2
 kind: Deployment
 metadata:
   name: busybox
@@ -1014,7 +1023,7 @@ metadata:
 `)
 	m := th.Run("/app/base", th.MakeDefaultOptions())
 	th.AssertActualEqualsExpected(m, `
-apiVersion: apps/v1
+apiVersion: apps/v1beta2
 kind: Deployment
 metadata:
   labels:
@@ -1039,7 +1048,7 @@ spec:
           name: configmap-in-base
         name: configmap-in-base
 ---
-apiVersion: apps/v1
+apiVersion: apps/v1beta2
 kind: Deployment
 metadata:
   labels:
@@ -1107,7 +1116,7 @@ patches:
     kind: Deployment
 `)
 	th.WriteF("/app/base/patch1.yaml", `
-apiVersion: apps/v1
+apiVersion: apps/v1beta2
 kind: Deployment
 metadata:
   name: busybox
@@ -1115,7 +1124,7 @@ metadata:
     new-key-from-patch1: new-value
 `)
 	th.WriteF("/app/base/patch2.yaml", `
-apiVersion: apps/v1
+apiVersion: apps/v1beta2
 kind: Deployment
 metadata:
   name: busybox
@@ -1124,7 +1133,7 @@ metadata:
 `)
 	m := th.Run("/app/base", th.MakeDefaultOptions())
 	th.AssertActualEqualsExpected(m, `
-apiVersion: apps/v1
+apiVersion: apps/v1beta2
 kind: Deployment
 metadata:
   labels:
@@ -1149,7 +1158,7 @@ spec:
           name: configmap-in-base
         name: configmap-in-base
 ---
-apiVersion: apps/v1
+apiVersion: apps/v1beta2
 kind: Deployment
 metadata:
   annotations:
@@ -1171,7 +1180,8 @@ spec:
         - mountPath: /tmp/ps
           name: busybox-persistent-storage
       volumes:
-      - name: busybox-persistent-storage
+      - emptyDir: {}
+        name: busybox-persistent-storage
       - configMap:
           name: configmap-in-base
         name: configmap-in-base

api/krusty/fnplugin_test.go

@@ -1,466 +0,0 @@
-package krusty_test
-
-import (
-	"os/exec"
-	"testing"
-
-	kusttest_test "sigs.k8s.io/kustomize/api/testutils/kusttest"
-)
-
-func TestFnExecGenerator(t *testing.T) {
-	th := kusttest_test.MakeEnhancedHarness(t)
-	defer th.Reset()
-
-	th.WriteK("/app", `
-resources:
-- short_secret.yaml
-generators:
-- gener.yaml
-`)
-
-	// Create some additional resource just to make sure everything is added
-	th.WriteF("/app/short_secret.yaml", `
-apiVersion: v1
-kind: Secret
-metadata:
-  labels:
-    airshipit.org/ephemeral-user-data: "true"
-  name: node1-bmc-secret
-type: Opaque
-stringData:
-  userData: |
-    bootcmd:
-    - mkdir /mnt/vda
-`)
-
-	th.WriteF("/app/gener.yaml", `
-kind: executable
-metadata:
-  name: demo
-  annotations:
-    config.kubernetes.io/function: |
-      exec:
-        path: ./fnplugin_test/fnexectest.sh
-spec:
-`)
-	o := th.MakeOptionsPluginsEnabled()
-	o.PluginConfig.FnpLoadingOptions.EnableExec = true
-	m := th.Run("/app", o)
-	th.AssertActualEqualsExpected(m, `
-apiVersion: v1
-kind: Secret
-metadata:
-  labels:
-    airshipit.org/ephemeral-user-data: "true"
-  name: node1-bmc-secret
-stringData:
-  userData: |
-    bootcmd:
-    - mkdir /mnt/vda
-type: Opaque
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  annotations:
-    config.kubernetes.io/path: deployment_nginx.yaml
-    tshirt-size: small
-  labels:
-    app: nginx
-  name: nginx
-spec:
-  selector:
-    matchLabels:
-      app: nginx
-  template:
-    metadata:
-      labels:
-        app: nginx
-    spec:
-      containers:
-      - image: nginx
-        name: nginx
-`)
-}
-
-func skipIfNoDocker(t *testing.T) {
-	if _, err := exec.LookPath("docker"); err != nil {
-		t.Skip("skipping because docker binary wasn't found in PATH")
-	}
-}
-
-func TestFnContainerGenerator(t *testing.T) {
-	skipIfNoDocker(t)
-
-	th := kusttest_test.MakeEnhancedHarness(t)
-	defer th.Reset()
-
-	th.WriteK("/app", `
-resources:
-- short_secret.yaml
-generators:
-- gener.yaml
-`)
-	// Create generator config
-	th.WriteF("/app/gener.yaml", `
-apiVersion: examples.config.kubernetes.io/v1beta1
-kind: CockroachDB
-metadata:
-  name: demo
-  annotations:
-    config.kubernetes.io/function: |
-      container:
-        image: gcr.io/kustomize-functions/example-cockroachdb:v0.1.0
-spec:
-  replicas: 3
-`)
-	// Create some additional resource just to make sure everything is added
-	th.WriteF("/app/short_secret.yaml", `
-apiVersion: v1
-kind: Secret
-metadata:
-  labels:
-    airshipit.org/ephemeral-user-data: "true"
-  name: node1-bmc-secret
-type: Opaque
-stringData:
-  userData: |
-    bootcmd:
-    - mkdir /mnt/vda
-`)
-	m := th.Run("/app", th.MakeOptionsPluginsEnabled())
-	th.AssertActualEqualsExpected(m, `
-apiVersion: v1
-kind: Secret
-metadata:
-  labels:
-    airshipit.org/ephemeral-user-data: "true"
-  name: node1-bmc-secret
-stringData:
-  userData: |
-    bootcmd:
-    - mkdir /mnt/vda
-type: Opaque
----
-apiVersion: policy/v1beta1
-kind: PodDisruptionBudget
-metadata:
-  annotations:
-    config.kubernetes.io/path: config/demo-budget_poddisruptionbudget.yaml
-  labels:
-    app: cockroachdb
-    name: demo
-  name: demo-budget
-spec:
-  minAvailable: 67%
-  selector:
-    matchLabels:
-      app: cockroachdb
-      name: demo
----
-apiVersion: v1
-kind: Service
-metadata:
-  annotations:
-    config.kubernetes.io/path: config/demo-public_service.yaml
-  labels:
-    app: cockroachdb
-    name: demo
-  name: demo-public
-spec:
-  ports:
-  - name: grpc
-    port: 26257
-    targetPort: 26257
-  - name: http
-    port: 8080
-    targetPort: 8080
-  selector:
-    app: cockroachdb
-    name: demo
----
-apiVersion: v1
-kind: Service
-metadata:
-  annotations:
-    config.kubernetes.io/path: config/demo_service.yaml
-    prometheus.io/path: _status/vars
-    prometheus.io/port: "8080"
-    prometheus.io/scrape: "true"
-    service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
-  labels:
-    app: cockroachdb
-    name: demo
-  name: demo
-spec:
-  clusterIP: None
-  ports:
-  - name: grpc
-    port: 26257
-    targetPort: 26257
-  - name: http
-    port: 8080
-    targetPort: 8080
-  selector:
-    app: cockroachdb
-    name: demo
----
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
-  annotations:
-    config.kubernetes.io/path: config/demo_statefulset.yaml
-  labels:
-    app: cockroachdb
-    name: demo
-  name: demo
-spec:
-  replicas: 3
-  selector:
-    matchLabels:
-      app: cockroachdb
-      name: demo
-  serviceName: demo
-  template:
-    metadata:
-      labels:
-        app: cockroachdb
-        name: demo
-    spec:
-      affinity:
-        podAntiAffinity:
-          preferredDuringSchedulingIgnoredDuringExecution:
-          - podAffinityTerm:
-              labelSelector:
-                matchExpressions:
-                - key: app
-                  operator: In
-                  values:
-                  - cockroachdb
-              topologyKey: kubernetes.io/hostname
-            weight: 100
-      containers:
-      - command:
-        - /bin/bash
-        - -ecx
-        - |
-          # The use of qualified `+"`hostname -f`"+` is crucial:
-          # Other nodes aren't able to look up the unqualified hostname.
-          CRARGS=("start" "--logtostderr" "--insecure" "--host" "$(hostname -f)" "--http-host" "0.0.0.0")
-          # We only want to initialize a new cluster (by omitting the join flag)
-          # if we're sure that we're the first node (i.e. index 0) and that
-          # there aren't any other nodes running as part of the cluster that
-          # this is supposed to be a part of (which indicates that a cluster
-          # already exists and we should make sure not to create a new one).
-          # It's fine to run without --join on a restart if there aren't any
-          # other nodes.
-          if [ ! "$(hostname)" == "cockroachdb-0" ] ||              [ -e "/cockroach/cockroach-data/cluster_exists_marker" ]
-          then
-            # We don't join cockroachdb in order to avoid a node attempting
-            # to join itself, which currently doesn't work
-            # (https://github.com/cockroachdb/cockroach/issues/9625).
-            CRARGS+=("--join" "cockroachdb-public")
-          fi
-          exec /cockroach/cockroach ${CRARGS[*]}
-        image: cockroachdb/cockroach:v1.1.0
-        imagePullPolicy: IfNotPresent
-        name: demo
-        ports:
-        - containerPort: 26257
-          name: grpc
-        - containerPort: 8080
-          name: http
-        volumeMounts:
-        - mountPath: /cockroach/cockroach-data
-          name: datadir
-      initContainers:
-      - args:
-        - -on-start=/on-start.sh
-        - -service=cockroachdb
-        env:
-        - name: POD_NAMESPACE
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.namespace
-        image: cockroachdb/cockroach-k8s-init:0.1
-        imagePullPolicy: IfNotPresent
-        name: bootstrap
-        volumeMounts:
-        - mountPath: /cockroach/cockroach-data
-          name: datadir
-      terminationGracePeriodSeconds: 60
-      volumes:
-      - name: datadir
-        persistentVolumeClaim:
-          claimName: datadir
-  volumeClaimTemplates:
-  - metadata:
-      name: datadir
-    spec:
-      accessModes:
-      - ReadWriteOnce
-      resources:
-        requests:
-          storage: 1Gi
-`)
-}
-
-func TestFnContainerTransformer(t *testing.T) {
-	skipIfNoDocker(t)
-
-	th := kusttest_test.MakeEnhancedHarness(t)
-	defer th.Reset()
-
-	th.WriteK("/app", `
-resources:
-- data.yaml
-transformers:
-- transf1.yaml
-- transf2.yaml
-`)
-
-	th.WriteF("/app/data.yaml", `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: nginx
-  labels:
-    app: nginx
-  annotations:
-    tshirt-size: small # this injects the resource reservations
-spec:
-  selector:
-    matchLabels:
-      app: nginx
-  template:
-    metadata:
-      labels:
-        app: nginx
-    spec:
-      containers:
-      - name: nginx
-        image: nginx
-`)
-	// This transformer should add resource reservations based on annotation in data.yaml
-	// See https://github.com/kubernetes-sigs/kustomize/tree/master/functions/examples/injection-tshirt-sizes
-	th.WriteF("/app/transf1.yaml", `
-apiVersion: examples.config.kubernetes.io/v1beta1
-kind: Validator
-metadata:
-  name: valid
-  annotations:
-    config.kubernetes.io/function: |-
-      container:
-        image: gcr.io/kustomize-functions/example-tshirt:v0.2.0
-`)
-	// This transformer will check resources without and won't do any changes
-	// See https://github.com/kubernetes-sigs/kustomize/tree/master/functions/examples/validator-kubeval
-	th.WriteF("/app/transf2.yaml", `
-apiVersion: examples.config.kubernetes.io/v1beta1
-kind: Kubeval
-metadata:
-  name: validate
-  annotations:
-    config.kubernetes.io/function: |
-      container:
-        image: gcr.io/kustomize-functions/example-validator-kubeval:v0.1.0
-spec:
-  strict: true
-  ignoreMissingSchemas: true
-
-  # TODO: Update this to use network/volumes features.
-  # Relevant issues:
-  #   - https://github.com/kubernetes-sigs/kustomize/issues/1901
-  #   - https://github.com/kubernetes-sigs/kustomize/issues/1902
-  kubernetesVersion: "1.16.0"
-  schemaLocation: "file:///schemas"
-`)
-	m := th.Run("/app", th.MakeOptionsPluginsEnabled())
-	th.AssertActualEqualsExpected(m, `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  annotations:
-    config.kubernetes.io/path: deployment_nginx.yaml
-    tshirt-size: small
-  labels:
-    app: nginx
-  name: nginx
-spec:
-  selector:
-    matchLabels:
-      app: nginx
-  template:
-    metadata:
-      labels:
-        app: nginx
-    spec:
-      containers:
-      - image: nginx
-        name: nginx
-        resources:
-          requests:
-            cpu: 200m
-            memory: 50M
-`)
-}
-
-func TestFnContainerTransformerWithConfig(t *testing.T) {
-	skipIfNoDocker(t)
-
-	th := kusttest_test.MakeEnhancedHarness(t)
-	defer th.Reset()
-
-	th.WriteK("/app", `
-resources:
-- data1.yaml
-- data2.yaml
-transformers:
-- label_namespace.yaml
-`)
-
-	th.WriteF("/app/data1.yaml", `apiVersion: v1
-kind: Namespace
-metadata:
-  name: my-namespace
-`)
-	th.WriteF("/app/data2.yaml", `apiVersion: v1
-kind: Namespace
-metadata:
-  name: another-namespace
-`)
-
-	th.WriteF("/app/label_namespace.yaml", `apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: label_namespace
-  annotations:
-    config.kubernetes.io/function: |-
-      container:
-        image: gcr.io/kpt-functions/label-namespace@sha256:4f030738d6d25a207641ca517916431517578bd0eb8d98a8bde04e3bb9315dcd
-data:
-  label_name: my-ns-name
-  label_value: function-test
-`)
-
-	m := th.Run("/app", th.MakeOptionsPluginsEnabled())
-	th.AssertActualEqualsExpected(m, `
-apiVersion: v1
-kind: Namespace
-metadata:
-  annotations:
-    config.kubernetes.io/path: namespace_my-namespace.yaml
-  labels:
-    my-ns-name: function-test
-  name: my-namespace
----
-apiVersion: v1
-kind: Namespace
-metadata:
-  annotations:
-    config.kubernetes.io/path: namespace_another-namespace.yaml
-  labels:
-    my-ns-name: function-test
-  name: another-namespace
-`)
-}

api/krusty/fnplugin_test/fnexectest.sh

@@ -1,24 +0,0 @@
-#!/bin/sh
-
-cat <<EOF
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: nginx
-  labels:
-    app: nginx
-  annotations:
-    tshirt-size: small # this injects the resource reservations
-spec:
-  selector:
-    matchLabels:
-      app: nginx
-  template:
-    metadata:
-      labels:
-        app: nginx
-    spec:
-      containers:
-      - name: nginx
-        image: nginx
-EOF

api/krusty/generatormergeandreplace_test.go

@@ -56,7 +56,7 @@ spec:
               app: nginx
 `)
 	th.WriteF("/app/base/deployment.yaml", `
-apiVersion: apps/v1
+apiVersion: apps/v1beta2
 kind: Deployment
 metadata:
   name: nginx
@@ -92,7 +92,7 @@ spec:
     org: example.com
     team: foo
 ---
-apiVersion: apps/v1
+apiVersion: apps/v1beta2
 kind: Deployment
 metadata:
   annotations:
@@ -150,6 +150,8 @@ spec:
 
 func makeBaseWithGenerators(th kusttest_test.Harness) {
 	th.WriteK("/app", `
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
 namePrefix: team-foo-
 commonLabels:
   app: mynginx
@@ -171,7 +173,7 @@ secretGenerator:
   - password=somepw
 `)
 	th.WriteF("/app/deployment.yaml", `
-apiVersion: apps/v1
+apiVersion: apps/v1beta2
 kind: Deployment
 metadata:
   name: nginx
@@ -216,7 +218,7 @@ func TestBaseWithGeneratorsAlone(t *testing.T) {
 	makeBaseWithGenerators(th)
 	m := th.Run("/app", th.MakeDefaultOptions())
 	th.AssertActualEqualsExpected(m, `
-apiVersion: apps/v1
+apiVersion: apps/v1beta2
 kind: Deployment
 metadata:
   annotations:
@@ -306,7 +308,7 @@ func TestMergeAndReplaceGenerators(t *testing.T) {
 	th := kusttest_test.MakeHarness(t)
 	makeBaseWithGenerators(th)
 	th.WriteF("/overlay/deployment.yaml", `
-apiVersion: apps/v1
+apiVersion: apps/v1beta2
 kind: Deployment
 metadata:
   name: nginx
@@ -323,6 +325,8 @@ spec:
         name: configmap-in-overlay
 `)
 	th.WriteK("/overlay", `
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
 namePrefix: staging-
 commonLabels:
   env: staging
@@ -347,7 +351,7 @@ secretGenerator:
 `)
 	m := th.Run("/overlay", th.MakeDefaultOptions())
 	th.AssertActualEqualsExpected(m, `
-apiVersion: apps/v1
+apiVersion: apps/v1beta2
 kind: Deployment
 metadata:
   annotations:
@@ -385,12 +389,12 @@ spec:
       - gcePersistentDisk:
           pdName: nginx-persistent-storage
         name: nginx-persistent-storage
-      - configMap:
-          name: staging-team-foo-configmap-in-base-gh9d7t85gb
-        name: configmap-in-base
       - configMap:
           name: staging-configmap-in-overlay-k7cbc75tg8
         name: configmap-in-overlay
+      - configMap:
+          name: staging-team-foo-configmap-in-base-gh9d7t85gb
+        name: configmap-in-base
 ---
 apiVersion: v1
 kind: Service

api/krusty/inlinepatch_test.go

@@ -79,7 +79,8 @@ spec:
         - mountPath: /tmp/ps
           name: nginx-persistent-storage
       volumes:
-      - name: nginx-persistent-storage
+      - emptyDir: {}
+        name: nginx-persistent-storage
       - configMap:
           name: configmap-in-base
         name: configmap-in-base
@@ -222,7 +223,8 @@ spec:
         - mountPath: /tmp/ps
           name: nginx-persistent-storage
       volumes:
-      - name: nginx-persistent-storage
+      - emptyDir: {}
+        name: nginx-persistent-storage
       - configMap:
           name: configmap-in-base
         name: configmap-in-base

api/krusty/keepemptyarray_test.go

@@ -1,48 +0,0 @@
-package krusty_test
-
-import (
-	"testing"
-
-	kusttest_test "sigs.k8s.io/kustomize/api/testutils/kusttest"
-)
-
-func TestKeepEmptyArray(t *testing.T) {
-	th := kusttest_test.MakeHarness(t)
-	th.WriteF("/app/resources.yaml", `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: testing123
-spec:
-  replicas: 1
-  selector: null
-  template:
-    spec:
-      containers:
-      - name: event
-        image: testing123
-        imagePullPolicy: IfNotPresent
-      imagePullSecrets: []`)
-
-	th.WriteK("/app", `
-resources:
-- resources.yaml`)
-
-	m := th.Run("/app", th.MakeDefaultOptions())
-	th.AssertActualEqualsExpected(m, `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: testing123
-spec:
-  replicas: 1
-  selector: null
-  template:
-    spec:
-      containers:
-      - image: testing123
-        imagePullPolicy: IfNotPresent
-        name: event
-      imagePullSecrets: []
-`)
-}

api/krusty/kustomizer.go

@@ -4,8 +4,6 @@
 package krusty
 
 import (
-	"fmt"
-
 	"sigs.k8s.io/kustomize/api/builtins"
 	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/api/internal/k8sdeps/transformer"
@@ -13,9 +11,7 @@ import (
 	"sigs.k8s.io/kustomize/api/internal/target"
 	"sigs.k8s.io/kustomize/api/k8sdeps/kunstruct"
 	"sigs.k8s.io/kustomize/api/k8sdeps/validator"
-	"sigs.k8s.io/kustomize/api/konfig"
 	fLdr "sigs.k8s.io/kustomize/api/loader"
-	"sigs.k8s.io/kustomize/api/provenance"
 	"sigs.k8s.io/kustomize/api/resmap"
 	"sigs.k8s.io/kustomize/api/resource"
 	"sigs.k8s.io/kustomize/api/types"
@@ -82,15 +78,5 @@ func (b *Kustomizer) Run(path string) (resmap.ResMap, error) {
 	if b.options.DoLegacyResourceSort {
 		builtins.NewLegacyOrderTransformerPlugin().Transform(m)
 	}
-	if b.options.AddManagedbyLabel {
-		t := builtins.LabelTransformerPlugin{
-			Labels: map[string]string{konfig.ManagedbyLabelKey: fmt.Sprintf("kustomize-%s", provenance.GetProvenance().Version)},
-			FieldSpecs: []types.FieldSpec{{
-				Path:               "metadata/labels",
-				CreateIfNotPresent: true,
-			}},
-		}
-		t.Transform(m)
-	}
 	return m, nil
 }

api/krusty/managedbylabel_test.go

@@ -1,43 +0,0 @@
-// Copyright 2020 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package krusty_test
-
-import (
-	"testing"
-
-	kusttest_test "sigs.k8s.io/kustomize/api/testutils/kusttest"
-)
-
-func TestAddManagedbyLabel(t *testing.T) {
-	th := kusttest_test.MakeHarness(t)
-	th.WriteF("/app/service.yaml", `
-apiVersion: v1
-kind: Service
-metadata:
-  name: myService
-spec:
-  ports:
-  - port: 7002
-`)
-	th.WriteK("/app", `
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-- service.yaml
-`)
-	options := th.MakeDefaultOptions()
-	options.AddManagedbyLabel = true
-	m := th.Run("/app", options)
-	th.AssertActualEqualsExpected(m, `
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    app.kubernetes.io/managed-by: kustomize-v444.333.222
-  name: myService
-spec:
-  ports:
-  - port: 7002
-`)
-}

api/krusty/multiplepatch_test.go

@@ -10,186 +10,10 @@ import (
 	kusttest_test "sigs.k8s.io/kustomize/api/testutils/kusttest"
 )
 
-func TestSimpleMultiplePatches(t *testing.T) {
-	th := kusttest_test.MakeHarness(t)
-	th.WriteK("base", `
-namePrefix: b-
-commonLabels:
-  team: foo
-resources:
-- deployment.yaml
-- service.yaml
-configMapGenerator:
-- name: configmap-in-base
-  literals:
-  - foo=bar
-`)
-	th.WriteF("base/deployment.yaml", `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: nginx
-spec:
-  template:
-    spec:
-      containers:
-      - name: nginx
-        image: nginx
-        volumeMounts:
-        - name: nginx-persistent-storage
-          mountPath: /tmp/ps
-      - name: sidecar
-        image: sidecar:latest
-      volumes:
-      - name: nginx-persistent-storage
-        emptyDir: {}
-      - configMap:
-          name: configmap-in-base
-        name: configmap-in-base
-`)
-	th.WriteF("base/service.yaml", `
-apiVersion: v1
-kind: Service
-metadata:
-  name: nginx
-spec:
-  ports:
-  - port: 80
-`)
-	th.WriteK("overlay", `
-namePrefix: a-
-commonLabels:
-  env: staging
-patchesStrategicMerge:
-- deployment-patch1.yaml
-- deployment-patch2.yaml
-resources:
-- ../base
-configMapGenerator:
-- name: configmap-in-overlay
-  literals:
-  - hello=world
-`)
-	th.WriteF("overlay/deployment-patch1.yaml", `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: nginx
-spec:
-  template:
-    spec:
-      containers:
-      - name: nginx
-        image: nginx:latest
-        env:
-        - name: ENVKEY
-          value: ENVVALUE
-      volumes:
-      - name: nginx-persistent-storage
-        emptyDir: null
-        gcePersistentDisk:
-          pdName: nginx-persistent-storage
-      - configMap:
-          name: configmap-in-overlay
-        name: configmap-in-overlay
-`)
-	th.WriteF("overlay/deployment-patch2.yaml", `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: nginx
-spec:
-  template:
-    spec:
-      containers:
-      - name: nginx
-        env:
-        - name: ANOTHERENV
-          value: FOO
-      volumes:
-      - name: nginx-persistent-storage
-`)
-	m := th.Run("overlay", th.MakeDefaultOptions())
-	th.AssertActualEqualsExpected(m, `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    env: staging
-    team: foo
-  name: a-b-nginx
-spec:
-  selector:
-    matchLabels:
-      env: staging
-      team: foo
-  template:
-    metadata:
-      labels:
-        env: staging
-        team: foo
-    spec:
-      containers:
-      - env:
-        - name: ANOTHERENV
-          value: FOO
-        - name: ENVKEY
-          value: ENVVALUE
-        image: nginx:latest
-        name: nginx
-        volumeMounts:
-        - mountPath: /tmp/ps
-          name: nginx-persistent-storage
-      - image: sidecar:latest
-        name: sidecar
-      volumes:
-      - gcePersistentDisk:
-          pdName: nginx-persistent-storage
-        name: nginx-persistent-storage
-      - configMap:
-          name: a-b-configmap-in-base-fm96mhk4dt
-        name: configmap-in-base
-      - configMap:
-          name: a-configmap-in-overlay-ffm9hf78mc
-        name: configmap-in-overlay
----
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    env: staging
-    team: foo
-  name: a-b-nginx
-spec:
-  ports:
-  - port: 80
-  selector:
-    env: staging
-    team: foo
----
-apiVersion: v1
-data:
-  foo: bar
-kind: ConfigMap
-metadata:
-  labels:
-    env: staging
-    team: foo
-  name: a-b-configmap-in-base-fm96mhk4dt
----
-apiVersion: v1
-data:
-  hello: world
-kind: ConfigMap
-metadata:
-  labels:
-    env: staging
-  name: a-configmap-in-overlay-ffm9hf78mc
-`)
-}
-
 func makeCommonFileForMultiplePatchTest(th kusttest_test.Harness) {
 	th.WriteK("/app/base", `
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
 namePrefix: team-foo-
 commonLabels:
   app: mynginx
@@ -206,7 +30,7 @@ configMapGenerator:
   - foo=bar
 `)
 	th.WriteF("/app/base/deployment.yaml", `
-apiVersion: apps/v1
+apiVersion: apps/v1beta2
 kind: Deployment
 metadata:
   name: nginx
@@ -247,6 +71,8 @@ spec:
     app: nginx
 `)
 	th.WriteK("/app/overlay/staging", `
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
 namePrefix: staging-
 commonLabels:
   env: staging
@@ -266,7 +92,7 @@ func TestMultiplePatchesNoConflict(t *testing.T) {
 	th := kusttest_test.MakeHarness(t)
 	makeCommonFileForMultiplePatchTest(th)
 	th.WriteF("/app/overlay/staging/deployment-patch1.yaml", `
-apiVersion: apps/v1
+apiVersion: apps/v1beta2
 kind: Deployment
 metadata:
   name: nginx
@@ -289,7 +115,7 @@ spec:
         name: configmap-in-overlay
 `)
 	th.WriteF("/app/overlay/staging/deployment-patch2.yaml", `
-apiVersion: apps/v1
+apiVersion: apps/v1beta2
 kind: Deployment
 metadata:
   name: nginx
@@ -306,7 +132,7 @@ spec:
 `)
 	m := th.Run("/app/overlay/staging", th.MakeDefaultOptions())
 	th.AssertActualEqualsExpected(m, `
-apiVersion: apps/v1
+apiVersion: apps/v1beta2
 kind: Deployment
 metadata:
   annotations:
@@ -351,12 +177,12 @@ spec:
       - gcePersistentDisk:
           pdName: nginx-persistent-storage
         name: nginx-persistent-storage
-      - configMap:
-          name: staging-team-foo-configmap-in-base-g7k6gt2889
-        name: configmap-in-base
       - configMap:
           name: staging-configmap-in-overlay-k7cbc75tg8
         name: configmap-in-overlay
+      - configMap:
+          name: staging-team-foo-configmap-in-base-g7k6gt2889
+        name: configmap-in-base
 ---
 apiVersion: v1
 kind: Service
@@ -407,7 +233,7 @@ func TestMultiplePatchesWithConflict(t *testing.T) {
 	th := kusttest_test.MakeHarness(t)
 	makeCommonFileForMultiplePatchTest(th)
 	th.WriteF("/app/overlay/staging/deployment-patch1.yaml", `
-apiVersion: apps/v1
+apiVersion: apps/v1beta2
 kind: Deployment
 metadata:
   name: nginx
@@ -429,7 +255,7 @@ spec:
         name: configmap-in-overlay
 `)
 	th.WriteF("/app/overlay/staging/deployment-patch2.yaml", `
-apiVersion: apps/v1
+apiVersion: apps/v1beta2
 kind: Deployment
 metadata:
   name: nginx
@@ -453,7 +279,7 @@ spec:
 }
 
 func TestMultiplePatchesWithOnePatchDeleteDirective(t *testing.T) {
-	additivePatch := `apiVersion: apps/v1
+	additivePatch := `apiVersion: apps/v1beta2
 kind: Deployment
 metadata:
   name: nginx
@@ -466,7 +292,7 @@ spec:
         - name: SOME_NAME
           value: somevalue
 `
-	deletePatch := `apiVersion: apps/v1
+	deletePatch := `apiVersion: apps/v1beta2
 kind: Deployment
 metadata:
   name: nginx
@@ -502,7 +328,7 @@ spec:
 			th.WriteF("/app/overlay/staging/deployment-patch1.yaml", c.patch1)
 			th.WriteF("/app/overlay/staging/deployment-patch2.yaml", c.patch2)
 			m := th.Run("/app/overlay/staging", th.MakeDefaultOptions())
-			th.AssertActualEqualsExpected(m, `apiVersion: apps/v1
+			th.AssertActualEqualsExpected(m, `apiVersion: apps/v1beta2
 kind: Deployment
 metadata:
   annotations:
@@ -540,7 +366,8 @@ spec:
         - mountPath: /tmp/ps
           name: nginx-persistent-storage
       volumes:
-      - name: nginx-persistent-storage
+      - emptyDir: {}
+        name: nginx-persistent-storage
       - configMap:
           name: staging-team-foo-configmap-in-base-g7k6gt2889
         name: configmap-in-base
@@ -596,7 +423,7 @@ func TestMultiplePatchesBothWithPatchDeleteDirective(t *testing.T) {
 	th := kusttest_test.MakeHarness(t)
 	makeCommonFileForMultiplePatchTest(th)
 	th.WriteF("/app/overlay/staging/deployment-patch1.yaml", `
-apiVersion: apps/v1
+apiVersion: apps/v1beta2
 kind: Deployment
 metadata:
   name: nginx
@@ -608,7 +435,7 @@ spec:
         name: sidecar
 `)
 	th.WriteF("/app/overlay/staging/deployment-patch2.yaml", `
-apiVersion: apps/v1
+apiVersion: apps/v1beta2
 kind: Deployment
 metadata:
   name: nginx

api/krusty/options.go

@@ -18,11 +18,6 @@ type Options struct {
 	// order as specified by the kustomization file(s).
 	DoLegacyResourceSort bool
 
-	// When true, a label
-	//     app.kubernetes.io/managed-by: kustomize-<version>
-	// is added to all the resources in the build out.
-	AddManagedbyLabel bool
-
 	// Restrictions on what can be loaded from the file system.
 	// See type definition.
 	LoadRestrictions types.LoadRestrictions

api/krusty/transformerplugin_test.go

@@ -10,6 +10,24 @@ import (
 	"sigs.k8s.io/kustomize/api/types"
 )
 
+func writeDeployment(th *kusttest_test.HarnessEnhanced, path string) {
+	th.WriteF(path, `
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: myDeployment
+spec:
+  template:
+    metadata:
+      labels:
+        backend: awesome
+    spec:
+      containers:
+      - name: whatever
+        image: whatever
+`)
+}
+
 func writeStringPrefixer(th *kusttest_test.HarnessEnhanced, path, name string) {
 	th.WriteF(path, `
 apiVersion: someteam.example.com/v1
@@ -19,6 +37,53 @@ metadata:
 `)
 }
 
+func writeDatePrefixer(th *kusttest_test.HarnessEnhanced, path, name string) {
+	th.WriteF(path, `
+apiVersion: someteam.example.com/v1
+kind: DatePrefixer
+metadata:
+  name: `+name+`
+`)
+}
+
+func TestOrderedTransformers(t *testing.T) {
+	th := kusttest_test.MakeEnhancedHarness(t).
+		BuildGoPlugin("someteam.example.com", "v1", "StringPrefixer").
+		BuildGoPlugin("someteam.example.com", "v1", "DatePrefixer")
+	defer th.Reset()
+
+	th.WriteK("/app", `
+resources:
+- deployment.yaml
+transformers:
+- peachPrefixer.yaml
+- date1Prefixer.yaml
+- applePrefixer.yaml
+- date2Prefixer.yaml
+`)
+	writeDeployment(th, "/app/deployment.yaml")
+	writeStringPrefixer(th, "/app/applePrefixer.yaml", "apple")
+	writeStringPrefixer(th, "/app/peachPrefixer.yaml", "peach")
+	writeDatePrefixer(th, "/app/date1Prefixer.yaml", "date1")
+	writeDatePrefixer(th, "/app/date2Prefixer.yaml", "date2")
+	m := th.Run("/app", th.MakeOptionsPluginsEnabled())
+	th.AssertActualEqualsExpected(m, `
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: 2018-05-11-apple-2018-05-11-peach-myDeployment
+spec:
+  template:
+    metadata:
+      labels:
+        backend: awesome
+    spec:
+      containers:
+      - image: whatever
+        name: whatever
+`)
+}
+
 func TestPluginsNotEnabled(t *testing.T) {
 	th := kusttest_test.MakeEnhancedHarness(t).
 		BuildGoPlugin("someteam.example.com", "v1", "StringPrefixer")
@@ -100,78 +165,6 @@ metadata:
 `)
 }
 
-/*
-
-The tests below are disabled until the StringPrefixer and DatePrefixer
-can be rewritten using kyaml, instead of depending on the
-PrefixSuffixTransformerPlugin.  That dependency is causing
-failures in the test loader.
-
-func writeDeployment(th *kusttest_test.HarnessEnhanced, path string) {
-	th.WriteF(path, `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: myDeployment
-spec:
-  template:
-    metadata:
-      labels:
-        backend: awesome
-    spec:
-      containers:
-      - name: whatever
-        image: whatever
-`)
-}
-
-func writeDatePrefixer(th *kusttest_test.HarnessEnhanced, path, name string) {
-	th.WriteF(path, `
-apiVersion: someteam.example.com/v1
-kind: DatePrefixer
-metadata:
-  name: `+name+`
-`)
-}
-
-func TestOrderedTransformers(t *testing.T) {
-	th := kusttest_test.MakeEnhancedHarness(t).
-		BuildGoPlugin("someteam.example.com", "v1", "StringPrefixer").
-		BuildGoPlugin("someteam.example.com", "v1", "DatePrefixer")
-	defer th.Reset()
-
-	th.WriteK("/app", `
-resources:
-- deployment.yaml
-transformers:
-- peachPrefixer.yaml
-- date1Prefixer.yaml
-- applePrefixer.yaml
-- date2Prefixer.yaml
-`)
-	writeDeployment(th, "/app/deployment.yaml")
-	writeStringPrefixer(th, "/app/applePrefixer.yaml", "apple")
-	writeStringPrefixer(th, "/app/peachPrefixer.yaml", "peach")
-	writeDatePrefixer(th, "/app/date1Prefixer.yaml", "date1")
-	writeDatePrefixer(th, "/app/date2Prefixer.yaml", "date2")
-	m := th.Run("/app", th.MakeOptionsPluginsEnabled())
-	th.AssertActualEqualsExpected(m, `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: 2018-05-11-apple-2018-05-11-peach-myDeployment
-spec:
-  template:
-    metadata:
-      labels:
-        backend: awesome
-    spec:
-      containers:
-      - image: whatever
-        name: whatever
-`)
-}
-
 func TestTransformedTransformers(t *testing.T) {
 	th := kusttest_test.MakeEnhancedHarness(t).
 		BuildGoPlugin("someteam.example.com", "v1", "StringPrefixer").
@@ -212,4 +205,3 @@ spec:
         name: whatever
 `)
 }
-*/

api/krusty/variableref_test.go

@@ -844,7 +844,8 @@ spec:
         - -namespace=${POD_NAMESPACE}
         - -certs-dir=/cockroach-certs
         - -type=node
-        - -addresses=localhost,127.0.0.1,${POD_IP},$(hostname -f),$(hostname -f|cut -f 1-2 -d '.'),dev-base-cockroachdb-public
+        - -addresses=localhost,127.0.0.1,${POD_IP},$(hostname -f),$(hostname -f|cut
+          -f 1-2 -d '.'),dev-base-cockroachdb-public
         - -symlink-ca-from=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt
         env:
         - name: POD_IP

api/resmap/resmap.go

@@ -532,7 +532,7 @@ func (m *resWrangler) ErrorIfNotEqualSets(other ResMap) error {
 	for _, r1 := range m.rList {
 		id := r1.CurId()
 		others := m2.GetMatchingResourcesByCurrentId(id.Equals)
-		if len(others) == 0 {
+		if len(others) < 0 {
 			return fmt.Errorf(
 				"id in self missing from other; id: %s", id)
 		}

api/resmap/resmap_test.go

@@ -669,12 +669,7 @@ func TestErrorIfNotEqualSets(t *testing.T) {
 		t.Fatalf("%v should not equal %v %v", m1, m2, err)
 	}
 
-	m3 := resmaptest_test.NewRmBuilder(t, rf).AddR(r2).ResMap()
-	if err := m2.ErrorIfNotEqualSets(m3); err == nil {
-		t.Fatalf("%v should not equal %v %v", m2, m3, err)
-	}
-
-	m3 = resmaptest_test.NewRmBuilder(t, rf).Add(
+	m3 := resmaptest_test.NewRmBuilder(t, rf).Add(
 		map[string]interface{}{
 			"apiVersion": "v1",
 			"kind":       "ConfigMap",

api/resource/factory.go

@@ -69,10 +69,10 @@ func (rf *Factory) makeOne(
 		o = types.NewGenArgs(nil)
 	}
 	r := &Resource{
-		kunStr:  u,
-		options: o,
+		Kunstructured: u,
+		options:       o,
 	}
-	return r.setOriginalName(r.kunStr.GetName()).setOriginalNs(r.GetNamespace())
+	return r.setOriginalName(r.GetName()).setOriginalNs(r.GetNamespace())
 }
 
 // SliceFromPatches returns a slice of resources given a patch path

api/resource/factory_test.go

@@ -13,178 +13,6 @@ import (
 	"sigs.k8s.io/kustomize/api/types"
 )
 
-func TestSliceFromBytes(t *testing.T) {
-	type testCase struct {
-		input    string
-		expected []string
-	}
-	testCases := map[string]testCase{
-		"empty1": {
-			input:    "",
-			expected: []string{},
-		},
-		"empty2": {
-			input: `
----
----
-`,
-			expected: []string{},
-		},
-		"deployment1": {
-			input: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: pooh
----
-`,
-			expected: []string{
-				`apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: pooh
-`,
-			},
-		},
-		"deployment2": {
-			input: `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  annotations:
-    baseAnno: This is a base annotation
-  labels:
-    app: mungebot
-    foo: bar
-  name: baseprefix-mungebot
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      foo: bar
-  template:
-    metadata:
-      annotations:
-        baseAnno: This is a base annotation
-      labels:
-        app: mungebot
-        foo: bar
-    spec:
-      containers:
-      - env:
-        - name: foo
-          value: bar
-        image: nginx
-        name: nginx
-        ports:
-        - containerPort: 80
----
-apiVersion: v1
-kind: Service
-metadata:
-  annotations:
-    baseAnno: This is a base annotation
-  labels:
-    app: mungebot
-    foo: bar
-  name: baseprefix-mungebot-service
-spec:
-  ports:
-  - port: 7002
-  selector:
-    app: mungebot
-    foo: bar
-`,
-			expected: []string{
-				`apiVersion: apps/v1
-kind: Deployment
-metadata:
-  annotations:
-    baseAnno: This is a base annotation
-  labels:
-    app: mungebot
-    foo: bar
-  name: baseprefix-mungebot
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      foo: bar
-  template:
-    metadata:
-      annotations:
-        baseAnno: This is a base annotation
-      labels:
-        app: mungebot
-        foo: bar
-    spec:
-      containers:
-      - env:
-        - name: foo
-          value: bar
-        image: nginx
-        name: nginx
-        ports:
-        - containerPort: 80
-`,
-				`apiVersion: v1
-kind: Service
-metadata:
-  annotations:
-    baseAnno: This is a base annotation
-  labels:
-    app: mungebot
-    foo: bar
-  name: baseprefix-mungebot-service
-spec:
-  ports:
-  - port: 7002
-  selector:
-    app: mungebot
-    foo: bar
-`,
-			},
-		},
-	}
-
-	for name := range testCases {
-		tc := testCases[name]
-		t.Run(name, func(t *testing.T) {
-			result, err := factory.SliceFromBytes([]byte(tc.input))
-			if err != nil {
-				t.Fatalf("%v: fails with err: %v", name, err)
-			}
-			if len(result) != len(tc.expected) {
-				for i := range result {
-					bytes, err := result[i].AsYAML()
-					if err != nil {
-						t.Fatalf("%v: result to YAML fails with err: %v", name, err)
-					}
-					tmp := string(bytes)
-					t.Logf("--- %d:\n%s", i, tmp)
-				}
-				t.Fatalf(
-					"%v: actual len %d != expected len %d",
-					name, len(result), len(tc.expected))
-			}
-			for i := range tc.expected {
-				bytes, err := result[i].AsYAML()
-				if err != nil {
-					t.Fatalf("%v: result to YAML fails with err: %v", name, err)
-				}
-				tmp := string(bytes)
-				if tmp != tc.expected[i] {
-					t.Fatalf(
-						"%v: string mismatch in item %d\n"+
-							"actual:\n-----\n%s\n-----\n"+
-							"expected:\n-----\n%s\n-----\n",
-						name, i, tmp, tc.expected[i])
-				}
-			}
-		})
-	}
-}
-
 func TestSliceFromPatches(t *testing.T) {
 	patchGood1 := types.PatchStrategicMerge("patch1.yaml")
 	patch1 := `

api/resource/resource.go

@@ -1,7 +1,7 @@
 // Copyright 2019 The Kubernetes Authors.
 // SPDX-License-Identifier: Apache-2.0
 
-// Package resource implements representations of k8s API resources.
+// Package resource implements representations of k8s API resources as "unstructured" objects.
 package resource
 
 import (
@@ -14,57 +14,10 @@ import (
 	"sigs.k8s.io/yaml"
 )
 
-// Resource is a representation of a Kubernetes Resource Model object paired
-// with metadata used by kustomize.
-//
-// At time of writing Resource is changing from being based on an object
-// sitting behind
-//
-//     sigs.k8s.io/kustomize/api/ifc.Unstructured
-//
-// to being based on an instance of
-//
-//    sigs.k8s.io/kustomize/kyaml/yaml.RNode
-//
-// Ultimately, use of the Resource struct in kustomize should be entirely
-// replaced by instances of RNode for direct use in kyaml, with all metadata
-// stored directly in the RNodes as short-lived annotations, to be deleted
-// before final output as part of a final filtration step.  Using annotations
-// will allow pipelined KRM Config Functions to share metadata that would
-// otherwise be hidden in kustomize-only structures.
-//
-// ifc.Unstructured is an interface hiding an instance of
-// 	  sigs.k8s.io/kustomize/api/k8sdeps/kunstruct.UnstructAdapter
-// which in turn adapts an instance of
-//    k8s.io/apimachinery/pkg/apis/meta/v1/unstructured
-// to the ifc.Unstructured interface.  This latter code handles
-// mutations in the old code.
-//
-// The rule in kustomize development has been
-//                           api/
-//                 k8sdeps/ ifc/ krusty/ theRest/
-//
-//   1) Depend on k8s.io/ only via sigs.k8s.io/kustomize/api/k8sdeps.
-//
-//   2) Instances created in k8sdeps/ can only be injected into theRest/
-//      behind interfaces defined in ifc/, arranged by a small bit of code
-//      in krusty/.  Nothing in theRest/ can import k8sdeps/.
-//
-// This was to allow for importing kustomize code into kubectl, which also
-// depends on k8s.io/apimachinery, albeit via a strange, old arrangement
-// predating Go modules.  The idea was to copy the k8sdeps/ tree into kubectl
-// via a large PR, and depend on the rest via vendoring (and a small copy of
-// krusty/ code).  Over 2019, however, kubectl underwent large code changes
-// including a switch to Go modules, and an attempt to extract it from the
-// k8s repo, and this made large kustomize integration PRs hard to get through
-// code review.
-//
-// The new plan is to eliminate k8sdeps/ entirely, along with its k8s.io/
-// dependence, switch to kyaml, and thus allow kustomize to be imported into
-// kubectl via normal Go module imports.
-//
+// Resource is map representation of a Kubernetes API resource object
+// paired with a GenerationBehavior.
 type Resource struct {
-	kunStr       ifc.Kunstructured
+	ifc.Kunstructured
 	originalName string
 	originalNs   string
 	options      *types.GenArgs
@@ -74,118 +27,6 @@ type Resource struct {
 	nameSuffixes []string
 }
 
-func (r *Resource) ResetPrimaryData(incoming *Resource) {
-	r.kunStr = incoming.kunStr.Copy()
-}
-
-func (r *Resource) GetAnnotations() map[string]string {
-	return r.kunStr.GetAnnotations()
-}
-
-func (r *Resource) Copy() ifc.Kunstructured {
-	return r.kunStr.Copy()
-}
-
-func (r *Resource) GetBool(p string) (bool, error) {
-	return r.kunStr.GetBool(p)
-}
-
-func (r *Resource) GetFieldValue(f string) (interface{}, error) {
-	return r.kunStr.GetFieldValue(f)
-}
-
-func (r *Resource) GetFloat64(p string) (float64, error) {
-	return r.kunStr.GetFloat64(p)
-}
-
-func (r *Resource) GetGvk() resid.Gvk {
-	return r.kunStr.GetGvk()
-}
-
-func (r *Resource) GetInt64(p string) (int64, error) {
-	return r.kunStr.GetInt64(p)
-}
-
-func (r *Resource) GetKind() string {
-	return r.kunStr.GetKind()
-}
-
-func (r *Resource) GetLabels() map[string]string {
-	return r.kunStr.GetLabels()
-}
-
-func (r *Resource) GetMap(p string) (map[string]interface{}, error) {
-	return r.kunStr.GetMap(p)
-}
-
-func (r *Resource) GetName() string {
-	return r.kunStr.GetName()
-}
-
-func (r *Resource) GetSlice(p string) ([]interface{}, error) {
-	return r.kunStr.GetSlice(p)
-}
-
-func (r *Resource) GetString(p string) (string, error) {
-	return r.kunStr.GetString(p)
-}
-
-func (r *Resource) GetStringMap(p string) (map[string]string, error) {
-	return r.kunStr.GetStringMap(p)
-}
-
-func (r *Resource) GetStringSlice(p string) ([]string, error) {
-	return r.kunStr.GetStringSlice(p)
-}
-
-func (r *Resource) Map() map[string]interface{} {
-	return r.kunStr.Map()
-}
-
-func (r *Resource) MarshalJSON() ([]byte, error) {
-	return r.kunStr.MarshalJSON()
-}
-
-func (r *Resource) MatchesLabelSelector(selector string) (bool, error) {
-	return r.kunStr.MatchesLabelSelector(selector)
-}
-
-func (r *Resource) MatchesAnnotationSelector(selector string) (bool, error) {
-	return r.kunStr.MatchesAnnotationSelector(selector)
-}
-
-func (r *Resource) Patch(other ifc.Kunstructured) error {
-	return r.kunStr.Patch(other)
-}
-
-func (r *Resource) SetAnnotations(m map[string]string) {
-	r.kunStr.SetAnnotations(m)
-}
-
-func (r *Resource) SetGvk(gvk resid.Gvk) {
-	r.kunStr.SetGvk(gvk)
-}
-
-func (r *Resource) SetLabels(m map[string]string) {
-	r.kunStr.SetLabels(m)
-}
-
-func (r *Resource) SetMap(m map[string]interface{}) {
-	r.kunStr.SetMap(m)
-}
-
-func (r *Resource) SetName(n string) {
-	r.kunStr.SetName(n)
-}
-
-func (r *Resource) SetNamespace(n string) {
-	r.kunStr.SetNamespace(n)
-}
-
-func (r *Resource) UnmarshalJSON(s []byte) error {
-	return r.kunStr.UnmarshalJSON(s)
-}
-
 // ResCtx is an interface describing the contextual added
 // kept kustomize in the context of each Resource object.
 // Currently mainly the name prefix and name suffix are added.
@@ -205,7 +46,7 @@ type ResCtxMatcher func(ResCtx) bool
 // DeepCopy returns a new copy of resource
 func (r *Resource) DeepCopy() *Resource {
 	rc := &Resource{
-		kunStr: r.kunStr.Copy(),
+		Kunstructured: r.Kunstructured.Copy(),
 	}
 	rc.copyOtherFields(r)
 	return rc
@@ -213,11 +54,11 @@ func (r *Resource) DeepCopy() *Resource {
 
 // Replace performs replace with other resource.
 func (r *Resource) Replace(other *Resource) {
-	r.kunStr.SetLabels(mergeStringMaps(other.kunStr.GetLabels(), r.kunStr.GetLabels()))
-	r.kunStr.SetAnnotations(
-		mergeStringMaps(other.kunStr.GetAnnotations(), r.kunStr.GetAnnotations()))
-	r.kunStr.SetName(other.GetName())
-	r.kunStr.SetNamespace(other.GetNamespace())
+	r.SetLabels(mergeStringMaps(other.GetLabels(), r.GetLabels()))
+	r.SetAnnotations(
+		mergeStringMaps(other.GetAnnotations(), r.GetAnnotations()))
+	r.SetName(other.GetName())
+	r.SetNamespace(other.GetNamespace())
 	r.copyOtherFields(other)
 }
 
@@ -233,7 +74,7 @@ func (r *Resource) copyOtherFields(other *Resource) {
 
 func (r *Resource) Equals(o *Resource) bool {
 	return r.ReferencesEqual(o) &&
-		reflect.DeepEqual(r.kunStr, o.kunStr)
+		reflect.DeepEqual(r.Kunstructured, o.Kunstructured)
 }
 
 func (r *Resource) ReferencesEqual(o *Resource) bool {
@@ -252,13 +93,13 @@ func (r *Resource) ReferencesEqual(o *Resource) bool {
 }
 
 func (r *Resource) KunstructEqual(o *Resource) bool {
-	return reflect.DeepEqual(r.kunStr, o.kunStr)
+	return reflect.DeepEqual(r.Kunstructured, o.Kunstructured)
 }
 
 // Merge performs merge with other resource.
 func (r *Resource) Merge(other *Resource) {
 	r.Replace(other)
-	mergeConfigmap(r.kunStr.Map(), other.Map(), r.Map())
+	mergeConfigmap(r.Map(), other.Map(), r.Map())
 }
 
 func (r *Resource) copyRefBy() []resid.ResId {
@@ -384,7 +225,7 @@ func (r *Resource) setOriginalNs(n string) *Resource {
 
 // String returns resource as JSON.
 func (r *Resource) String() string {
-	bs, err := r.kunStr.MarshalJSON()
+	bs, err := r.MarshalJSON()
 	if err != nil {
 		return "<" + err.Error() + ">"
 	}
@@ -394,7 +235,7 @@ func (r *Resource) String() string {
 // AsYAML returns the resource in Yaml form.
 // Easier to read than JSON.
 func (r *Resource) AsYAML() ([]byte, error) {
-	json, err := r.kunStr.MarshalJSON()
+	json, err := r.MarshalJSON()
 	if err != nil {
 		return nil, err
 	}
@@ -419,7 +260,7 @@ func (r *Resource) NeedHashSuffix() bool {
 
 // GetNamespace returns the namespace the resource thinks it's in.
 func (r *Resource) GetNamespace() string {
-	namespace, _ := r.kunStr.GetString("metadata.namespace")
+	namespace, _ := r.GetString("metadata.namespace")
 	// if err, namespace is empty, so no need to check.
 	return namespace
 }
@@ -429,7 +270,7 @@ func (r *Resource) GetNamespace() string {
 // TODO: compute this once and save it in the resource.
 func (r *Resource) OrgId() resid.ResId {
 	return resid.NewResIdWithNamespace(
-		r.kunStr.GetGvk(), r.GetOriginalName(), r.GetOriginalNs())
+		r.GetGvk(), r.GetOriginalName(), r.GetOriginalNs())
 }
 
 // CurId returns a ResId for the resource using the
@@ -437,7 +278,7 @@ func (r *Resource) OrgId() resid.ResId {
 // This should be unique in any ResMap.
 func (r *Resource) CurId() resid.ResId {
 	return resid.NewResIdWithNamespace(
-		r.kunStr.GetGvk(), r.kunStr.GetName(), r.GetNamespace())
+		r.GetGvk(), r.GetName(), r.GetNamespace())
 }
 
 // GetRefBy returns the ResIds that referred to current resource

api/testutils/kusttest/harness.go

@@ -52,16 +52,6 @@ kind: Kustomization
 `+content))
 }
 
-func (th Harness) WriteC(path string, content string) {
-	th.fSys.WriteFile(
-		filepath.Join(
-			path,
-			konfig.DefaultKustomizationFileName()), []byte(`
-apiVersion: kustomize.config.k8s.io/v1alpha1
-kind: Component
-`+content))
-}
-
 func (th Harness) WriteF(path string, content string) {
 	th.fSys.WriteFile(path, []byte(content))
 }

api/testutils/kusttest/harnessenhanced.go

@@ -4,6 +4,9 @@
 package kusttest_test
 
 import (
+	"bytes"
+	"fmt"
+	"strconv"
 	"testing"
 
 	"sigs.k8s.io/kustomize/api/filesys"
@@ -17,6 +20,8 @@ import (
 	"sigs.k8s.io/kustomize/api/resource"
 	valtest_test "sigs.k8s.io/kustomize/api/testutils/valtest"
 	"sigs.k8s.io/kustomize/api/types"
+	"sigs.k8s.io/kustomize/kyaml/kio"
+	"sigs.k8s.io/kustomize/kyaml/yaml"
 )
 
 // HarnessEnhanced manages a full plugin environment for tests.
@@ -125,8 +130,42 @@ func (th *HarnessEnhanced) LoadAndRunTransformer(
 
 func (th *HarnessEnhanced) RunTransformerAndCheckResult(
 	config, input, expected string) {
-	resMap := th.LoadAndRunTransformer(config, input)
-	th.AssertActualEqualsExpected(resMap, expected)
+	for _, b := range []bool{true, false} {
+		th.t.Run(fmt.Sprintf("yaml-%v", b), func(t *testing.T) {
+			c, err := toggleYamlSupportField(config, b)
+			if err != nil {
+				th.t.Fatalf("Err: %v", err)
+			}
+			resMap, err := th.RunTransformer(c, input)
+			if err != nil {
+				th.t.Fatalf("Err: %v", err)
+			}
+			th.AssertActualEqualsExpected(resMap, expected)
+		})
+	}
+}
+
+func toggleYamlSupportField(config string, yamlSupport bool) (string, error) {
+	var out bytes.Buffer
+	rw := kio.ByteReadWriter{
+		Reader: bytes.NewBufferString(config),
+		Writer: &out,
+	}
+	err := kio.Pipeline{
+		Inputs: []kio.Reader{&rw},
+		Filters: []kio.Filter{
+			kio.FilterAll(yaml.FilterFunc(
+				func(node *yaml.RNode) (*yaml.RNode, error) {
+					return node.Pipe(yaml.FieldSetter{
+						Name:        "yamlSupport",
+						StringValue: strconv.FormatBool(yamlSupport),
+					})
+				}),
+			),
+		},
+		Outputs: []kio.Writer{&rw},
+	}.Execute()
+	return out.String(), err
 }
 
 func (th *HarnessEnhanced) ErrorFromLoadAndRunTransformer(
@@ -139,8 +178,16 @@ type AssertFunc func(t *testing.T, err error)
 
 func (th *HarnessEnhanced) RunTransformerAndCheckError(
 	config, input string, assertFn AssertFunc) {
-	_, err := th.RunTransformer(config, input)
-	assertFn(th.t, err)
+	for _, b := range []bool{true, false} {
+		th.t.Run(fmt.Sprintf("yaml-%v", b), func(t *testing.T) {
+			c, err := toggleYamlSupportField(config, b)
+			if err != nil {
+				th.t.Fatalf("Err: %v", err)
+			}
+			_, err = th.RunTransformer(c, input)
+			assertFn(t, err)
+		})
+	}
 }
 
 func (th *HarnessEnhanced) RunTransformer(
@@ -156,7 +203,6 @@ func (th *HarnessEnhanced) RunTransformerFromResMap(
 	config string, resMap resmap.ResMap) (resmap.ResMap, error) {
 	transConfig, err := th.rf.RF().FromBytes([]byte(config))
 	if err != nil {
-		th.t.Logf("config: '%s'", config)
 		th.t.Fatalf("Err: %v", err)
 	}
 	g, err := th.pl.LoadTransformer(

api/types/kustomization.go

@@ -3,18 +3,9 @@
 
 package types
 
-import (
-	"bytes"
-	"encoding/json"
-
-	"sigs.k8s.io/yaml"
-)
-
 const (
 	KustomizationVersion  = "kustomize.config.k8s.io/v1beta1"
 	KustomizationKind     = "Kustomization"
-	ComponentVersion      = "kustomize.config.k8s.io/v1alpha1"
-	ComponentKind         = "Component"
 	MetadataNamespacePath = "metadata/namespace"
 )
 
@@ -82,14 +73,10 @@ type Kustomization struct {
 	//
 
 	// Resources specifies relative paths to files holding YAML representations
-	// of kubernetes API objects, or specifications of other kustomizations
+	// of kubernetes API objects, or specifcations of other kustomizations
 	// via relative paths, absolute paths, or URLs.
 	Resources []string `json:"resources,omitempty" yaml:"resources,omitempty"`
 
-	// Components specifies relative paths to specifications of other Components
-	// via relative paths, absolute paths, or URLs.
-	Components []string `json:"components,omitempty" yaml:"components,omitempty"`
-
 	// Crds specifies relative paths to Custom Resource Definition files.
 	// This allows custom resources to be recognized as operands, making
 	// it possible to add them to the Resources list.
@@ -131,9 +118,6 @@ type Kustomization struct {
 	// Transformers is a list of files containing transformers
 	Transformers []string `json:"transformers,omitempty" yaml:"transformers,omitempty"`
 
-	// Validators is a list of files containing validators
-	Validators []string `json:"validators,omitempty" yaml:"validators,omitempty"`
-
 	// Inventory appends an object that contains the record
 	// of all other objects, which can be used in apply, prune and delete
 	Inventory *Inventory `json:"inventory,omitempty" yaml:"inventory,omitempty"`
@@ -144,48 +128,23 @@ type Kustomization struct {
 // moving content of deprecated fields to newer
 // fields.
 func (k *Kustomization) FixKustomizationPostUnmarshalling() {
+	if k.APIVersion == "" {
+		k.APIVersion = KustomizationVersion
+	}
 	if k.Kind == "" {
 		k.Kind = KustomizationKind
 	}
-	if k.APIVersion == "" {
-		if k.Kind == ComponentKind {
-			k.APIVersion = ComponentVersion
-		} else {
-			k.APIVersion = KustomizationVersion
-		}
-	}
 	k.Resources = append(k.Resources, k.Bases...)
 	k.Bases = nil
 }
 
 func (k *Kustomization) EnforceFields() []string {
 	var errs []string
-	if k.Kind != "" && k.Kind != KustomizationKind && k.Kind != ComponentKind {
-		errs = append(errs, "kind should be "+KustomizationKind+" or "+ComponentKind)
+	if k.APIVersion != "" && k.APIVersion != KustomizationVersion {
+		errs = append(errs, "apiVersion should be "+KustomizationVersion)
 	}
-	requiredVersion := KustomizationVersion
-	if k.Kind == ComponentKind {
-		requiredVersion = ComponentVersion
-	}
-	if k.APIVersion != "" && k.APIVersion != requiredVersion {
-		errs = append(errs, "apiVersion for "+k.Kind+" should be "+requiredVersion)
+	if k.Kind != "" && k.Kind != KustomizationKind {
+		errs = append(errs, "kind should be "+KustomizationKind)
 	}
 	return errs
 }
-
-// Unmarshal replace k with the content in YAML input y
-func (k *Kustomization) Unmarshal(y []byte) error {
-	j, err := yaml.YAMLToJSON(y)
-	if err != nil {
-		return err
-	}
-	dec := json.NewDecoder(bytes.NewReader(j))
-	dec.DisallowUnknownFields()
-	var nk Kustomization
-	err = dec.Decode(&nk)
-	if err != nil {
-		return err
-	}
-	*k = nk
-	return nil
-}

api/types/kustomization_test.go

@@ -1,184 +0,0 @@
-package types
-
-import (
-	"testing"
-)
-
-func fixKustomizationPostUnmarshallingCheck(k, e *Kustomization) bool {
-	return (k.Kind == e.Kind && k.APIVersion == e.APIVersion &&
-		len(k.Resources) == len(e.Resources) && k.Resources[0] == e.Resources[0] &&
-		k.Bases == nil)
-}
-
-func TestFixKustomizationPostUnmarshalling(t *testing.T) {
-	var k Kustomization
-	k.Bases = append(k.Bases, "foo")
-	k.FixKustomizationPostUnmarshalling()
-
-	expected := Kustomization{
-		TypeMeta: TypeMeta{
-			Kind:       KustomizationKind,
-			APIVersion: KustomizationVersion,
-		},
-		Resources: []string{"foo"},
-	}
-
-	if !fixKustomizationPostUnmarshallingCheck(&k, &expected) {
-		t.Fatalf("unexpected output: %v", k)
-	}
-}
-
-func TestFixKustomizationPostUnmarshalling_2(t *testing.T) {
-	k := Kustomization{
-		TypeMeta: TypeMeta{
-			Kind: ComponentKind,
-		},
-	}
-	k.Bases = append(k.Bases, "foo")
-	k.FixKustomizationPostUnmarshalling()
-
-	expected := Kustomization{
-		TypeMeta: TypeMeta{
-			Kind:       ComponentKind,
-			APIVersion: ComponentVersion,
-		},
-		Resources: []string{"foo"},
-	}
-
-	if !fixKustomizationPostUnmarshallingCheck(&k, &expected) {
-		t.Fatalf("unexpected output: %v", k)
-	}
-}
-
-func TestEnforceFields_InvalidKindAndVersion(t *testing.T) {
-	k := Kustomization{
-		TypeMeta: TypeMeta{
-			Kind:       "foo",
-			APIVersion: "bar",
-		},
-	}
-
-	errs := k.EnforceFields()
-	if len(errs) != 2 {
-		t.Fatalf("number of errors should be 2 but got: %v", errs)
-	}
-}
-
-func TestEnforceFields_InvalidKind(t *testing.T) {
-	k := Kustomization{
-		TypeMeta: TypeMeta{
-			Kind:       "foo",
-			APIVersion: KustomizationVersion,
-		},
-	}
-
-	errs := k.EnforceFields()
-	if len(errs) != 1 {
-		t.Fatalf("number of errors should be 1 but got: %v", errs)
-	}
-
-	expected := "kind should be " + KustomizationKind + " or " + ComponentKind
-	if errs[0] != expected {
-		t.Fatalf("error should be %v but got: %v", expected, errs[0])
-	}
-}
-
-func TestEnforceFields_InvalidVersion(t *testing.T) {
-	k := Kustomization{
-		TypeMeta: TypeMeta{
-			Kind:       KustomizationKind,
-			APIVersion: "bar",
-		},
-	}
-
-	errs := k.EnforceFields()
-	if len(errs) != 1 {
-		t.Fatalf("number of errors should be 1 but got: %v", errs)
-	}
-
-	expected := "apiVersion for " + k.Kind + " should be " + KustomizationVersion
-	if errs[0] != expected {
-		t.Fatalf("error should be %v but got: %v", expected, errs[0])
-	}
-}
-
-func TestEnforceFields_ComponentKind(t *testing.T) {
-	k := Kustomization{
-		TypeMeta: TypeMeta{
-			Kind:       ComponentKind,
-			APIVersion: "bar",
-		},
-	}
-
-	errs := k.EnforceFields()
-	if len(errs) != 1 {
-		t.Fatalf("number of errors should be 1 but got: %v", errs)
-	}
-
-	expected := "apiVersion for " + k.Kind + " should be " + ComponentVersion
-	if errs[0] != expected {
-		t.Fatalf("error should be %v but got: %v", expected, errs[0])
-	}
-}
-
-func TestEnforceFields(t *testing.T) {
-	k := Kustomization{
-		TypeMeta: TypeMeta{
-			Kind:       KustomizationKind,
-			APIVersion: KustomizationVersion,
-		},
-	}
-
-	errs := k.EnforceFields()
-	if len(errs) != 0 {
-		t.Fatalf("number of errors should be 0 but got: %v", errs)
-	}
-}
-
-func TestUnmarshal(t *testing.T) {
-	y := []byte(`
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-- foo
-- bar
-nameSuffix: dog
-namePrefix: cat`)
-	var k Kustomization
-	err := k.Unmarshal(y)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if k.Kind != KustomizationKind || k.APIVersion != KustomizationVersion ||
-		len(k.Resources) != 2 || k.NamePrefix != "cat" || k.NameSuffix != "dog" {
-		t.Fatalf("wrong unmarshal result: %v", k)
-	}
-}
-
-func TestUnmarshal_UnkownField(t *testing.T) {
-	y := []byte(`
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-unknown: foo`)
-	var k Kustomization
-	err := k.Unmarshal(y)
-	if err == nil {
-		t.Fatalf("expect an error")
-	}
-	expect := "json: unknown field \"unknown\""
-	if err.Error() != expect {
-		t.Fatalf("expect %v but got: %v", expect, err.Error())
-	}
-}
-
-func TestUnmarshal_InvalidYaml(t *testing.T) {
-	y := []byte(`
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-unknown`)
-	var k Kustomization
-	err := k.Unmarshal(y)
-	if err == nil {
-		t.Fatalf("expect an error")
-	}
-}

api/types/pluginconfig.go

@@ -29,7 +29,4 @@ type PluginConfig struct {
 
 	// BpLoadingOptions distinguishes builtin plugin behaviors.
 	BpLoadingOptions BuiltinPluginLoadingOptions
-
-	// FnpLoadingOptions sets the way function-based plugin behaviors.
-	FnpLoadingOptions FnPluginLoadingOptions
 }

api/types/pluginrestrictions.go

@@ -41,16 +41,3 @@ const (
 	// to generate static code.
 	BploLoadFromFileSys
 )
-
-// FnPluginLoadingOptions set way functions-based pluing are restricted
-type FnPluginLoadingOptions struct {
-	// Allow to run executables
-	EnableExec bool
-	// Allow to run starlark
-	EnableStar bool
-	// Allow container access to network
-	Network     bool
-	NetworkName string
-	// list of mounts
-	Mounts []string
-}

cmd/config/Makefile

@@ -6,7 +6,7 @@
 GOBIN := $(shell go env GOPATH)/bin
 
 build:
-	go build -v -o $(GOBIN)/kubectl-krm ./kubectl-krm
+	go build -v -o $(GOBIN)/config .
 
 all: generate build license fix vet fmt test lint tidy
 

cmd/config/README.md

@@ -6,7 +6,7 @@ of development of the kyaml package and as a reference implementation for using
 ## Docs
 
 All documentation is also built directly into the `config` command group using 
-`kustomize help cfg`.
+`kustomize help config`.
 
 - [tutorials](docs/tutorials)
 - [commands](docs/commands)

cmd/config/configcobra/cfg.go

@@ -1,32 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package configcobra
-
-import (
-	"github.com/spf13/cobra"
-	"sigs.k8s.io/kustomize/cmd/config/internal/commands"
-)
-
-func GetCfg(name string) *cobra.Command {
-	cmd := &cobra.Command{
-		Use:   "cfg",
-		Short: "Commands for reading and writing configuration.",
-	}
-
-	cmd.AddCommand(commands.AnnotateCommand(name))
-	cmd.AddCommand(commands.CatCommand(name))
-	cmd.AddCommand(commands.CountCommand(name))
-	cmd.AddCommand(commands.CreateSetterCommand(name))
-	cmd.AddCommand(commands.CreateSubstitutionCommand(name))
-	cmd.AddCommand(commands.FmtCommand(name))
-	cmd.AddCommand(commands.GrepCommand(name))
-	cmd.AddCommand(commands.InitCommand(name))
-	cmd.AddCommand(commands.ListSettersCommand(name))
-	cmd.AddCommand(commands.MergeCommand(name))
-	cmd.AddCommand(commands.Merge3Command(name))
-	cmd.AddCommand(commands.SetCommand(name))
-	cmd.AddCommand(commands.TreeCommand(name))
-
-	return cmd
-}

cmd/config/configcobra/cmds.go

@@ -6,12 +6,43 @@
 package configcobra
 
 import (
+	"strings"
+
 	"github.com/spf13/cobra"
 	"sigs.k8s.io/kustomize/cmd/config/internal/commands"
 	"sigs.k8s.io/kustomize/cmd/config/internal/generateddocs/api"
 	"sigs.k8s.io/kustomize/cmd/config/internal/generateddocs/tutorials"
+	"sigs.k8s.io/kustomize/kyaml/commandutil"
 )
 
+var root = &cobra.Command{
+	Use:   "config",
+	Short: "[Alpha] Utilities for working with Resource Configuration.",
+	Long: `[Alpha] Utilities for working with Resource Configuration.
+
+Tutorials:
+
+  Run 'kustomize help config tutorial-TUTORIAL'
+
+	$ kustomize help config tutorials-command-basics
+
+Command Documentation:
+
+  Run 'kustomize help config CMD'
+
+	$ kustomize help config tree
+
+Advanced Documentation Topics:
+
+  Run 'kustomize help config docs-TOPIC'
+
+	$ kustomize help config docs-merge
+	$ kustomize help config docs-merge3
+	$ kustomize help config docs-fn
+	$ kustomize help config docs-io-annotations
+`,
+}
+
 // Export commands publicly for composition
 var (
 	Annotate           = commands.AnnotateCommand
@@ -19,14 +50,12 @@ var (
 	Count              = commands.CountCommand
 	CreateSetter       = commands.CreateSetterCommand
 	CreateSubstitution = commands.CreateSubstitutionCommand
-	DeleteSetter       = commands.DeleteSetterCommand
 	Fmt                = commands.FmtCommand
 	Grep               = commands.GrepCommand
-	Init               = commands.InitCommand
 	ListSetters        = commands.ListSettersCommand
 	Merge              = commands.MergeCommand
 	Merge3             = commands.Merge3Command
-	RunFn              = commands.RunCommand
+	RunFn              = commands.RunFnCommand
 	Set                = commands.SetCommand
 	Sink               = commands.SinkCommand
 	Source             = commands.SourceCommand
@@ -38,16 +67,50 @@ var (
 	ExitOnError  = &commands.ExitOnError
 )
 
-// AddCommands adds the cfg, fn and live commands to kustomize.
-func AddCommands(root *cobra.Command, name string) *cobra.Command {
+// NewConfigCommand returns a new *cobra.Command for the config command group.  This may
+// be embedded into other go binaries as a way of packaging the "config" command as part
+// of another binary.
+//
+// name is substituted into the built-in documentation for each sub-command as the command
+// invocation prefix -- e.g. if the result is embedded in kustomize, then name should be
+// "kustomize" and the built-in docs will display "kustomize config" in the examples.
+//
+func NewConfigCommand(name string) *cobra.Command {
+	// config command is alpha
+	root.Version = "v0.0.0"
+
+	// Only populate the command if Alpha commands are enabled.
+	if !commandutil.GetAlphaEnabled() {
+		// return the command because other subcommands are added to it
+		root.Short = "[Alpha] To enable set KUSTOMIZE_ENABLE_ALPHA_COMMANDS=true"
+		root.Long = "[Alpha] To enable set KUSTOMIZE_ENABLE_ALPHA_COMMANDS=true"
+		root.Example = ""
+		return root
+	}
+
+	root.PersistentFlags().BoolVar(&commands.StackOnError, "stack-trace", false,
+		"print a stack-trace on failure")
+
+	name = strings.TrimSpace(name + " config")
 	commands.ExitOnError = true
+	root.AddCommand(commands.AnnotateCommand(name))
+	root.AddCommand(commands.GrepCommand(name))
+	root.AddCommand(commands.TreeCommand(name))
+	root.AddCommand(commands.CatCommand(name))
+	root.AddCommand(commands.FmtCommand(name))
+	root.AddCommand(commands.MergeCommand(name))
+	root.AddCommand(commands.Merge3Command(name))
+	root.AddCommand(commands.CountCommand(name))
+	root.AddCommand(commands.RunFnCommand(name))
+	root.AddCommand(commands.XArgsCommand())
+	root.AddCommand(commands.WrapCommand())
 
-	root.PersistentFlags().BoolVar(StackOnError, "stack-trace", false,
-		"print a stack-trace on error")
-
-	root.AddCommand(GetCfg(name))
-	root.AddCommand(GetFn(name))
-	root.AddCommand(GetLive(name))
+	root.AddCommand(commands.SetCommand(name))
+	root.AddCommand(commands.ListSettersCommand(name))
+	root.AddCommand(commands.CreateSetterCommand(name))
+	root.AddCommand(commands.CreateSubstitutionCommand(name))
+	root.AddCommand(commands.SinkCommand(name))
+	root.AddCommand(commands.SourceCommand(name))
 
 	root.AddCommand(&cobra.Command{
 		Use:   "docs-merge",

cmd/config/configcobra/example_test.go

@@ -11,14 +11,15 @@ import (
 	"sigs.k8s.io/kustomize/kyaml/commandutil"
 )
 
-// ExampleAddCommands demonstrates how to embed the config command as a command inside
+// ExampleNewConfigCommand demonstrates how to embed the config command as a command inside
 // another group.
-func ExampleAddCommands() {
+func ExampleNewConfigCommand() {
 	// enable the config commands
 	os.Setenv(commandutil.EnableAlphaCommmandsEnvName, "true")
-	_ = configcobra.AddCommands(&cobra.Command{
+	var root = &cobra.Command{
 		Use:   "my-cmd",
 		Short: "My command.",
 		Long:  `My command.`,
-	}, "my-cmd")
+	}
+	root.AddCommand(configcobra.NewConfigCommand("my-cmd"))
 }

cmd/config/configcobra/fn.go

@@ -1,24 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package configcobra
-
-import (
-	"github.com/spf13/cobra"
-	"sigs.k8s.io/kustomize/cmd/config/internal/commands"
-)
-
-func GetFn(name string) *cobra.Command {
-	cmd := &cobra.Command{
-		Use:   "fn",
-		Short: "Commands for running functions against configuration.",
-	}
-
-	cmd.AddCommand(commands.RunCommand(name))
-	cmd.AddCommand(commands.SinkCommand(name))
-	cmd.AddCommand(commands.SourceCommand(name))
-	cmd.AddCommand(commands.WrapCommand())
-	cmd.AddCommand(commands.XArgsCommand())
-
-	return cmd
-}

cmd/config/configcobra/live.go

@@ -1,89 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package configcobra
-
-import (
-	"flag"
-
-	"github.com/spf13/cobra"
-	"k8s.io/apimachinery/pkg/api/meta"
-	"k8s.io/cli-runtime/pkg/genericclioptions"
-	"k8s.io/client-go/discovery"
-	"k8s.io/client-go/rest"
-	"k8s.io/client-go/tools/clientcmd"
-	"k8s.io/kubectl/pkg/cmd/util"
-	"sigs.k8s.io/cli-utils/cmd/apply"
-	"sigs.k8s.io/cli-utils/cmd/destroy"
-	"sigs.k8s.io/cli-utils/cmd/diff"
-	"sigs.k8s.io/cli-utils/cmd/initcmd"
-	"sigs.k8s.io/cli-utils/cmd/preview"
-	"sigs.k8s.io/cli-utils/pkg/util/factory"
-)
-
-func GetLive(name string) *cobra.Command {
-	cmd := &cobra.Command{
-		Use:   "live",
-		Short: "Commands for reading and writing resources to a cluster.",
-	}
-	ioStreams := genericclioptions.IOStreams{
-		In:     cmd.InOrStdin(),
-		Out:    cmd.OutOrStdout(),
-		ErrOut: cmd.ErrOrStderr(),
-	}
-
-	flags := cmd.PersistentFlags()
-	kubeConfigFlags := genericclioptions.NewConfigFlags(true).WithDeprecatedPasswordFlag()
-	kubeConfigFlags.AddFlags(flags)
-	userAgentKubeConfigFlags := &UserAgentKubeConfigFlags{
-		Delegate:  kubeConfigFlags,
-		UserAgent: "kustomize",
-	}
-	matchVersionKubeConfigFlags := util.NewMatchVersionFlags(
-		&factory.CachingRESTClientGetter{
-			Delegate: userAgentKubeConfigFlags,
-		},
-	)
-	matchVersionKubeConfigFlags.AddFlags(cmd.PersistentFlags())
-	cmd.PersistentFlags().AddGoFlagSet(flag.CommandLine)
-	f := util.NewFactory(matchVersionKubeConfigFlags)
-
-	applyCmd := apply.ApplyCommand(f, ioStreams)
-	_ = applyCmd.Flags().MarkHidden("no-prune")
-
-	cmd.AddCommand(
-		applyCmd,
-		initcmd.NewCmdInit(ioStreams),
-		preview.NewCmdPreview(f, ioStreams),
-		diff.NewCmdDiff(f, ioStreams),
-		destroy.NewCmdDestroy(f, ioStreams))
-	return cmd
-}
-
-type UserAgentKubeConfigFlags struct {
-	Delegate  genericclioptions.RESTClientGetter
-	UserAgent string
-}
-
-func (u *UserAgentKubeConfigFlags) ToRESTConfig() (*rest.Config, error) {
-	clientConfig, err := u.Delegate.ToRESTConfig()
-	if err != nil {
-		return nil, err
-	}
-	if u.UserAgent != "" {
-		clientConfig.UserAgent = u.UserAgent
-	}
-	return clientConfig, nil
-}
-
-func (u *UserAgentKubeConfigFlags) ToDiscoveryClient() (discovery.CachedDiscoveryInterface, error) {
-	return u.Delegate.ToDiscoveryClient()
-}
-
-func (u *UserAgentKubeConfigFlags) ToRESTMapper() (meta.RESTMapper, error) {
-	return u.Delegate.ToRESTMapper()
-}
-
-func (u *UserAgentKubeConfigFlags) ToRawKubeConfigLoader() clientcmd.ClientConfig {
-	return u.Delegate.ToRawKubeConfigLoader()
-}

cmd/config/doc.go

@@ -1,7 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-//go:generate $GOBIN/mdtogo docs/api-conventions internal/generateddocs/api --full=true --license=none
-//go:generate $GOBIN/mdtogo docs/tutorials internal/generateddocs/tutorials --full=true --license=none
-//go:generate $GOBIN/mdtogo docs/commands internal/generateddocs/commands --license=none
-package config

cmd/config/docs/api-conventions/functions-impl.md

@@ -116,14 +116,14 @@ metadata:
   name: my-instance
   annotations:
     config.kubernetes.io/local-config: "true"
-    config.kubernetes.io/function: |
+    config.k8s.io/function: |
       container:
         image: gcr.io/example-functions/nginx-template:v1.0.0
 spec:
   replicas: 5
 ```
 
-- `annotations[config.kubernetes.io/function].container.image`: the image to use for this API
+- `annotations[config.k8s.io/function].container.image`: the image to use for this API
 - `annotations[config.kubernetes.io/local-config]`: mark this as not a Resource that should
   be applied
 

cmd/config/docs/api-conventions/functions-spec.md

@@ -7,7 +7,7 @@ containers that can be chained together as part of a configuration management pi
 The end result of such a pipeline are fully rendered configurations that can then be
 applied to a control plane (e.g. Using ‘kubectl apply’ for Kubernetes control plane).
 As such, although this document references Kubernetes Resource Model and API conventions,
-it is completely decoupled from Kubernetes API machinery and does not depend on any
+it is completely decoupled from Kuberentes API machinery and does not depend on any
 in-cluster components.
 
 This document references terms described in [Kubernetes API Conventions][1].
@@ -33,7 +33,7 @@ _Configuration functions_ enable shift-left practices (client-side) through:
 Performing these on the client rather than the server enables:
 
 - Configuration to be reviewed prior to being sent to the API server
-- Configuration to be validated as part of the CI/CD pipeline
+- Configuration to be validated as part of the CI?CD pipeline
 - Configuration for Resources to validated holistically rather than individually
   per-Resource
   - e.g. ensure the `Service.selector` and `Deployment.spec.template` labels
@@ -114,7 +114,7 @@ functionConfig:
     name: staging
     metadata:
       annotations:
-        config.kubernetes.io/function: |
+        config.k8s.io/function: |
           container:
             image: gcr.io/example/foo:v1.0.0
   spec:

cmd/config/docs/commands/annotate.md

@@ -11,8 +11,8 @@
 
 ### Examples
 
-    kustomize cfg annotate my-dir/ --kv foo=bar
+    kustomize config annotate my-dir/ --kv foo=bar
 
-    kustomize cfg annotate my-dir/ --kv foo=bar --kv a=b
+    kustomize config annotate my-dir/ --kv foo=bar --kv a=b
 
-    kustomize cfg annotate my-dir/ --kv foo=bar --kind Deployment --name foo
+    kustomize config annotate my-dir/ --kv foo=bar --kind Deployment --name foo

cmd/config/docs/commands/cat.md

@@ -12,10 +12,10 @@
 ### Examples
 
     # print Resource config from a directory
-    kustomize cfg cat my-dir/
+    kustomize config cat my-dir/
 
     # wrap Resource config from a directory in an ResourceList
-    kustomize cfg cat my-dir/ --wrap-kind ResourceList --wrap-version config.kubernetes.io/v1alpha1 --function-config fn.yaml
+    kustomize config cat my-dir/ --wrap-kind ResourceList --wrap-version config.kubernetes.io/v1alpha1 --function-config fn.yaml
 
     # unwrap Resource config from a directory in an ResourceList
-    ... | kustomize cfg cat
+    ... | kustomize config cat

cmd/config/docs/commands/count.md

@@ -12,4 +12,4 @@
 ### Examples
 
     # print Resource counts from a directory
-    kustomize cfg count my-dir/
+    kustomize config count my-dir/

cmd/config/docs/commands/create-setter.md

@@ -38,7 +38,7 @@ Create a custom setter for a Resource field by inlining OpenAPI as comments.
 **Create a new setter:**
 
     # create a setter for ports
-    $ kustomize cfg set create DIR/ http-port 8080 --type "integer" --field "port"
+    $ kustomize config set create DIR/ http-port 8080 --type "integer" --field "port"
 
   Resources fields with a field name matching `--field` and field value matching `VALUE` will
   have a line comment added marking this field as settable.
@@ -63,7 +63,7 @@ Create a custom setter for a Resource field by inlining OpenAPI as comments.
 Users may not set the field value using the `set` command:
 
     # change the http-port value to 8081
-    $ kustomize cfg set DIR/ http-port 8081
+    $ kustomize config set DIR/ http-port 8081
 
 ### Using default values
 
@@ -75,7 +75,7 @@ The default values for a setter may be:
 
 A setter may be for a substring of a full field:
 
-    $ kustomize cfg set create DIR/ image-tag v1.0.01 --type "string" --field "image"
+    $ kustomize config set create DIR/ image-tag v1.0.01 --type "string" --field "image"
 
     image: gcr.io/example/app:v1.0.1 # # {"type":"string","x-kustomize":{"partialFieldSetters":[{"name":"image-tag","value":"v1.0.1"}]}}
 
@@ -84,10 +84,10 @@ A single field value may have multiple setters applied to it for different parts
 ### Examples
 
     # create a setter for port fields matching "8080"
-    kustomize cfg create-setter DIR/ port 8080 --type "integer" --field port \
+    kustomize config create-setter DIR/ port 8080 --type "integer" --field port \
          --description "default port used by the app"
 
     # create a setter for a substring of a field rather than the full field -- e.g. only the
     # image tag, not the full image
-    kustomize cfg create-setter DIR/ image-tag v1.0.1 --type "string" \
+    kustomize config create-setter DIR/ image-tag v1.0.1 --type "string" \
         --field image --description "current stable release"

cmd/config/docs/commands/delete-setter.md

@@ -1,65 +0,0 @@
-## delete-setter
-
-[Alpha] Delete a custom setter for a Resource field
-
-### Synopsis
-
-Delete a custom setter for a Resource field.
-
-  DIR
-
-    A directory containing Resource configuration.
-
-  NAME
-
-    The name of the setter to create.
-
-### Deleting a Custom Setter
-
-**Given the YAML:**
-
-    # resource.yaml
-    apiVersion: v1
-    kind: Service
-    metadata:
-      ...
-    spec:
-      ...
-      ports:
-        ...
-      - name: http
-        port: 8080  # {"type":"integer","x-kustomize":{"partialFieldSetters":[{"name":"http-port","value":"8080"}]}}
-        ...
-
-**Delete setter:**
-
-    # delete a setter for ports
-    $ kustomize cfg set create DIR/ http-port
-
-comment will be removed for this field is not settable any more.
-
-**Newly modified YAML:**
-
-    # resource.yaml
-    apiVersion: v1
-    kind: Service
-    metadata:
-      ...
-    spec:
-      ...
-      ports:
-        ...
-      - name: http
-        port: 8080
-        ...
-
-
-### Deleting a setter used in substitution
-
-If the setter is also used in substitution, it will ask you to delete the substitution first.
-
-
-### Examples
-
-    # delete a setter for port
-    kustomize cfg create-setter DIR/ port

cmd/config/docs/commands/fmt.md

@@ -32,13 +32,13 @@ field paths.
 ### Examples
 
 	# format file1.yaml and file2.yml
-	kustomize cfg fmt file1.yaml file2.yml
+	kustomize config fmt file1.yaml file2.yml
 
 	# format all *.yaml and *.yml recursively traversing directories
-	kustomize cfg fmt my-dir/
+	kustomize config fmt my-dir/
 
 	# format kubectl output
-	kubectl get -o yaml deployments | kustomize cfg fmt
+	kubectl get -o yaml deployments | kustomize config fmt
 
 	# format kustomize output
-	kustomize build | kustomize cfg fmt
+	kustomize build | kustomize config fmt

cmd/config/docs/commands/grep.md

@@ -19,13 +19,13 @@
 ### Examples
 
     # find Deployment Resources
-    kustomize cfg grep "kind=Deployment" my-dir/
+    kustomize config grep "kind=Deployment" my-dir/
 
     # find Resources named nginx
-    kustomize cfg grep "metadata.name=nginx" my-dir/
+    kustomize config grep "metadata.name=nginx" my-dir/
 
     # use tree to display matching Resources
-    kustomize cfg grep "metadata.name=nginx" my-dir/ | kustomize cfg tree
+    kustomize config grep "metadata.name=nginx" my-dir/ | kustomize config tree
 
     # look for Resources matching a specific container image
-    kustomize cfg grep "spec.template.spec.containers[name=nginx].image=nginx:1\.7\.9" my-dir/ | kustomize cfg tree
+    kustomize config grep "spec.template.spec.containers[name=nginx].image=nginx:1\.7\.9" my-dir/ | kustomize config tree