Merge branch 'master' of https://github.com/kubernetes-sigs/kustomize

api/builtins/PatchStrategicMergeTransformer.go

@@ -64,7 +64,7 @@ func (p *PatchStrategicMergeTransformerPlugin) Config(
 }
 
 func (p *PatchStrategicMergeTransformerPlugin) Transform(m resmap.ResMap) error {
-	patches, err := p.h.ResmapFactory().MergePatches(p.loadedPatches)
+	patches, err := p.h.ResmapFactory().Merge(p.loadedPatches)
 	if err != nil {
 		return err
 	}

api/go.mod

@@ -12,12 +12,13 @@ require (
 	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.v3 v3.0.0-20200121175148-a6ecf24a6d71
 	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.5.0
+	sigs.k8s.io/kustomize/kyaml v0.6.1
 	sigs.k8s.io/yaml v1.2.0
 )
 
-replace sigs.k8s.io/kustomize/kyaml v0.5.0 => ../kyaml
+replace sigs.k8s.io/kustomize/kyaml v0.6.1 => ../kyaml

api/ifc/ifc.go

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

api/internal/crawl/go.sum

@@ -338,6 +338,7 @@ github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DM
 github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48=
 github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
 github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
@@ -523,8 +524,8 @@ 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.5.0 h1:xufpSxgpugQxtd0aN1ZsWnr3Kj0fpAi7GN4dnEs4oPg=
-sigs.k8s.io/kustomize/kyaml v0.5.0/go.mod h1:bEzbO5pN9OvlEeCLvFHo8Pu7SA26Herc2m60UeWZBdI=
+sigs.k8s.io/kustomize/kyaml v0.6.1 h1:mwffj5vt3MPdbWV3fZnnwol8SO7sUoGdgejBlvseyak=
+sigs.k8s.io/kustomize/kyaml v0.6.1/go.mod h1:bEzbO5pN9OvlEeCLvFHo8Pu7SA26Herc2m60UeWZBdI=
 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/k8sdeps/merge/merginator.go

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

api/internal/k8sdeps/transformer/factory.go

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

api/internal/merge/merginator.go

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

api/internal/merge/merginator_test.go

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

api/internal/plugins/fnplugin/fnplugin.go

@@ -173,11 +173,11 @@ func (p *FnPlugin) invokePlugin(input []byte) ([]byte, error) {
 	// 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()
+		yml, err := functionConfig.String()
 		if err != nil {
 			return nil, err
 		}
-		input = []byte(yaml)
+		input = []byte(yml)
 	}
 
 	// Configure and Execute Fn. We don't need to convert resources to ResourceList here

api/internal/target/kusttarget.go

@@ -17,7 +17,6 @@ import (
 	"sigs.k8s.io/kustomize/api/internal/plugins/loader"
 	"sigs.k8s.io/kustomize/api/konfig"
 	"sigs.k8s.io/kustomize/api/resmap"
-	"sigs.k8s.io/kustomize/api/transform"
 	"sigs.k8s.io/kustomize/api/types"
 	"sigs.k8s.io/yaml"
 )
@@ -28,7 +27,6 @@ type KustTarget struct {
 	ldr           ifc.Loader
 	validator     ifc.Validator
 	rFactory      *resmap.Factory
-	tFactory      resmap.PatchFactory
 	pLdr          *loader.Loader
 }
 
@@ -37,13 +35,11 @@ func NewKustTarget(
 	ldr ifc.Loader,
 	validator ifc.Validator,
 	rFactory *resmap.Factory,
-	tFactory resmap.PatchFactory,
 	pLdr *loader.Loader) *KustTarget {
 	return &KustTarget{
 		ldr:       ldr,
 		validator: validator,
 		rFactory:  rFactory,
-		tFactory:  tFactory,
 		pLdr:      pLdr,
 	}
 }
@@ -258,8 +254,7 @@ func (kt *KustTarget) runTransformers(ra *accumulator.ResAccumulator) error {
 		return err
 	}
 	r = append(r, lts...)
-	t := transform.NewMultiTransformer(r)
-	return ra.Transform(t)
+	return ra.Transform(newMultiTransformer(r))
 }
 
 func (kt *KustTarget) configureExternalTransformers(transformers []string) ([]resmap.Transformer, error) {
@@ -294,7 +289,6 @@ func (kt *KustTarget) runValidators(ra *accumulator.ResAccumulator) error {
 }
 
 func (kt *KustTarget) removeValidatedByLabel(rm resmap.ResMap) {
-
 	resources := rm.Resources()
 	for _, r := range resources {
 		labels := r.GetLabels()
@@ -353,8 +347,7 @@ func (kt *KustTarget) accumulateComponents(
 func (kt *KustTarget) accumulateDirectory(
 	ra *accumulator.ResAccumulator, ldr ifc.Loader, isComponent bool) (*accumulator.ResAccumulator, error) {
 	defer ldr.Cleanup()
-	subKt := NewKustTarget(
-		ldr, kt.validator, kt.rFactory, kt.tFactory, kt.pLdr)
+	subKt := NewKustTarget(ldr, kt.validator, kt.rFactory, kt.pLdr)
 	err := subKt.Load()
 	if err != nil {
 		return nil, errors.Wrapf(

api/internal/target/maker_test.go

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

api/internal/target/multitransformer.go

@@ -1,7 +1,7 @@
 // Copyright 2019 The Kubernetes Authors.
 // SPDX-License-Identifier: Apache-2.0
 
-package transform
+package target
 
 import (
 	"fmt"
@@ -17,8 +17,8 @@ type multiTransformer struct {
 
 var _ resmap.Transformer = &multiTransformer{}
 
-// NewMultiTransformer constructs a multiTransformer.
-func NewMultiTransformer(t []resmap.Transformer) resmap.Transformer {
+// newMultiTransformer constructs a multiTransformer.
+func newMultiTransformer(t []resmap.Transformer) resmap.Transformer {
 	r := &multiTransformer{
 		transformers:         make([]resmap.Transformer, len(t)),
 		checkConflictEnabled: false}

api/internal/validate/fieldvalidator.go

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

api/internal/validate/fieldvalidator_test.go

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

api/internal/wrappy/factory.go

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

api/internal/wrappy/factory_test.go

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

api/internal/wrappy/wnode.go

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

api/internal/wrappy/wnode_test.go

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

api/k8sdeps/kunstruct/factory.go

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

api/k8sdeps/kunstruct/unstructadapter_test.go

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

api/k8sdeps/validator/kustvalidator.go

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

api/krusty/internal/provider/depprovider.go

@@ -0,0 +1,183 @@
+// Copyright 2020 The Kubernetes Authors.
+// SPDX-License-Identifier: Apache-2.0
+
+package provider
+
+import (
+	"sigs.k8s.io/kustomize/api/ifc"
+	"sigs.k8s.io/kustomize/api/internal/k8sdeps/merge"
+	kmerge "sigs.k8s.io/kustomize/api/internal/merge"
+	"sigs.k8s.io/kustomize/api/internal/validate"
+	"sigs.k8s.io/kustomize/api/internal/wrappy"
+	"sigs.k8s.io/kustomize/api/k8sdeps/kunstruct"
+	"sigs.k8s.io/kustomize/api/k8sdeps/validator"
+	"sigs.k8s.io/kustomize/api/resmap"
+	"sigs.k8s.io/kustomize/api/resource"
+)
+
+// DepProvider is a dependency provider.
+//
+// The instances it returns are either
+//   - old implementations backed by k8sdeps code,
+//   - new implementations backed by kyaml code.
+//
+// History:
+//
+// kubectl depends on k8s.io code, and at the time of writing, so
+// does kustomize.  Code that imports k8s.io/api* cannot be imported
+// back into k8s.io/*, yet kustomize appears inside k8s.io/kubectl.
+//
+// To allow kustomize to appear inside kubectl, yet still be developed
+// outside kubectl, the kustomize code was divided into the following
+// packages
+//
+//    api/
+//      k8sdeps/  (and internal/ks8deps/)
+//      ifc/
+//      krusty/
+//      everythingElse/
+//
+// with the following rules:
+//
+//   - Only k8sdeps/ may import k8s.io/api*.
+//
+//   - Only krusty/ (and its internals) may import k8sdeps/.
+//     I.e., ifc/ and everythingElse/ must not
+//     import k8sdeps/ or k8s.io/api*.
+//
+//   - Code in krusty/ may use code in k8sdeps/ to create
+//     objects then inject said objects into
+//     everythingElse/ behind dependency neutral interfaces.
+//
+// The idea was to periodically copy, not import, the large k8sdeps/
+// tree (plus a snippet from krusty/kustomizer.go) into the kubectl
+// codebase via a large PR, and have kubectl depend on the rest via
+// normal importing.
+//
+// Over 2019, however, kubectl underwent large changes including
+// a switch to Go modules, and a concerted attempt to extract kubectl
+// from the k8s repo. This made large kustomize integration PRs too
+// intrusive to review.
+//
+// In 2020, kubectl is based on Go modules, and almost entirely
+// extracted from the k8s.io repositories, and further the kyaml
+// library has a appeared as a viable replacement to k8s.io/api*
+// KRM manipulation code.
+//
+// The new plan is to eliminate k8sdeps/ entirely, along with its
+// k8s.io/api* dependence, allowing kustomize code to be imported
+// into kubectl via normal Go module imports.  Then the kustomize API
+// code can then move into the github.com/kubernetes-sigs/cli-utils
+// repo.  The kustomize CLI in github.com/kubernetes-sigs/kustomize
+// and the kubectl CLI can then both depend on the kustomize API.
+//
+// So, all code that depends on k8sdeps must go behind interfaces,
+// and kustomize must be factored to choose the implementation.
+//
+// That problem has been reduced to three interfaces, each having
+// two implementations. (1) is k8sdeps-based, (2) is kyaml-based.
+//
+//   - ifc.Kunstructured
+//
+//       1) api/k8sdeps/kunstruct.UnstructAdapter
+//
+//            This adapts structs in
+//            k8s.io/apimachinery/pkg/apis/meta/v1/unstructured
+//            to ifc.Kunstructured.
+//
+//       2) api/wrappy.WNode
+//
+//            This adapts sigs.k8s.io/kustomize/kyaml/yaml.RNode
+//            to ifc.Unstructured.
+//
+//            At time of writing, implementation started.
+//            Further reducing the size of ifc.Kunstructed
+//            would really reduce the work
+//            (e.g. drop Vars, drop ReplacementTranformer).
+//
+//   - resmap.Merginator
+//
+//       1) api/internal/k8sdeps/merge.Merginator
+//
+//            Uses k8s.io/apimachinery/pkg/util/strategicpatch,
+//            apimachinery/pkg/util/mergepatch, etc. to merge
+//            resource.Resource instances.
+//
+//       2) api/internal/merge.Merginator
+//
+//            At time of writing, this is unimplemented.
+//
+//   - ifc.Validator
+//
+//       1) api/k8sdeps/validator.KustValidator
+//
+//            Uses k8s.io/apimachinery/pkg/api/validation and
+//            friends to validate strings.
+//
+//       2) api/internal/validate.FieldValidator
+//
+//            At time of writing, this is a do-nothing
+//            validator as it's not critical to kustomize function.
+//
+// Proposed plan:
+//  [ ] Ship kustomize with the ability to switch from 1 to 2 via
+//      an --enable_kyaml flag.
+//  [ ] Make --enable_kyaml true by default.
+//  [ ] When 2 is not noticeably more buggy than 1, delete 1.
+//      I.e. delete k8sdeps/, transitively deleting all k8s.io/api* deps.
+//      This DepProvider should be left in place to retain these
+//      comments, but it will have only one choice.
+//  [ ] The way is now clear to reintegrate into kubectl.
+//      This should be done ASAP; the last step is cleanup.
+//  [ ] With only one impl of Kunstructure remaining, that interface
+//      and WNode can be deleted, along with this DepProvider.
+//      The other two interfaces could be dropped too.
+//
+// When the above is done, kustomize will use yaml.RNode and/or
+// KRM Config Functions directly and exclusively.
+// If you're reading this, plan not done.
+//
+type DepProvider struct {
+	resourceFactory *resource.Factory
+	merginator      resmap.Merginator
+	fieldValidator  ifc.Validator
+}
+
+func makeK8sdepBasedInstances() *DepProvider {
+	kf := kunstruct.NewKunstructuredFactoryImpl()
+	rf := resource.NewFactory(kf)
+	return &DepProvider{
+		resourceFactory: rf,
+		merginator:      merge.NewMerginator(rf),
+		fieldValidator:  validator.NewKustValidator(),
+	}
+}
+
+func makeKyamlBasedInstances() *DepProvider {
+	kf := &wrappy.WNodeFactory{}
+	rf := resource.NewFactory(kf)
+	return &DepProvider{
+		resourceFactory: rf,
+		merginator:      kmerge.NewMerginator(rf),
+		fieldValidator:  validate.NewFieldValidator(),
+	}
+}
+
+func NewDepProvider(useKyaml bool) *DepProvider {
+	if useKyaml {
+		return makeKyamlBasedInstances()
+	}
+	return makeK8sdepBasedInstances()
+}
+
+func (dp *DepProvider) GetResourceFactory() *resource.Factory {
+	return dp.resourceFactory
+}
+
+func (dp *DepProvider) GetMerginator() resmap.Merginator {
+	return dp.merginator
+}
+
+func (dp *DepProvider) GetFieldValidator() ifc.Validator {
+	return dp.fieldValidator
+}

api/krusty/kustomizer.go

@@ -8,16 +8,13 @@ import (
 
 	"sigs.k8s.io/kustomize/api/builtins"
 	"sigs.k8s.io/kustomize/api/filesys"
-	"sigs.k8s.io/kustomize/api/internal/k8sdeps/transformer"
 	pLdr "sigs.k8s.io/kustomize/api/internal/plugins/loader"
 	"sigs.k8s.io/kustomize/api/internal/target"
-	"sigs.k8s.io/kustomize/api/k8sdeps/kunstruct"
-	"sigs.k8s.io/kustomize/api/k8sdeps/validator"
 	"sigs.k8s.io/kustomize/api/konfig"
+	"sigs.k8s.io/kustomize/api/krusty/internal/provider"
 	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"
 )
 
@@ -28,13 +25,18 @@ import (
 // number of overlays and bases), then make a Kustomizer
 // injected with the given fileystem, then call Run.
 type Kustomizer struct {
-	fSys    filesys.FileSystem
-	options *Options
+	fSys        filesys.FileSystem
+	options     *Options
+	depProvider *provider.DepProvider
 }
 
 // MakeKustomizer returns an instance of Kustomizer.
 func MakeKustomizer(fSys filesys.FileSystem, o *Options) *Kustomizer {
-	return &Kustomizer{fSys: fSys, options: o}
+	return &Kustomizer{
+		fSys:        fSys,
+		options:     o,
+		depProvider: provider.NewDepProvider(o.UseKyaml),
+	}
 }
 
 // Run performs a kustomization.
@@ -49,11 +51,9 @@ func MakeKustomizer(fSys filesys.FileSystem, o *Options) *Kustomizer {
 // on any number of internal paths (e.g. the filesystem may contain
 // multiple overlays, and Run can be called on each of them).
 func (b *Kustomizer) Run(path string) (resmap.ResMap, error) {
-	pf := transformer.NewFactoryImpl()
-	rf := resmap.NewFactory(
-		resource.NewFactory(
-			kunstruct.NewKunstructuredFactoryImpl()),
-		pf)
+	resmapFactory := resmap.NewFactory(
+		b.depProvider.GetResourceFactory(),
+		b.depProvider.GetMerginator())
 	lr := fLdr.RestrictionNone
 	if b.options.LoadRestrictions == types.LoadRestrictionsRootOnly {
 		lr = fLdr.RestrictionRootOnly
@@ -65,10 +65,9 @@ func (b *Kustomizer) Run(path string) (resmap.ResMap, error) {
 	defer ldr.Cleanup()
 	kt := target.NewKustTarget(
 		ldr,
-		validator.NewKustValidator(),
-		rf,
-		pf,
-		pLdr.NewLoader(b.options.PluginConfig, rf),
+		b.depProvider.GetFieldValidator(),
+		resmapFactory,
+		pLdr.NewLoader(b.options.PluginConfig, resmapFactory),
 	)
 	err = kt.Load()
 	if err != nil {
@@ -84,7 +83,9 @@ func (b *Kustomizer) Run(path string) (resmap.ResMap, error) {
 	}
 	if b.options.AddManagedbyLabel {
 		t := builtins.LabelTransformerPlugin{
-			Labels: map[string]string{konfig.ManagedbyLabelKey: fmt.Sprintf("kustomize-%s", provenance.GetProvenance().Version)},
+			Labels: map[string]string{
+				konfig.ManagedbyLabelKey: fmt.Sprintf(
+					"kustomize-%s", provenance.GetProvenance().Version)},
 			FieldSpecs: []types.FieldSpec{{
 				Path:               "metadata/labels",
 				CreateIfNotPresent: true,

api/krusty/options.go

@@ -32,14 +32,20 @@ type Options struct {
 
 	// Options related to kustomize plugins.
 	PluginConfig *types.PluginConfig
+
+	// When true, use kyaml/ packages to manipulate KRM yaml.
+	// When false, use k8sdeps/ instead (uses k8s.io/api* packages).
+	UseKyaml bool
 }
 
 // MakeDefaultOptions returns a default instance of Options.
 func MakeDefaultOptions() *Options {
 	return &Options{
-		DoLegacyResourceSort: true,
+		DoLegacyResourceSort: false,
+		AddManagedbyLabel:    false,
 		LoadRestrictions:     types.LoadRestrictionsRootOnly,
 		DoPrune:              false,
 		PluginConfig:         konfig.DisabledPluginConfig(),
+		UseKyaml:             false,
 	}
 }

api/loader/fileloader.go

@@ -199,7 +199,9 @@ func (fl *fileLoader) New(path string) (ifc.Loader, error) {
 	}
 	root, errDir := demandDirectoryRoot(fl.fSys, fl.root.Join(path))
 	if errDir != nil {
-		return nil, fmt.Errorf("Error loading %s with git: %v, dir: %v, get: %v", path, errGit, errDir, errGet)
+		return nil, fmt.Errorf(
+			"error loading %s with git: %v, dir: %v, get: %v",
+			path, errGit, errDir, errGet)
 	}
 	if errDir := fl.errIfGitContainmentViolation(root); errDir != nil {
 		return nil, errDir

api/loader/loader.go

@@ -39,5 +39,7 @@ func NewLoader(
 		return newLoaderAtConfirmedDir(lr, root, fSys, nil, git.ClonerUsingGitExec, getRemoteTarget), nil
 	}
 
-	return nil, fmt.Errorf("Error creating new loader with git: %v, dir: %v, get: %v", errGit, errDir, errGet)
+	return nil, fmt.Errorf(
+		"error creating new loader with git: %v, dir: %v, get: %v",
+		errGit, errDir, errGet)
 }

api/resid/gvk.go

@@ -22,8 +22,15 @@ func FromKind(k string) Gvk {
 	}
 }
 
-// GvkFromString makes a Gvk with a string,
-// which is constructed by String() function
+// ParseGroupVersion parses a KRM metadata apiVersion field.
+func ParseGroupVersion(apiVersion string) (group, version string) {
+	if i := strings.Index(apiVersion, "/"); i > -1 {
+		return apiVersion[:i], apiVersion[i+1:]
+	}
+	return "", apiVersion
+}
+
+// GvkFromString makes a Gvk from the output of Gvk.String().
 func GvkFromString(s string) Gvk {
 	values := strings.Split(s, fieldSep)
 	g := values[0]

api/resid/gvk_test.go

@@ -113,6 +113,30 @@ func TestString(t *testing.T) {
 	}
 }
 
+func TestParseGroupVersion(t *testing.T) {
+	tests := []struct {
+		input string
+		g     string
+		v     string
+	}{
+		{input: "", g: "", v: ""},
+		{input: "v1", g: "", v: "v1"},
+		{input: "apps/v1", g: "apps", v: "v1"},
+		{input: "/v1", g: "", v: "v1"},
+		{input: "apps/", g: "apps", v: ""},
+		{input: "/apps/", g: "", v: "apps/"},
+	}
+	for _, tc := range tests {
+		g, v := ParseGroupVersion(tc.input)
+		if g != tc.g {
+			t.Errorf("%s: expected group '%s', got '%s'", tc.input, tc.g, g)
+		}
+		if v != tc.v {
+			t.Errorf("%s: expected version '%s', got '%s'", tc.input, tc.v, v)
+		}
+	}
+}
+
 func TestSelectByGVK(t *testing.T) {
 	type testCase struct {
 		description string

api/resmap/factory.go

@@ -11,15 +11,24 @@ import (
 	"sigs.k8s.io/kustomize/api/types"
 )
 
+// Merginator merges resources.
+type Merginator interface {
+	// Merge creates a new ResMap by merging incoming resources.
+	// Error if conflict found.
+	Merge([]*resource.Resource) (ResMap, error)
+}
+
 // Factory makes instances of ResMap.
 type Factory struct {
+	// Makes resources.
 	resF *resource.Factory
-	tf   PatchFactory
+	// Makes ResMaps via merging.
+	pm Merginator
 }
 
 // NewFactory returns a new resmap.Factory.
-func NewFactory(rf *resource.Factory, tf PatchFactory) *Factory {
-	return &Factory{resF: rf, tf: tf}
+func NewFactory(rf *resource.Factory, pm Merginator) *Factory {
+	return &Factory{resF: rf, pm: pm}
 }
 
 // RF returns a resource.Factory.
@@ -87,6 +96,7 @@ func (rmF *Factory) NewResMapFromConfigMapArgs(
 	return newResMapFromResourceSlice(resources)
 }
 
+// FromConfigMapArgs creates a new ResMap containing one ConfigMap.
 func (rmF *Factory) FromConfigMapArgs(
 	kvLdr ifc.KvLoader, args types.ConfigMapArgs) (ResMap, error) {
 	res, err := rmF.resF.MakeConfigMap(kvLdr, &args)
@@ -111,6 +121,7 @@ func (rmF *Factory) NewResMapFromSecretArgs(
 	return newResMapFromResourceSlice(resources)
 }
 
+// FromSecretArgs creates a new ResMap containing one secret.
 func (rmF *Factory) FromSecretArgs(
 	kvLdr ifc.KvLoader, args types.SecretArgs) (ResMap, error) {
 	res, err := rmF.resF.MakeSecret(kvLdr, &args)
@@ -120,12 +131,14 @@ func (rmF *Factory) FromSecretArgs(
 	return rmF.FromResource(res), nil
 }
 
-func (rmF *Factory) MergePatches(patches []*resource.Resource) (
-	ResMap, error) {
-	return rmF.tf.MergePatches(patches, rmF.resF)
+// Merge creates a new ResMap by merging incoming resources.
+// Error if conflict found.
+func (rmF *Factory) Merge(patches []*resource.Resource) (ResMap, error) {
+	return rmF.pm.Merge(patches)
 }
 
-func newResMapFromResourceSlice(resources []*resource.Resource) (ResMap, error) {
+func newResMapFromResourceSlice(
+	resources []*resource.Resource) (ResMap, error) {
 	result := New()
 	for _, res := range resources {
 		err := result.Append(res)

api/resmap/patchfactory.go

@@ -1,15 +0,0 @@
-/// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-// Package patch holds miscellaneous interfaces used by kustomize.
-package resmap
-
-import (
-	"sigs.k8s.io/kustomize/api/resource"
-)
-
-// PatchFactory makes transformers that require k8sdeps.
-type PatchFactory interface {
-	MergePatches(patches []*resource.Resource,
-		rf *resource.Factory) (ResMap, error)
-}

api/resmap/resmap.go

@@ -6,16 +6,10 @@
 package resmap
 
 import (
-	"bytes"
-	"fmt"
-	"regexp"
-
-	"github.com/pkg/errors"
 	"sigs.k8s.io/kustomize/api/ifc"
 	"sigs.k8s.io/kustomize/api/resid"
 	"sigs.k8s.io/kustomize/api/resource"
 	"sigs.k8s.io/kustomize/api/types"
-	"sigs.k8s.io/yaml"
 )
 
 // A Transformer modifies an instance of ResMap.
@@ -242,569 +236,3 @@ type ResMap interface {
 	// are selected by a Selector
 	Select(types.Selector) ([]*resource.Resource, error)
 }
-
-// resWrangler holds the content manipulated by kustomize.
-type resWrangler struct {
-	// Resource list maintained in load (append) order.
-	// This is important for transformers, which must
-	// be performed in a specific order, and for users
-	// who for whatever reasons wish the order they
-	// specify in kustomizations to be maintained and
-	// available as an option for final YAML rendering.
-	rList []*resource.Resource
-}
-
-func newOne() *resWrangler {
-	result := &resWrangler{}
-	result.Clear()
-	return result
-}
-
-// Clear implements ResMap.
-func (m *resWrangler) Clear() {
-	m.rList = nil
-}
-
-// Size implements ResMap.
-func (m *resWrangler) Size() int {
-	return len(m.rList)
-}
-
-func (m *resWrangler) indexOfResource(other *resource.Resource) int {
-	for i, r := range m.rList {
-		if r == other {
-			return i
-		}
-	}
-	return -1
-}
-
-// Resources implements ResMap.
-func (m *resWrangler) Resources() []*resource.Resource {
-	tmp := make([]*resource.Resource, len(m.rList))
-	copy(tmp, m.rList)
-	return tmp
-}
-
-// Append implements ResMap.
-func (m *resWrangler) Append(res *resource.Resource) error {
-	id := res.CurId()
-	if r := m.GetMatchingResourcesByCurrentId(id.Equals); len(r) > 0 {
-		return fmt.Errorf(
-			"may not add resource with an already registered id: %s", id)
-	}
-	m.rList = append(m.rList, res)
-	return nil
-}
-
-// Remove implements ResMap.
-func (m *resWrangler) Remove(adios resid.ResId) error {
-	tmp := newOne()
-	for _, r := range m.rList {
-		if r.CurId() != adios {
-			tmp.Append(r)
-		}
-	}
-	if tmp.Size() != m.Size()-1 {
-		return fmt.Errorf("id %s not found in removal", adios)
-	}
-	m.rList = tmp.rList
-	return nil
-}
-
-// Replace implements ResMap.
-func (m *resWrangler) Replace(res *resource.Resource) (int, error) {
-	id := res.CurId()
-	i, err := m.GetIndexOfCurrentId(id)
-	if err != nil {
-		return -1, errors.Wrap(err, "in Replace")
-	}
-	if i < 0 {
-		return -1, fmt.Errorf("cannot find resource with id %s to replace", id)
-	}
-	m.rList[i] = res
-	return i, nil
-}
-
-// AllIds implements ResMap.
-func (m *resWrangler) AllIds() (ids []resid.ResId) {
-	ids = make([]resid.ResId, m.Size())
-	for i, r := range m.rList {
-		ids[i] = r.CurId()
-	}
-	return
-}
-
-// Debug implements ResMap.
-func (m *resWrangler) Debug(title string) {
-	fmt.Println("--------------------------- " + title)
-	firstObj := true
-	for i, r := range m.rList {
-		if firstObj {
-			firstObj = false
-		} else {
-			fmt.Println("---")
-		}
-		fmt.Printf("# %d  %s\n", i, r.OrgId())
-		blob, err := yaml.Marshal(r.Map())
-		if err != nil {
-			panic(err)
-		}
-		fmt.Println(string(blob))
-	}
-}
-
-type IdMatcher func(resid.ResId) bool
-
-// GetByIndex implements ResMap.
-func (m *resWrangler) GetByIndex(i int) *resource.Resource {
-	if i < 0 || i >= m.Size() {
-		return nil
-	}
-	return m.rList[i]
-}
-
-// GetIndexOfCurrentId implements ResMap.
-func (m *resWrangler) GetIndexOfCurrentId(id resid.ResId) (int, error) {
-	count := 0
-	result := -1
-	for i, r := range m.rList {
-		if id.Equals(r.CurId()) {
-			count++
-			result = i
-		}
-	}
-	if count > 1 {
-		return -1, fmt.Errorf("id matched %d resources", count)
-	}
-	return result, nil
-}
-
-type IdFromResource func(r *resource.Resource) resid.ResId
-
-func GetOriginalId(r *resource.Resource) resid.ResId { return r.OrgId() }
-func GetCurrentId(r *resource.Resource) resid.ResId  { return r.CurId() }
-
-// GetMatchingResourcesByCurrentId implements ResMap.
-func (m *resWrangler) GetMatchingResourcesByCurrentId(
-	matches IdMatcher) []*resource.Resource {
-	return m.filteredById(matches, GetCurrentId)
-}
-
-// GetMatchingResourcesByOriginalId implements ResMap.
-func (m *resWrangler) GetMatchingResourcesByOriginalId(
-	matches IdMatcher) []*resource.Resource {
-	return m.filteredById(matches, GetOriginalId)
-}
-
-func (m *resWrangler) filteredById(
-	matches IdMatcher, idGetter IdFromResource) []*resource.Resource {
-	var result []*resource.Resource
-	for _, r := range m.rList {
-		if matches(idGetter(r)) {
-			result = append(result, r)
-		}
-	}
-	return result
-}
-
-// GetByCurrentId implements ResMap.
-func (m *resWrangler) GetByCurrentId(
-	id resid.ResId) (*resource.Resource, error) {
-	return demandOneMatch(m.GetMatchingResourcesByCurrentId, id, "Current")
-}
-
-// GetByOriginalId implements ResMap.
-func (m *resWrangler) GetByOriginalId(
-	id resid.ResId) (*resource.Resource, error) {
-	return demandOneMatch(m.GetMatchingResourcesByOriginalId, id, "Original")
-}
-
-// GetById implements ResMap.
-func (m *resWrangler) GetById(
-	id resid.ResId) (*resource.Resource, error) {
-	match, err1 := m.GetByOriginalId(id)
-	if err1 == nil {
-		return match, nil
-	}
-	match, err2 := m.GetByCurrentId(id)
-	if err2 == nil {
-		return match, nil
-	}
-	return nil, fmt.Errorf(
-		"%s; %s; failed to find unique target for patch %s",
-		err1.Error(), err2.Error(), id.GvknString())
-}
-
-type resFinder func(IdMatcher) []*resource.Resource
-
-func demandOneMatch(
-	f resFinder, id resid.ResId, s string) (*resource.Resource, error) {
-	r := f(id.Equals)
-	if len(r) == 1 {
-		return r[0], nil
-	}
-	if len(r) > 1 {
-		return nil, fmt.Errorf("multiple matches for %sId %s", s, id)
-	}
-	return nil, fmt.Errorf("no matches for %sId %s", s, id)
-}
-
-// GroupedByCurrentNamespace implements ResMap.GroupByCurrentNamespace
-func (m *resWrangler) GroupedByCurrentNamespace() map[string][]*resource.Resource {
-	items := m.groupedByCurrentNamespace()
-	delete(items, resid.TotallyNotANamespace)
-	return items
-}
-
-// NonNamespaceable implements ResMap.NonNamespaceable
-func (m *resWrangler) NonNamespaceable() []*resource.Resource {
-	return m.groupedByCurrentNamespace()[resid.TotallyNotANamespace]
-}
-
-func (m *resWrangler) groupedByCurrentNamespace() map[string][]*resource.Resource {
-	byNamespace := make(map[string][]*resource.Resource)
-	for _, res := range m.rList {
-		namespace := res.CurId().EffectiveNamespace()
-		if _, found := byNamespace[namespace]; !found {
-			byNamespace[namespace] = []*resource.Resource{}
-		}
-		byNamespace[namespace] = append(byNamespace[namespace], res)
-	}
-	return byNamespace
-}
-
-// GroupedByNamespace implements ResMap.GroupByOrginalNamespace
-func (m *resWrangler) GroupedByOriginalNamespace() map[string][]*resource.Resource {
-	items := m.groupedByOriginalNamespace()
-	delete(items, resid.TotallyNotANamespace)
-	return items
-}
-
-func (m *resWrangler) groupedByOriginalNamespace() map[string][]*resource.Resource {
-	byNamespace := make(map[string][]*resource.Resource)
-	for _, res := range m.rList {
-		namespace := res.OrgId().EffectiveNamespace()
-		if _, found := byNamespace[namespace]; !found {
-			byNamespace[namespace] = []*resource.Resource{}
-		}
-		byNamespace[namespace] = append(byNamespace[namespace], res)
-	}
-	return byNamespace
-}
-
-// AsYaml implements ResMap.
-func (m *resWrangler) AsYaml() ([]byte, error) {
-	firstObj := true
-	var b []byte
-	buf := bytes.NewBuffer(b)
-	for _, res := range m.Resources() {
-		out, err := yaml.Marshal(res.Map())
-		if err != nil {
-			return nil, err
-		}
-		if firstObj {
-			firstObj = false
-		} else {
-			if _, err = buf.WriteString("---\n"); err != nil {
-				return nil, err
-			}
-		}
-		if _, err = buf.Write(out); err != nil {
-			return nil, err
-		}
-	}
-	return buf.Bytes(), nil
-}
-
-// ErrorIfNotEqualSets implements ResMap.
-func (m *resWrangler) ErrorIfNotEqualSets(other ResMap) error {
-	m2, ok := other.(*resWrangler)
-	if !ok {
-		panic("bad cast")
-	}
-	if m.Size() != m2.Size() {
-		return fmt.Errorf(
-			"lists have different number of entries: %#v doesn't equal %#v",
-			m.rList, m2.rList)
-	}
-	seen := make(map[int]bool)
-	for _, r1 := range m.rList {
-		id := r1.CurId()
-		others := m2.GetMatchingResourcesByCurrentId(id.Equals)
-		if len(others) == 0 {
-			return fmt.Errorf(
-				"id in self missing from other; id: %s", id)
-		}
-		if len(others) > 1 {
-			return fmt.Errorf(
-				"id in self matches %d in other; id: %s", len(others), id)
-		}
-		r2 := others[0]
-		if !r1.KunstructEqual(r2) {
-			return fmt.Errorf(
-				"kunstruct not equal: \n -- %s,\n -- %s\n\n--\n%#v\n------\n%#v\n",
-				r1, r2, r1, r2)
-		}
-		seen[m2.indexOfResource(r2)] = true
-	}
-	if len(seen) != m.Size() {
-		return fmt.Errorf("counting problem %d != %d", len(seen), m.Size())
-	}
-	return nil
-}
-
-// ErrorIfNotEqualList implements ResMap.
-func (m *resWrangler) ErrorIfNotEqualLists(other ResMap) error {
-	m2, ok := other.(*resWrangler)
-	if !ok {
-		panic("bad cast")
-	}
-	if m.Size() != m2.Size() {
-		return fmt.Errorf(
-			"lists have different number of entries: %#v doesn't equal %#v",
-			m.rList, m2.rList)
-	}
-	for i, r1 := range m.rList {
-		r2 := m2.rList[i]
-		if !r1.Equals(r2) {
-			return fmt.Errorf(
-				"Item i=%d differs:\n  n1 = %s\n  n2 = %s\n  o1 = %s\n  o2 = %s\n",
-				i, r1.OrgId(), r2.OrgId(), r1, r2)
-		}
-	}
-	return nil
-}
-
-type resCopier func(r *resource.Resource) *resource.Resource
-
-// ShallowCopy implements ResMap.
-func (m *resWrangler) ShallowCopy() ResMap {
-	return m.makeCopy(
-		func(r *resource.Resource) *resource.Resource {
-			return r
-		})
-}
-
-// DeepCopy implements ResMap.
-func (m *resWrangler) DeepCopy() ResMap {
-	return m.makeCopy(
-		func(r *resource.Resource) *resource.Resource {
-			return r.DeepCopy()
-		})
-}
-
-// makeCopy copies the ResMap.
-func (m *resWrangler) makeCopy(copier resCopier) ResMap {
-	result := &resWrangler{}
-	result.rList = make([]*resource.Resource, m.Size())
-	for i, r := range m.rList {
-		result.rList[i] = copier(r)
-	}
-	return result
-}
-
-// SubsetThatCouldBeReferencedByResource implements ResMap.
-func (m *resWrangler) SubsetThatCouldBeReferencedByResource(
-	inputRes *resource.Resource) ResMap {
-	result := newOne()
-	inputId := inputRes.CurId()
-	isInputIdNamespaceable := inputId.IsNamespaceableKind()
-	rctxm := inputRes.PrefixesSuffixesEquals
-	subjectNamespaces := getNamespacesForRoleBinding(inputRes)
-	for _, r := range m.Resources() {
-		// Need to match more accuratly both at the time of selection and transformation.
-		// OutmostPrefixSuffixEquals is not accurate enough since it is only using
-		// the outer most suffix and the last prefix. Use PrefixedSuffixesEquals instead.
-		resId := r.CurId()
-		if (!isInputIdNamespaceable || !resId.IsNamespaceableKind() || resId.IsNsEquals(inputId) ||
-			isRoleBindingNamespace(&subjectNamespaces, r.GetNamespace())) && r.InSameKustomizeCtx(rctxm) {
-			result.append(r)
-		}
-	}
-	return result
-}
-
-// isRoleBindingNamespace returns true is the namespace `ns` is in role binding
-// namespaces `m`
-func isRoleBindingNamespace(m *map[string]bool, ns string) bool {
-	return (*m)[ns]
-}
-
-// getNamespacesForRoleBinding returns referenced ServiceAccount namespaces if the inputRes is
-// a RoleBinding
-func getNamespacesForRoleBinding(inputRes *resource.Resource) map[string]bool {
-	res := make(map[string]bool)
-	if inputRes.GetKind() != "RoleBinding" {
-		return res
-	}
-	subjects, err := inputRes.GetSlice("subjects")
-	if err != nil || subjects == nil {
-		return res
-	}
-
-	for _, s := range subjects {
-		subject := s.(map[string]interface{})
-		if subject["namespace"] == nil || subject["kind"] == nil ||
-			subject["kind"].(string) != "ServiceAccount" {
-			continue
-		}
-		res[subject["namespace"].(string)] = true
-	}
-
-	return res
-}
-
-func (m *resWrangler) append(res *resource.Resource) {
-	m.rList = append(m.rList, res)
-}
-
-// AppendAll implements ResMap.
-func (m *resWrangler) AppendAll(other ResMap) error {
-	if other == nil {
-		return nil
-	}
-	for _, res := range other.Resources() {
-		if err := m.Append(res); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-// AbsorbAll implements ResMap.
-func (m *resWrangler) AbsorbAll(other ResMap) error {
-	if other == nil {
-		return nil
-	}
-	for _, r := range other.Resources() {
-		err := m.appendReplaceOrMerge(r)
-		if err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func (m *resWrangler) appendReplaceOrMerge(
-	res *resource.Resource) error {
-	id := res.CurId()
-	matches := m.GetMatchingResourcesByOriginalId(id.Equals)
-	if len(matches) == 0 {
-		matches = m.GetMatchingResourcesByCurrentId(id.Equals)
-	}
-	switch len(matches) {
-	case 0:
-		switch res.Behavior() {
-		case types.BehaviorMerge, types.BehaviorReplace:
-			return fmt.Errorf(
-				"id %#v does not exist; cannot merge or replace", id)
-		default:
-			// presumably types.BehaviorCreate
-			err := m.Append(res)
-			if err != nil {
-				return err
-			}
-		}
-	case 1:
-		old := matches[0]
-		if old == nil {
-			return fmt.Errorf("id lookup failure")
-		}
-		index := m.indexOfResource(old)
-		if index < 0 {
-			return fmt.Errorf("indexing problem")
-		}
-		switch res.Behavior() {
-		case types.BehaviorReplace:
-			res.Replace(old)
-		case types.BehaviorMerge:
-			res.Merge(old)
-		default:
-			return fmt.Errorf(
-				"id %#v exists; behavior must be merge or replace", id)
-		}
-		i, err := m.Replace(res)
-		if err != nil {
-			return err
-		}
-		if i != index {
-			return fmt.Errorf("unexpected index in replacement")
-		}
-	default:
-		return fmt.Errorf(
-			"found multiple objects %v that could accept merge of %v",
-			matches, id)
-	}
-	return nil
-}
-
-func anchorRegex(pattern string) string {
-	if pattern == "" {
-		return pattern
-	}
-	return "^" + pattern + "$"
-}
-
-// Select returns a list of resources that
-// are selected by a Selector
-func (m *resWrangler) Select(s types.Selector) ([]*resource.Resource, error) {
-	ns := regexp.MustCompile(anchorRegex(s.Namespace))
-	nm := regexp.MustCompile(anchorRegex(s.Name))
-	var result []*resource.Resource
-	for _, r := range m.Resources() {
-		curId := r.CurId()
-		orgId := r.OrgId()
-
-		// matches the namespace when namespace is not empty in the selector
-		// It first tries to match with the original namespace
-		// then matches with the current namespace
-		if r.GetNamespace() != "" {
-			matched := ns.MatchString(orgId.EffectiveNamespace())
-			if !matched {
-				matched = ns.MatchString(curId.EffectiveNamespace())
-				if !matched {
-					continue
-				}
-			}
-		}
-
-		// matches the name when name is not empty in the selector
-		// It first tries to match with the original name
-		// then matches with the current name
-		if r.GetName() != "" {
-			matched := nm.MatchString(orgId.Name)
-			if !matched {
-				matched = nm.MatchString(curId.Name)
-				if !matched {
-					continue
-				}
-			}
-		}
-
-		// matches the GVK
-		if !r.GetGvk().IsSelected(&s.Gvk) {
-			continue
-		}
-
-		// matches the label selector
-		matched, err := r.MatchesLabelSelector(s.LabelSelector)
-		if err != nil {
-			return nil, err
-		}
-		if !matched {
-			continue
-		}
-
-		// matches the annotation selector
-		matched, err = r.MatchesAnnotationSelector(s.AnnotationSelector)
-		if err != nil {
-			return nil, err
-		}
-		if !matched {
-			continue
-		}
-		result = append(result, r)
-	}
-	return result, nil
-}

api/resmap/resmap_test.go

@@ -3,899 +3,4 @@
 
 package resmap_test
 
-import (
-	"fmt"
-	"reflect"
-	"strings"
-	"testing"
-
-	"sigs.k8s.io/kustomize/api/k8sdeps/kunstruct"
-	"sigs.k8s.io/kustomize/api/resid"
-	. "sigs.k8s.io/kustomize/api/resmap"
-	"sigs.k8s.io/kustomize/api/resource"
-	resmaptest_test "sigs.k8s.io/kustomize/api/testutils/resmaptest"
-	"sigs.k8s.io/kustomize/api/types"
-)
-
-var rf = resource.NewFactory(
-	kunstruct.NewKunstructuredFactoryImpl())
-var rmF = NewFactory(rf, nil)
-
-func doAppend(t *testing.T, w ResMap, r *resource.Resource) {
-	err := w.Append(r)
-	if err != nil {
-		t.Fatalf("append error: %v", err)
-	}
-}
-func doRemove(t *testing.T, w ResMap, id resid.ResId) {
-	err := w.Remove(id)
-	if err != nil {
-		t.Fatalf("remove error: %v", err)
-	}
-}
-
-// Make a resource with a predictable name.
-func makeCm(i int) *resource.Resource {
-	return rf.FromMap(
-		map[string]interface{}{
-			"apiVersion": "v1",
-			"kind":       "ConfigMap",
-			"metadata": map[string]interface{}{
-				"name": fmt.Sprintf("cm%03d", i),
-			},
-		})
-}
-
-// Maintain the class invariant that no two
-// resources can have the same CurId().
-func TestAppendRejectsDuplicateResId(t *testing.T) {
-	w := New()
-	if err := w.Append(makeCm(1)); err != nil {
-		t.Fatalf("append error: %v", err)
-	}
-	err := w.Append(makeCm(1))
-	if err == nil {
-		t.Fatalf("expected append error")
-	}
-	if !strings.Contains(
-		err.Error(),
-		"may not add resource with an already registered id") {
-		t.Fatalf("unexpected error: %v", err)
-	}
-}
-
-func TestAppendRemove(t *testing.T) {
-	w1 := New()
-	doAppend(t, w1, makeCm(1))
-	doAppend(t, w1, makeCm(2))
-	doAppend(t, w1, makeCm(3))
-	doAppend(t, w1, makeCm(4))
-	doAppend(t, w1, makeCm(5))
-	doAppend(t, w1, makeCm(6))
-	doAppend(t, w1, makeCm(7))
-	doRemove(t, w1, makeCm(1).OrgId())
-	doRemove(t, w1, makeCm(3).OrgId())
-	doRemove(t, w1, makeCm(5).OrgId())
-	doRemove(t, w1, makeCm(7).OrgId())
-
-	w2 := New()
-	doAppend(t, w2, makeCm(2))
-	doAppend(t, w2, makeCm(4))
-	doAppend(t, w2, makeCm(6))
-	if !reflect.DeepEqual(w1, w1) {
-		w1.Debug("w1")
-		w2.Debug("w2")
-		t.Fatalf("mismatch")
-	}
-
-	err := w2.Append(makeCm(6))
-	if err == nil {
-		t.Fatalf("expected error")
-	}
-}
-
-func TestRemove(t *testing.T) {
-	w := New()
-	r := makeCm(1)
-	err := w.Remove(r.OrgId())
-	if err == nil {
-		t.Fatalf("expected error")
-	}
-	err = w.Append(r)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-	err = w.Remove(r.OrgId())
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-	err = w.Remove(r.OrgId())
-	if err == nil {
-		t.Fatalf("expected error")
-	}
-}
-
-func TestReplace(t *testing.T) {
-	cm5 := makeCm(5)
-	cm700 := makeCm(700)
-	otherCm5 := makeCm(5)
-
-	w := New()
-	doAppend(t, w, makeCm(1))
-	doAppend(t, w, makeCm(2))
-	doAppend(t, w, makeCm(3))
-	doAppend(t, w, makeCm(4))
-	doAppend(t, w, cm5)
-	doAppend(t, w, makeCm(6))
-	doAppend(t, w, makeCm(7))
-
-	oldSize := w.Size()
-	_, err := w.Replace(otherCm5)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-	if w.Size() != oldSize {
-		t.Fatalf("unexpected size %d", w.Size())
-	}
-	if r, err := w.GetByCurrentId(cm5.OrgId()); err != nil || r != otherCm5 {
-		t.Fatalf("unexpected result r=%s, err=%v", r.CurId(), err)
-	}
-	if err := w.Append(cm5); err == nil {
-		t.Fatalf("expected id already there error")
-	}
-	if err := w.Remove(cm5.OrgId()); err != nil {
-		t.Fatalf("unexpected err: %v", err)
-	}
-	if err := w.Append(cm700); err != nil {
-		t.Fatalf("unexpected err: %v", err)
-	}
-	if err := w.Append(cm5); err != nil {
-		t.Fatalf("unexpected err: %v", err)
-	}
-}
-
-func TestEncodeAsYaml(t *testing.T) {
-	encoded := []byte(`apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: cm1
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: cm2
-`)
-	input := resmaptest_test.NewRmBuilder(t, rf).Add(
-		map[string]interface{}{
-			"apiVersion": "v1",
-			"kind":       "ConfigMap",
-			"metadata": map[string]interface{}{
-				"name": "cm1",
-			},
-		}).Add(
-		map[string]interface{}{
-			"apiVersion": "v1",
-			"kind":       "ConfigMap",
-			"metadata": map[string]interface{}{
-				"name": "cm2",
-			},
-		}).ResMap()
-	out, err := input.AsYaml()
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-	if !reflect.DeepEqual(out, encoded) {
-		t.Fatalf("%s doesn't match expected %s", out, encoded)
-	}
-}
-
-func TestGetMatchingResourcesByCurrentId(t *testing.T) {
-	r1 := rf.FromMap(
-		map[string]interface{}{
-			"apiVersion": "v1",
-			"kind":       "ConfigMap",
-			"metadata": map[string]interface{}{
-				"name": "alice",
-			},
-		})
-	r2 := rf.FromMap(
-		map[string]interface{}{
-			"apiVersion": "v1",
-			"kind":       "ConfigMap",
-			"metadata": map[string]interface{}{
-				"name": "bob",
-			},
-		})
-	r3 := rf.FromMap(
-		map[string]interface{}{
-			"apiVersion": "v1",
-			"kind":       "ConfigMap",
-			"metadata": map[string]interface{}{
-				"name":      "bob",
-				"namespace": "happy",
-			},
-		})
-	r4 := rf.FromMap(
-		map[string]interface{}{
-			"apiVersion": "v1",
-			"kind":       "ConfigMap",
-			"metadata": map[string]interface{}{
-				"name":      "charlie",
-				"namespace": "happy",
-			},
-		})
-	r5 := rf.FromMap(
-		map[string]interface{}{
-			"apiVersion": "v1",
-			"kind":       "Deployment",
-			"metadata": map[string]interface{}{
-				"name":      "charlie",
-				"namespace": "happy",
-			},
-		})
-
-	m := resmaptest_test.NewRmBuilder(t, rf).
-		AddR(r1).AddR(r2).AddR(r3).AddR(r4).AddR(r5).ResMap()
-
-	result := m.GetMatchingResourcesByCurrentId(
-		resid.NewResId(cmap, "alice").GvknEquals)
-	if len(result) != 1 {
-		t.Fatalf("Expected single map entry but got %v", result)
-	}
-	result = m.GetMatchingResourcesByCurrentId(
-		resid.NewResId(cmap, "bob").GvknEquals)
-	if len(result) != 2 {
-		t.Fatalf("Expected two, got %v", result)
-	}
-	result = m.GetMatchingResourcesByCurrentId(
-		resid.NewResIdWithNamespace(cmap, "bob", "system").GvknEquals)
-	if len(result) != 2 {
-		t.Fatalf("Expected two but got %v", result)
-	}
-	result = m.GetMatchingResourcesByCurrentId(
-		resid.NewResIdWithNamespace(cmap, "bob", "happy").Equals)
-	if len(result) != 1 {
-		t.Fatalf("Expected single map entry but got %v", result)
-	}
-	result = m.GetMatchingResourcesByCurrentId(
-		resid.NewResId(cmap, "charlie").GvknEquals)
-	if len(result) != 1 {
-		t.Fatalf("Expected single map entry but got %v", result)
-	}
-
-	// nolint:goconst
-	tests := []struct {
-		name    string
-		matcher IdMatcher
-		count   int
-	}{
-		{
-			"match everything",
-			func(resid.ResId) bool { return true },
-			5,
-		},
-		{
-			"match nothing",
-			func(resid.ResId) bool { return false },
-			0,
-		},
-		{
-			"name is alice",
-			func(x resid.ResId) bool { return x.Name == "alice" },
-			1,
-		},
-		{
-			"name is charlie",
-			func(x resid.ResId) bool { return x.Name == "charlie" },
-			2,
-		},
-		{
-			"name is bob",
-			func(x resid.ResId) bool { return x.Name == "bob" },
-			2,
-		},
-		{
-			"happy namespace",
-			func(x resid.ResId) bool {
-				return x.Namespace == "happy"
-			},
-			3,
-		},
-		{
-			"happy deployment",
-			func(x resid.ResId) bool {
-				return x.Namespace == "happy" &&
-					x.Gvk.Kind == "Deployment"
-			},
-			1,
-		},
-		{
-			"happy ConfigMap",
-			func(x resid.ResId) bool {
-				return x.Namespace == "happy" &&
-					x.Gvk.Kind == "ConfigMap"
-			},
-			2,
-		},
-	}
-	for _, tst := range tests {
-		result := m.GetMatchingResourcesByCurrentId(tst.matcher)
-		if len(result) != tst.count {
-			t.Fatalf("test '%s';  actual: %d, expected: %d",
-				tst.name, len(result), tst.count)
-		}
-	}
-}
-
-func TestSubsetThatCouldBeReferencedByResource(t *testing.T) {
-	r1 := rf.FromMap(
-		map[string]interface{}{
-			"apiVersion": "v1",
-			"kind":       "ConfigMap",
-			"metadata": map[string]interface{}{
-				"name": "alice",
-			},
-		})
-	r2 := rf.FromMap(
-		map[string]interface{}{
-			"apiVersion": "v1",
-			"kind":       "ConfigMap",
-			"metadata": map[string]interface{}{
-				"name": "bob",
-			},
-		})
-	r3 := rf.FromMap(
-		map[string]interface{}{
-			"apiVersion": "v1",
-			"kind":       "ConfigMap",
-			"metadata": map[string]interface{}{
-				"name":      "bob",
-				"namespace": "happy",
-			},
-		})
-	r4 := rf.FromMap(
-		map[string]interface{}{
-			"apiVersion": "v1",
-			"kind":       "Deployment",
-			"metadata": map[string]interface{}{
-				"name":      "charlie",
-				"namespace": "happy",
-			},
-		})
-	r5 := rf.FromMap(
-		map[string]interface{}{
-			"apiVersion": "v1",
-			"kind":       "ConfigMap",
-			"metadata": map[string]interface{}{
-				"name":      "charlie",
-				"namespace": "happy",
-			},
-		})
-	r5.AddNamePrefix("little-")
-	r6 := rf.FromMap(
-		map[string]interface{}{
-			"apiVersion": "v1",
-			"kind":       "Deployment",
-			"metadata": map[string]interface{}{
-				"name":      "domino",
-				"namespace": "happy",
-			},
-		})
-	r6.AddNamePrefix("little-")
-	r7 := rf.FromMap(
-		map[string]interface{}{
-			"apiVersion": "v1",
-			"kind":       "ClusterRoleBinding",
-			"metadata": map[string]interface{}{
-				"name": "meh",
-			},
-		})
-
-	tests := map[string]struct {
-		filter   *resource.Resource
-		expected ResMap
-	}{
-		"default namespace 1": {
-			filter: r2,
-			expected: resmaptest_test.NewRmBuilder(t, rf).
-				AddR(r1).AddR(r2).AddR(r7).ResMap(),
-		},
-		"default namespace 2": {
-			filter: r1,
-			expected: resmaptest_test.NewRmBuilder(t, rf).
-				AddR(r1).AddR(r2).AddR(r7).ResMap(),
-		},
-		"happy namespace no prefix": {
-			filter: r3,
-			expected: resmaptest_test.NewRmBuilder(t, rf).
-				AddR(r3).AddR(r4).AddR(r5).AddR(r6).AddR(r7).ResMap(),
-		},
-		"happy namespace with prefix": {
-			filter: r5,
-			expected: resmaptest_test.NewRmBuilder(t, rf).
-				AddR(r3).AddR(r4).AddR(r5).AddR(r6).AddR(r7).ResMap(),
-		},
-		"cluster level": {
-			filter: r7,
-			expected: resmaptest_test.NewRmBuilder(t, rf).
-				AddR(r1).AddR(r2).AddR(r3).AddR(r4).AddR(r5).AddR(r6).AddR(r7).ResMap(),
-		},
-	}
-	m := resmaptest_test.NewRmBuilder(t, rf).
-		AddR(r1).AddR(r2).AddR(r3).AddR(r4).AddR(r5).AddR(r6).AddR(r7).ResMap()
-	for name, test := range tests {
-		test := test
-		t.Run(name, func(t *testing.T) {
-			got := m.SubsetThatCouldBeReferencedByResource(test.filter)
-			err := test.expected.ErrorIfNotEqualLists(got)
-			if err != nil {
-				test.expected.Debug("expected")
-				got.Debug("actual")
-				t.Fatalf("Expected match")
-			}
-		})
-	}
-}
-
-func addPfxSfx(r *resource.Resource, prefixes []string, suffixes []string) {
-	for _, pfx := range prefixes {
-		r.AddNamePrefix(pfx)
-	}
-
-	for _, sfx := range suffixes {
-		r.AddNameSuffix(sfx)
-	}
-}
-
-func TestSubsetThatCouldBeReferencedByResourceMultiLevel(t *testing.T) {
-	// Simulates ConfigMap and Deployment defined at level 1
-	// No prefix nor suffix added at that level
-	cm1 := rf.FromMap(
-		map[string]interface{}{
-			"apiVersion": "v1",
-			"kind":       "ConfigMap",
-			"metadata": map[string]interface{}{
-				"name": "level1",
-			},
-		})
-	addPfxSfx(cm1, []string{""}, []string{""})
-	dep1 := rf.FromMap(
-		map[string]interface{}{
-			"apiVersion": "v1",
-			"kind":       "Deployment",
-			"metadata": map[string]interface{}{
-				"name": "level1",
-			},
-		})
-	addPfxSfx(dep1, []string{""}, []string{""})
-
-	// Simulates ConfigMap and Deployment defined at level 1
-	// and prefix added in level 2 of kustomization
-	cm2p := rf.FromMap(
-		map[string]interface{}{
-			"apiVersion": "v1",
-			"kind":       "ConfigMap",
-			"metadata": map[string]interface{}{
-				"name": "level2p",
-			},
-		})
-	addPfxSfx(cm2p, []string{"", "level2p-"}, []string{"", ""})
-
-	dep2p := rf.FromMap(
-		map[string]interface{}{
-			"apiVersion": "v1",
-			"kind":       "Deployment",
-			"metadata": map[string]interface{}{
-				"name": "level2p",
-			},
-		})
-	addPfxSfx(dep2p, []string{"", "level2p-"}, []string{"", ""})
-
-	// Simulates ConfigMap and Deployment defined at level 1
-	// and suffix added in level 2 of kustomization
-	cm2s := rf.FromMap(
-		map[string]interface{}{
-			"apiVersion": "v1",
-			"kind":       "ConfigMap",
-			"metadata": map[string]interface{}{
-				"name": "level2s",
-			},
-		})
-	addPfxSfx(cm2s, []string{"", ""}, []string{"", "-level2s"})
-
-	dep2s := rf.FromMap(
-		map[string]interface{}{
-			"apiVersion": "v1",
-			"kind":       "Deployment",
-			"metadata": map[string]interface{}{
-				"name": "level2s",
-			},
-		})
-	addPfxSfx(dep2s, []string{"", ""}, []string{"", "-level2s"})
-
-	// Simulates ConfigMap and Deployment defined at level 1,
-	// prefix added in levels 2 and 3 of kustomization.
-	cm3e := rf.FromMap(
-		map[string]interface{}{
-			"apiVersion": "v1",
-			"kind":       "ConfigMap",
-			"metadata": map[string]interface{}{
-				"name": "level3e",
-			},
-		})
-	addPfxSfx(cm3e, []string{"", "level2p-", "level3e-"}, []string{"", "", ""})
-
-	dep3e := rf.FromMap(
-		map[string]interface{}{
-			"apiVersion": "v1",
-			"kind":       "Deployment",
-			"metadata": map[string]interface{}{
-				"name": "level3e",
-			},
-		})
-	addPfxSfx(dep3e, []string{"", "level2p-", "level3e-"}, []string{"", "", ""})
-
-	// Simulates Deployment defined at level 1, ConfigMap defined at level 2,
-	// prefix added in levels 2 and 3 of kustomization.
-	// This reproduce issue 1440.
-	cm3i := rf.FromMap(
-		map[string]interface{}{
-			"apiVersion": "v1",
-			"kind":       "ConfigMap",
-			"metadata": map[string]interface{}{
-				"name": "level3i",
-			},
-		})
-	addPfxSfx(cm3i, []string{"level2p-", "level3i-"}, []string{"", ""})
-
-	dep3i := rf.FromMap(
-		map[string]interface{}{
-			"apiVersion": "v1",
-			"kind":       "Deployment",
-			"metadata": map[string]interface{}{
-				"name": "level3i",
-			},
-		})
-	addPfxSfx(dep3i, []string{"", "level2p-", "level3i-"}, []string{"", "", ""})
-
-	tests := map[string]struct {
-		filter   *resource.Resource
-		expected ResMap
-	}{
-		"level1": {
-			filter: dep1,
-			expected: resmaptest_test.NewRmBuilder(t, rf).
-				AddR(cm1).AddR(dep1).ResMap(),
-		},
-		"level2p": {
-			filter: dep2p,
-			expected: resmaptest_test.NewRmBuilder(t, rf).
-				AddR(cm2p).AddR(dep2p).ResMap(),
-		},
-		"level2s": {
-			filter: dep2s,
-			expected: resmaptest_test.NewRmBuilder(t, rf).
-				AddR(cm2s).AddR(dep2s).ResMap(),
-		},
-		"level3p": {
-			filter: dep3e,
-			expected: resmaptest_test.NewRmBuilder(t, rf).
-				AddR(cm3e).AddR(dep3e).ResMap(),
-		},
-		"level3i": {
-			filter: dep3i,
-			expected: resmaptest_test.NewRmBuilder(t, rf).
-				AddR(cm3i).AddR(dep3i).ResMap(),
-		},
-	}
-	m := resmaptest_test.NewRmBuilder(t, rf).
-		AddR(cm1).AddR(dep1).AddR(cm2s).AddR(dep2s).AddR(cm2p).AddR(dep2p).AddR(cm3e).AddR(dep3e).AddR(cm3i).AddR(dep3i).ResMap()
-	for name, test := range tests {
-		test := test
-		t.Run(name, func(t *testing.T) {
-			got := m.SubsetThatCouldBeReferencedByResource(test.filter)
-			err := test.expected.ErrorIfNotEqualLists(got)
-			if err != nil {
-				test.expected.Debug("expected")
-				got.Debug("actual")
-				t.Fatalf("Expected match")
-			}
-		})
-	}
-}
-
-func TestDeepCopy(t *testing.T) {
-	rm1 := resmaptest_test.NewRmBuilder(t, rf).Add(
-		map[string]interface{}{
-			"apiVersion": "v1",
-			"kind":       "ConfigMap",
-			"metadata": map[string]interface{}{
-				"name": "cm1",
-			},
-		}).Add(
-		map[string]interface{}{
-			"apiVersion": "v1",
-			"kind":       "ConfigMap",
-			"metadata": map[string]interface{}{
-				"name": "cm2",
-			},
-		}).ResMap()
-
-	rm2 := rm1.DeepCopy()
-
-	if &rm1 == &rm2 {
-		t.Fatal("DeepCopy returned a reference to itself instead of a copy")
-	}
-	err := rm1.ErrorIfNotEqualLists(rm1)
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestErrorIfNotEqualSets(t *testing.T) {
-	r1 := rf.FromMap(
-		map[string]interface{}{
-			"apiVersion": "v1",
-			"kind":       "ConfigMap",
-			"metadata": map[string]interface{}{
-				"name": "cm1",
-			},
-		})
-	r2 := rf.FromMap(
-		map[string]interface{}{
-			"apiVersion": "v1",
-			"kind":       "ConfigMap",
-			"metadata": map[string]interface{}{
-				"name": "cm2",
-			},
-		})
-	r3 := rf.FromMap(
-		map[string]interface{}{
-			"apiVersion": "v1",
-			"kind":       "ConfigMap",
-			"metadata": map[string]interface{}{
-				"name":      "cm2",
-				"namespace": "system",
-			},
-		})
-
-	m1 := resmaptest_test.NewRmBuilder(t, rf).AddR(r1).AddR(r2).AddR(r3).ResMap()
-	if err := m1.ErrorIfNotEqualSets(m1); err != nil {
-		t.Fatalf("object should equal itself %v", err)
-	}
-
-	m2 := resmaptest_test.NewRmBuilder(t, rf).AddR(r1).ResMap()
-	if err := m1.ErrorIfNotEqualSets(m2); err == nil {
-		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(
-		map[string]interface{}{
-			"apiVersion": "v1",
-			"kind":       "ConfigMap",
-			"metadata": map[string]interface{}{
-				"name": "cm1",
-			}}).ResMap()
-	if err := m2.ErrorIfNotEqualSets(m3); err != nil {
-		t.Fatalf("%v should equal %v %v", m2, m3, err)
-	}
-
-	m4 := resmaptest_test.NewRmBuilder(t, rf).AddR(r1).AddR(r2).AddR(r3).ResMap()
-	if err := m1.ErrorIfNotEqualSets(m4); err != nil {
-		t.Fatalf("expected equality between %v and %v, %v", m1, m4, err)
-	}
-
-	m4 = resmaptest_test.NewRmBuilder(t, rf).AddR(r3).AddR(r1).AddR(r2).ResMap()
-	if err := m1.ErrorIfNotEqualSets(m4); err != nil {
-		t.Fatalf("expected equality between %v and %v, %v", m1, m4, err)
-	}
-
-	m4 = m1.ShallowCopy()
-	if err := m1.ErrorIfNotEqualSets(m4); err != nil {
-		t.Fatalf("expected equality between %v and %v, %v", m1, m4, err)
-	}
-	m4 = m1.DeepCopy()
-	if err := m1.ErrorIfNotEqualSets(m4); err != nil {
-		t.Fatalf("expected equality between %v and %v, %v", m1, m4, err)
-	}
-}
-
-func TestErrorIfNotEqualLists(t *testing.T) {
-	r1 := rf.FromMap(
-		map[string]interface{}{
-			"apiVersion": "v1",
-			"kind":       "ConfigMap",
-			"metadata": map[string]interface{}{
-				"name": "cm1",
-			},
-		})
-	r2 := rf.FromMap(
-		map[string]interface{}{
-			"apiVersion": "v1",
-			"kind":       "ConfigMap",
-			"metadata": map[string]interface{}{
-				"name": "cm2",
-			},
-		})
-	r3 := rf.FromMap(
-		map[string]interface{}{
-			"apiVersion": "v1",
-			"kind":       "ConfigMap",
-			"metadata": map[string]interface{}{
-				"name":      "cm2",
-				"namespace": "system",
-			},
-		})
-
-	m1 := resmaptest_test.NewRmBuilder(t, rf).AddR(r1).AddR(r2).AddR(r3).ResMap()
-	if err := m1.ErrorIfNotEqualLists(m1); err != nil {
-		t.Fatalf("object should equal itself %v", err)
-	}
-
-	m2 := resmaptest_test.NewRmBuilder(t, rf).AddR(r1).ResMap()
-	if err := m1.ErrorIfNotEqualLists(m2); err == nil {
-		t.Fatalf("%v should not equal %v %v", m1, m2, err)
-	}
-
-	m3 := resmaptest_test.NewRmBuilder(t, rf).Add(
-		map[string]interface{}{
-			"apiVersion": "v1",
-			"kind":       "ConfigMap",
-			"metadata": map[string]interface{}{
-				"name": "cm1",
-			}}).ResMap()
-	if err := m2.ErrorIfNotEqualLists(m3); err != nil {
-		t.Fatalf("%v should equal %v %v", m2, m3, err)
-	}
-
-	m4 := resmaptest_test.NewRmBuilder(t, rf).AddR(r1).AddR(r2).AddR(r3).ResMap()
-	if err := m1.ErrorIfNotEqualLists(m4); err != nil {
-		t.Fatalf("expected equality between %v and %v, %v", m1, m4, err)
-	}
-
-	m4 = resmaptest_test.NewRmBuilder(t, rf).AddR(r3).AddR(r1).AddR(r2).ResMap()
-	if err := m1.ErrorIfNotEqualLists(m4); err == nil {
-		t.Fatalf("expected inequality between %v and %v, %v", m1, m4, err)
-	}
-
-	m4 = m1.ShallowCopy()
-	if err := m1.ErrorIfNotEqualLists(m4); err != nil {
-		t.Fatalf("expected equality between %v and %v, %v", m1, m4, err)
-	}
-	m4 = m1.DeepCopy()
-	if err := m1.ErrorIfNotEqualLists(m4); err != nil {
-		t.Fatalf("expected equality between %v and %v, %v", m1, m4, err)
-	}
-}
-
-func TestAppendAll(t *testing.T) {
-	r1 := rf.FromMap(
-		map[string]interface{}{
-			"apiVersion": "apps/v1",
-			"kind":       "Deployment",
-			"metadata": map[string]interface{}{
-				"name": "foo-deploy1",
-			},
-		})
-	input1 := rmF.FromResource(r1)
-	r2 := rf.FromMap(
-		map[string]interface{}{
-			"apiVersion": "apps/v1",
-			"kind":       "StatefulSet",
-			"metadata": map[string]interface{}{
-				"name": "bar-stateful",
-			},
-		})
-	input2 := rmF.FromResource(r2)
-
-	expected := New()
-	if err := expected.Append(r1); err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-	if err := expected.Append(r2); err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	if err := input1.AppendAll(input2); err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-	if err := expected.ErrorIfNotEqualLists(input1); err != nil {
-		input1.Debug("1")
-		expected.Debug("ex")
-		t.Fatalf("%#v doesn't equal expected %#v", input1, expected)
-	}
-	if err := input1.AppendAll(nil); err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-	if err := expected.ErrorIfNotEqualLists(input1); err != nil {
-		t.Fatalf("%#v doesn't equal expected %#v", input1, expected)
-	}
-}
-
-func makeMap1() ResMap {
-	return rmF.FromResource(rf.FromMapAndOption(
-		map[string]interface{}{
-			"apiVersion": "apps/v1",
-			"kind":       "ConfigMap",
-			"metadata": map[string]interface{}{
-				"name": "cmap",
-			},
-			"data": map[string]interface{}{
-				"a": "x",
-				"b": "y",
-			},
-		}, &types.GeneratorArgs{
-			Behavior: "create",
-		}))
-}
-
-func makeMap2(b types.GenerationBehavior) ResMap {
-	return rmF.FromResource(rf.FromMapAndOption(
-		map[string]interface{}{
-			"apiVersion": "apps/v1",
-			"kind":       "ConfigMap",
-			"metadata": map[string]interface{}{
-				"name": "cmap",
-			},
-			"data": map[string]interface{}{
-				"a": "u",
-				"b": "v",
-				"c": "w",
-			},
-		}, &types.GeneratorArgs{
-			Behavior: b.String(),
-		}))
-}
-
-func TestAbsorbAll(t *testing.T) {
-	expected := rmF.FromResource(rf.FromMapAndOption(
-		map[string]interface{}{
-			"apiVersion": "apps/v1",
-			"kind":       "ConfigMap",
-			"metadata": map[string]interface{}{
-				"annotations": map[string]interface{}{},
-				"labels":      map[string]interface{}{},
-				"name":        "cmap",
-			},
-			"data": map[string]interface{}{
-				"a": "u",
-				"b": "v",
-				"c": "w",
-			},
-		}, &types.GeneratorArgs{
-			Behavior: "create",
-		}))
-	w := makeMap1()
-	if err := w.AbsorbAll(makeMap2(types.BehaviorMerge)); err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-	if err := expected.ErrorIfNotEqualLists(w); err != nil {
-		t.Fatal(err)
-	}
-	w = makeMap1()
-	if err := w.AbsorbAll(nil); err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-	if err := w.ErrorIfNotEqualLists(makeMap1()); err != nil {
-		t.Fatal(err)
-	}
-	w = makeMap1()
-	w2 := makeMap2(types.BehaviorReplace)
-	if err := w.AbsorbAll(w2); err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-	if err := w2.ErrorIfNotEqualLists(w); err != nil {
-		t.Fatal(err)
-	}
-	w = makeMap1()
-	w2 = makeMap2(types.BehaviorUnspecified)
-	err := w.AbsorbAll(w2)
-	if err == nil {
-		t.Fatalf("expected error with unspecified behavior")
-	}
-}
+// See reswrangler_test.go

api/resmap/reswrangler.go

@@ -0,0 +1,582 @@
+// Copyright 2019 The Kubernetes Authors.
+// SPDX-License-Identifier: Apache-2.0
+
+package resmap
+
+import (
+	"bytes"
+	"fmt"
+	"regexp"
+
+	"github.com/pkg/errors"
+	"sigs.k8s.io/kustomize/api/resid"
+	"sigs.k8s.io/kustomize/api/resource"
+	"sigs.k8s.io/kustomize/api/types"
+	"sigs.k8s.io/yaml"
+)
+
+// resWrangler implements ResMap.
+type resWrangler struct {
+	// Resource list maintained in load (append) order.
+	// This is important for transformers, which must
+	// be performed in a specific order, and for users
+	// who for whatever reasons wish the order they
+	// specify in kustomizations to be maintained and
+	// available as an option for final YAML rendering.
+	rList []*resource.Resource
+}
+
+func newOne() *resWrangler {
+	result := &resWrangler{}
+	result.Clear()
+	return result
+}
+
+// Clear implements ResMap.
+func (m *resWrangler) Clear() {
+	m.rList = nil
+}
+
+// Size implements ResMap.
+func (m *resWrangler) Size() int {
+	return len(m.rList)
+}
+
+func (m *resWrangler) indexOfResource(other *resource.Resource) int {
+	for i, r := range m.rList {
+		if r == other {
+			return i
+		}
+	}
+	return -1
+}
+
+// Resources implements ResMap.
+func (m *resWrangler) Resources() []*resource.Resource {
+	tmp := make([]*resource.Resource, len(m.rList))
+	copy(tmp, m.rList)
+	return tmp
+}
+
+// Append implements ResMap.
+func (m *resWrangler) Append(res *resource.Resource) error {
+	id := res.CurId()
+	if r := m.GetMatchingResourcesByCurrentId(id.Equals); len(r) > 0 {
+		return fmt.Errorf(
+			"may not add resource with an already registered id: %s", id)
+	}
+	m.rList = append(m.rList, res)
+	return nil
+}
+
+// Remove implements ResMap.
+func (m *resWrangler) Remove(adios resid.ResId) error {
+	tmp := newOne()
+	for _, r := range m.rList {
+		if r.CurId() != adios {
+			tmp.Append(r)
+		}
+	}
+	if tmp.Size() != m.Size()-1 {
+		return fmt.Errorf("id %s not found in removal", adios)
+	}
+	m.rList = tmp.rList
+	return nil
+}
+
+// Replace implements ResMap.
+func (m *resWrangler) Replace(res *resource.Resource) (int, error) {
+	id := res.CurId()
+	i, err := m.GetIndexOfCurrentId(id)
+	if err != nil {
+		return -1, errors.Wrap(err, "in Replace")
+	}
+	if i < 0 {
+		return -1, fmt.Errorf("cannot find resource with id %s to replace", id)
+	}
+	m.rList[i] = res
+	return i, nil
+}
+
+// AllIds implements ResMap.
+func (m *resWrangler) AllIds() (ids []resid.ResId) {
+	ids = make([]resid.ResId, m.Size())
+	for i, r := range m.rList {
+		ids[i] = r.CurId()
+	}
+	return
+}
+
+// Debug implements ResMap.
+func (m *resWrangler) Debug(title string) {
+	fmt.Println("--------------------------- " + title)
+	firstObj := true
+	for i, r := range m.rList {
+		if firstObj {
+			firstObj = false
+		} else {
+			fmt.Println("---")
+		}
+		fmt.Printf("# %d  %s\n", i, r.OrgId())
+		blob, err := yaml.Marshal(r.Map())
+		if err != nil {
+			panic(err)
+		}
+		fmt.Println(string(blob))
+	}
+}
+
+type IdMatcher func(resid.ResId) bool
+
+// GetByIndex implements ResMap.
+func (m *resWrangler) GetByIndex(i int) *resource.Resource {
+	if i < 0 || i >= m.Size() {
+		return nil
+	}
+	return m.rList[i]
+}
+
+// GetIndexOfCurrentId implements ResMap.
+func (m *resWrangler) GetIndexOfCurrentId(id resid.ResId) (int, error) {
+	count := 0
+	result := -1
+	for i, r := range m.rList {
+		if id.Equals(r.CurId()) {
+			count++
+			result = i
+		}
+	}
+	if count > 1 {
+		return -1, fmt.Errorf("id matched %d resources", count)
+	}
+	return result, nil
+}
+
+type IdFromResource func(r *resource.Resource) resid.ResId
+
+func GetOriginalId(r *resource.Resource) resid.ResId { return r.OrgId() }
+func GetCurrentId(r *resource.Resource) resid.ResId  { return r.CurId() }
+
+// GetMatchingResourcesByCurrentId implements ResMap.
+func (m *resWrangler) GetMatchingResourcesByCurrentId(
+	matches IdMatcher) []*resource.Resource {
+	return m.filteredById(matches, GetCurrentId)
+}
+
+// GetMatchingResourcesByOriginalId implements ResMap.
+func (m *resWrangler) GetMatchingResourcesByOriginalId(
+	matches IdMatcher) []*resource.Resource {
+	return m.filteredById(matches, GetOriginalId)
+}
+
+func (m *resWrangler) filteredById(
+	matches IdMatcher, idGetter IdFromResource) []*resource.Resource {
+	var result []*resource.Resource
+	for _, r := range m.rList {
+		if matches(idGetter(r)) {
+			result = append(result, r)
+		}
+	}
+	return result
+}
+
+// GetByCurrentId implements ResMap.
+func (m *resWrangler) GetByCurrentId(
+	id resid.ResId) (*resource.Resource, error) {
+	return demandOneMatch(m.GetMatchingResourcesByCurrentId, id, "Current")
+}
+
+// GetByOriginalId implements ResMap.
+func (m *resWrangler) GetByOriginalId(
+	id resid.ResId) (*resource.Resource, error) {
+	return demandOneMatch(m.GetMatchingResourcesByOriginalId, id, "Original")
+}
+
+// GetById implements ResMap.
+func (m *resWrangler) GetById(
+	id resid.ResId) (*resource.Resource, error) {
+	match, err1 := m.GetByOriginalId(id)
+	if err1 == nil {
+		return match, nil
+	}
+	match, err2 := m.GetByCurrentId(id)
+	if err2 == nil {
+		return match, nil
+	}
+	return nil, fmt.Errorf(
+		"%s; %s; failed to find unique target for patch %s",
+		err1.Error(), err2.Error(), id.GvknString())
+}
+
+type resFinder func(IdMatcher) []*resource.Resource
+
+func demandOneMatch(
+	f resFinder, id resid.ResId, s string) (*resource.Resource, error) {
+	r := f(id.Equals)
+	if len(r) == 1 {
+		return r[0], nil
+	}
+	if len(r) > 1 {
+		return nil, fmt.Errorf("multiple matches for %sId %s", s, id)
+	}
+	return nil, fmt.Errorf("no matches for %sId %s", s, id)
+}
+
+// GroupedByCurrentNamespace implements ResMap.GroupByCurrentNamespace
+func (m *resWrangler) GroupedByCurrentNamespace() map[string][]*resource.Resource {
+	items := m.groupedByCurrentNamespace()
+	delete(items, resid.TotallyNotANamespace)
+	return items
+}
+
+// NonNamespaceable implements ResMap.NonNamespaceable
+func (m *resWrangler) NonNamespaceable() []*resource.Resource {
+	return m.groupedByCurrentNamespace()[resid.TotallyNotANamespace]
+}
+
+func (m *resWrangler) groupedByCurrentNamespace() map[string][]*resource.Resource {
+	byNamespace := make(map[string][]*resource.Resource)
+	for _, res := range m.rList {
+		namespace := res.CurId().EffectiveNamespace()
+		if _, found := byNamespace[namespace]; !found {
+			byNamespace[namespace] = []*resource.Resource{}
+		}
+		byNamespace[namespace] = append(byNamespace[namespace], res)
+	}
+	return byNamespace
+}
+
+// GroupedByNamespace implements ResMap.GroupByOrginalNamespace
+func (m *resWrangler) GroupedByOriginalNamespace() map[string][]*resource.Resource {
+	items := m.groupedByOriginalNamespace()
+	delete(items, resid.TotallyNotANamespace)
+	return items
+}
+
+func (m *resWrangler) groupedByOriginalNamespace() map[string][]*resource.Resource {
+	byNamespace := make(map[string][]*resource.Resource)
+	for _, res := range m.rList {
+		namespace := res.OrgId().EffectiveNamespace()
+		if _, found := byNamespace[namespace]; !found {
+			byNamespace[namespace] = []*resource.Resource{}
+		}
+		byNamespace[namespace] = append(byNamespace[namespace], res)
+	}
+	return byNamespace
+}
+
+// AsYaml implements ResMap.
+func (m *resWrangler) AsYaml() ([]byte, error) {
+	firstObj := true
+	var b []byte
+	buf := bytes.NewBuffer(b)
+	for _, res := range m.Resources() {
+		out, err := yaml.Marshal(res.Map())
+		if err != nil {
+			return nil, err
+		}
+		if firstObj {
+			firstObj = false
+		} else {
+			if _, err = buf.WriteString("---\n"); err != nil {
+				return nil, err
+			}
+		}
+		if _, err = buf.Write(out); err != nil {
+			return nil, err
+		}
+	}
+	return buf.Bytes(), nil
+}
+
+// ErrorIfNotEqualSets implements ResMap.
+func (m *resWrangler) ErrorIfNotEqualSets(other ResMap) error {
+	m2, ok := other.(*resWrangler)
+	if !ok {
+		panic("bad cast")
+	}
+	if m.Size() != m2.Size() {
+		return fmt.Errorf(
+			"lists have different number of entries: %#v doesn't equal %#v",
+			m.rList, m2.rList)
+	}
+	seen := make(map[int]bool)
+	for _, r1 := range m.rList {
+		id := r1.CurId()
+		others := m2.GetMatchingResourcesByCurrentId(id.Equals)
+		if len(others) == 0 {
+			return fmt.Errorf(
+				"id in self missing from other; id: %s", id)
+		}
+		if len(others) > 1 {
+			return fmt.Errorf(
+				"id in self matches %d in other; id: %s", len(others), id)
+		}
+		r2 := others[0]
+		if !r1.KunstructEqual(r2) {
+			return fmt.Errorf(
+				"kunstruct not equal: \n -- %s,\n -- %s\n\n--\n%#v\n------\n%#v\n",
+				r1, r2, r1, r2)
+		}
+		seen[m2.indexOfResource(r2)] = true
+	}
+	if len(seen) != m.Size() {
+		return fmt.Errorf("counting problem %d != %d", len(seen), m.Size())
+	}
+	return nil
+}
+
+// ErrorIfNotEqualList implements ResMap.
+func (m *resWrangler) ErrorIfNotEqualLists(other ResMap) error {
+	m2, ok := other.(*resWrangler)
+	if !ok {
+		panic("bad cast")
+	}
+	if m.Size() != m2.Size() {
+		return fmt.Errorf(
+			"lists have different number of entries: %#v doesn't equal %#v",
+			m.rList, m2.rList)
+	}
+	for i, r1 := range m.rList {
+		r2 := m2.rList[i]
+		if !r1.Equals(r2) {
+			return fmt.Errorf(
+				"Item i=%d differs:\n  n1 = %s\n  n2 = %s\n  o1 = %s\n  o2 = %s\n",
+				i, r1.OrgId(), r2.OrgId(), r1, r2)
+		}
+	}
+	return nil
+}
+
+type resCopier func(r *resource.Resource) *resource.Resource
+
+// ShallowCopy implements ResMap.
+func (m *resWrangler) ShallowCopy() ResMap {
+	return m.makeCopy(
+		func(r *resource.Resource) *resource.Resource {
+			return r
+		})
+}
+
+// DeepCopy implements ResMap.
+func (m *resWrangler) DeepCopy() ResMap {
+	return m.makeCopy(
+		func(r *resource.Resource) *resource.Resource {
+			return r.DeepCopy()
+		})
+}
+
+// makeCopy copies the ResMap.
+func (m *resWrangler) makeCopy(copier resCopier) ResMap {
+	result := &resWrangler{}
+	result.rList = make([]*resource.Resource, m.Size())
+	for i, r := range m.rList {
+		result.rList[i] = copier(r)
+	}
+	return result
+}
+
+// SubsetThatCouldBeReferencedByResource implements ResMap.
+func (m *resWrangler) SubsetThatCouldBeReferencedByResource(
+	inputRes *resource.Resource) ResMap {
+	result := newOne()
+	inputId := inputRes.CurId()
+	isInputIdNamespaceable := inputId.IsNamespaceableKind()
+	rctxm := inputRes.PrefixesSuffixesEquals
+	subjectNamespaces := getNamespacesForRoleBinding(inputRes)
+	for _, r := range m.Resources() {
+		// Need to match more accuratly both at the time of selection and transformation.
+		// OutmostPrefixSuffixEquals is not accurate enough since it is only using
+		// the outer most suffix and the last prefix. Use PrefixedSuffixesEquals instead.
+		resId := r.CurId()
+		if (!isInputIdNamespaceable || !resId.IsNamespaceableKind() || resId.IsNsEquals(inputId) ||
+			isRoleBindingNamespace(&subjectNamespaces, r.GetNamespace())) && r.InSameKustomizeCtx(rctxm) {
+			result.append(r)
+		}
+	}
+	return result
+}
+
+// isRoleBindingNamespace returns true is the namespace `ns` is in role binding
+// namespaces `m`
+func isRoleBindingNamespace(m *map[string]bool, ns string) bool {
+	return (*m)[ns]
+}
+
+// getNamespacesForRoleBinding returns referenced ServiceAccount namespaces if the inputRes is
+// a RoleBinding
+func getNamespacesForRoleBinding(inputRes *resource.Resource) map[string]bool {
+	res := make(map[string]bool)
+	if inputRes.GetKind() != "RoleBinding" {
+		return res
+	}
+	subjects, err := inputRes.GetSlice("subjects")
+	if err != nil || subjects == nil {
+		return res
+	}
+
+	for _, s := range subjects {
+		subject := s.(map[string]interface{})
+		if subject["namespace"] == nil || subject["kind"] == nil ||
+			subject["kind"].(string) != "ServiceAccount" {
+			continue
+		}
+		res[subject["namespace"].(string)] = true
+	}
+
+	return res
+}
+
+func (m *resWrangler) append(res *resource.Resource) {
+	m.rList = append(m.rList, res)
+}
+
+// AppendAll implements ResMap.
+func (m *resWrangler) AppendAll(other ResMap) error {
+	if other == nil {
+		return nil
+	}
+	for _, res := range other.Resources() {
+		if err := m.Append(res); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+// AbsorbAll implements ResMap.
+func (m *resWrangler) AbsorbAll(other ResMap) error {
+	if other == nil {
+		return nil
+	}
+	for _, r := range other.Resources() {
+		err := m.appendReplaceOrMerge(r)
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func (m *resWrangler) appendReplaceOrMerge(
+	res *resource.Resource) error {
+	id := res.CurId()
+	matches := m.GetMatchingResourcesByOriginalId(id.Equals)
+	if len(matches) == 0 {
+		matches = m.GetMatchingResourcesByCurrentId(id.Equals)
+	}
+	switch len(matches) {
+	case 0:
+		switch res.Behavior() {
+		case types.BehaviorMerge, types.BehaviorReplace:
+			return fmt.Errorf(
+				"id %#v does not exist; cannot merge or replace", id)
+		default:
+			// presumably types.BehaviorCreate
+			err := m.Append(res)
+			if err != nil {
+				return err
+			}
+		}
+	case 1:
+		old := matches[0]
+		if old == nil {
+			return fmt.Errorf("id lookup failure")
+		}
+		index := m.indexOfResource(old)
+		if index < 0 {
+			return fmt.Errorf("indexing problem")
+		}
+		switch res.Behavior() {
+		case types.BehaviorReplace:
+			res.Replace(old)
+		case types.BehaviorMerge:
+			res.Merge(old)
+		default:
+			return fmt.Errorf(
+				"id %#v exists; behavior must be merge or replace", id)
+		}
+		i, err := m.Replace(res)
+		if err != nil {
+			return err
+		}
+		if i != index {
+			return fmt.Errorf("unexpected index in replacement")
+		}
+	default:
+		return fmt.Errorf(
+			"found multiple objects %v that could accept merge of %v",
+			matches, id)
+	}
+	return nil
+}
+
+func anchorRegex(pattern string) string {
+	if pattern == "" {
+		return pattern
+	}
+	return "^" + pattern + "$"
+}
+
+// Select returns a list of resources that
+// are selected by a Selector
+func (m *resWrangler) Select(s types.Selector) ([]*resource.Resource, error) {
+	ns := regexp.MustCompile(anchorRegex(s.Namespace))
+	nm := regexp.MustCompile(anchorRegex(s.Name))
+	var result []*resource.Resource
+	for _, r := range m.Resources() {
+		curId := r.CurId()
+		orgId := r.OrgId()
+
+		// matches the namespace when namespace is not empty in the selector
+		// It first tries to match with the original namespace
+		// then matches with the current namespace
+		if r.GetNamespace() != "" {
+			matched := ns.MatchString(orgId.EffectiveNamespace())
+			if !matched {
+				matched = ns.MatchString(curId.EffectiveNamespace())
+				if !matched {
+					continue
+				}
+			}
+		}
+
+		// matches the name when name is not empty in the selector
+		// It first tries to match with the original name
+		// then matches with the current name
+		if r.GetName() != "" {
+			matched := nm.MatchString(orgId.Name)
+			if !matched {
+				matched = nm.MatchString(curId.Name)
+				if !matched {
+					continue
+				}
+			}
+		}
+
+		// matches the GVK
+		if !r.GetGvk().IsSelected(&s.Gvk) {
+			continue
+		}
+
+		// matches the label selector
+		matched, err := r.MatchesLabelSelector(s.LabelSelector)
+		if err != nil {
+			return nil, err
+		}
+		if !matched {
+			continue
+		}
+
+		// matches the annotation selector
+		matched, err = r.MatchesAnnotationSelector(s.AnnotationSelector)
+		if err != nil {
+			return nil, err
+		}
+		if !matched {
+			continue
+		}
+		result = append(result, r)
+	}
+	return result, nil
+}

api/resmap/reswrangler_test.go

@@ -0,0 +1,901 @@
+// Copyright 2019 The Kubernetes Authors.
+// SPDX-License-Identifier: Apache-2.0
+
+package resmap_test
+
+import (
+	"fmt"
+	"reflect"
+	"strings"
+	"testing"
+
+	"sigs.k8s.io/kustomize/api/k8sdeps/kunstruct"
+	"sigs.k8s.io/kustomize/api/resid"
+	. "sigs.k8s.io/kustomize/api/resmap"
+	"sigs.k8s.io/kustomize/api/resource"
+	resmaptest_test "sigs.k8s.io/kustomize/api/testutils/resmaptest"
+	"sigs.k8s.io/kustomize/api/types"
+)
+
+var rf = resource.NewFactory(
+	kunstruct.NewKunstructuredFactoryImpl())
+var rmF = NewFactory(rf, nil)
+
+func doAppend(t *testing.T, w ResMap, r *resource.Resource) {
+	err := w.Append(r)
+	if err != nil {
+		t.Fatalf("append error: %v", err)
+	}
+}
+func doRemove(t *testing.T, w ResMap, id resid.ResId) {
+	err := w.Remove(id)
+	if err != nil {
+		t.Fatalf("remove error: %v", err)
+	}
+}
+
+// Make a resource with a predictable name.
+func makeCm(i int) *resource.Resource {
+	return rf.FromMap(
+		map[string]interface{}{
+			"apiVersion": "v1",
+			"kind":       "ConfigMap",
+			"metadata": map[string]interface{}{
+				"name": fmt.Sprintf("cm%03d", i),
+			},
+		})
+}
+
+// Maintain the class invariant that no two
+// resources can have the same CurId().
+func TestAppendRejectsDuplicateResId(t *testing.T) {
+	w := New()
+	if err := w.Append(makeCm(1)); err != nil {
+		t.Fatalf("append error: %v", err)
+	}
+	err := w.Append(makeCm(1))
+	if err == nil {
+		t.Fatalf("expected append error")
+	}
+	if !strings.Contains(
+		err.Error(),
+		"may not add resource with an already registered id") {
+		t.Fatalf("unexpected error: %v", err)
+	}
+}
+
+func TestAppendRemove(t *testing.T) {
+	w1 := New()
+	doAppend(t, w1, makeCm(1))
+	doAppend(t, w1, makeCm(2))
+	doAppend(t, w1, makeCm(3))
+	doAppend(t, w1, makeCm(4))
+	doAppend(t, w1, makeCm(5))
+	doAppend(t, w1, makeCm(6))
+	doAppend(t, w1, makeCm(7))
+	doRemove(t, w1, makeCm(1).OrgId())
+	doRemove(t, w1, makeCm(3).OrgId())
+	doRemove(t, w1, makeCm(5).OrgId())
+	doRemove(t, w1, makeCm(7).OrgId())
+
+	w2 := New()
+	doAppend(t, w2, makeCm(2))
+	doAppend(t, w2, makeCm(4))
+	doAppend(t, w2, makeCm(6))
+	if !reflect.DeepEqual(w1, w1) {
+		w1.Debug("w1")
+		w2.Debug("w2")
+		t.Fatalf("mismatch")
+	}
+
+	err := w2.Append(makeCm(6))
+	if err == nil {
+		t.Fatalf("expected error")
+	}
+}
+
+func TestRemove(t *testing.T) {
+	w := New()
+	r := makeCm(1)
+	err := w.Remove(r.OrgId())
+	if err == nil {
+		t.Fatalf("expected error")
+	}
+	err = w.Append(r)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	err = w.Remove(r.OrgId())
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	err = w.Remove(r.OrgId())
+	if err == nil {
+		t.Fatalf("expected error")
+	}
+}
+
+func TestReplace(t *testing.T) {
+	cm5 := makeCm(5)
+	cm700 := makeCm(700)
+	otherCm5 := makeCm(5)
+
+	w := New()
+	doAppend(t, w, makeCm(1))
+	doAppend(t, w, makeCm(2))
+	doAppend(t, w, makeCm(3))
+	doAppend(t, w, makeCm(4))
+	doAppend(t, w, cm5)
+	doAppend(t, w, makeCm(6))
+	doAppend(t, w, makeCm(7))
+
+	oldSize := w.Size()
+	_, err := w.Replace(otherCm5)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	if w.Size() != oldSize {
+		t.Fatalf("unexpected size %d", w.Size())
+	}
+	if r, err := w.GetByCurrentId(cm5.OrgId()); err != nil || r != otherCm5 {
+		t.Fatalf("unexpected result r=%s, err=%v", r.CurId(), err)
+	}
+	if err := w.Append(cm5); err == nil {
+		t.Fatalf("expected id already there error")
+	}
+	if err := w.Remove(cm5.OrgId()); err != nil {
+		t.Fatalf("unexpected err: %v", err)
+	}
+	if err := w.Append(cm700); err != nil {
+		t.Fatalf("unexpected err: %v", err)
+	}
+	if err := w.Append(cm5); err != nil {
+		t.Fatalf("unexpected err: %v", err)
+	}
+}
+
+func TestEncodeAsYaml(t *testing.T) {
+	encoded := []byte(`apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: cm1
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: cm2
+`)
+	input := resmaptest_test.NewRmBuilder(t, rf).Add(
+		map[string]interface{}{
+			"apiVersion": "v1",
+			"kind":       "ConfigMap",
+			"metadata": map[string]interface{}{
+				"name": "cm1",
+			},
+		}).Add(
+		map[string]interface{}{
+			"apiVersion": "v1",
+			"kind":       "ConfigMap",
+			"metadata": map[string]interface{}{
+				"name": "cm2",
+			},
+		}).ResMap()
+	out, err := input.AsYaml()
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	if !reflect.DeepEqual(out, encoded) {
+		t.Fatalf("%s doesn't match expected %s", out, encoded)
+	}
+}
+
+func TestGetMatchingResourcesByCurrentId(t *testing.T) {
+	r1 := rf.FromMap(
+		map[string]interface{}{
+			"apiVersion": "v1",
+			"kind":       "ConfigMap",
+			"metadata": map[string]interface{}{
+				"name": "alice",
+			},
+		})
+	r2 := rf.FromMap(
+		map[string]interface{}{
+			"apiVersion": "v1",
+			"kind":       "ConfigMap",
+			"metadata": map[string]interface{}{
+				"name": "bob",
+			},
+		})
+	r3 := rf.FromMap(
+		map[string]interface{}{
+			"apiVersion": "v1",
+			"kind":       "ConfigMap",
+			"metadata": map[string]interface{}{
+				"name":      "bob",
+				"namespace": "happy",
+			},
+		})
+	r4 := rf.FromMap(
+		map[string]interface{}{
+			"apiVersion": "v1",
+			"kind":       "ConfigMap",
+			"metadata": map[string]interface{}{
+				"name":      "charlie",
+				"namespace": "happy",
+			},
+		})
+	r5 := rf.FromMap(
+		map[string]interface{}{
+			"apiVersion": "v1",
+			"kind":       "Deployment",
+			"metadata": map[string]interface{}{
+				"name":      "charlie",
+				"namespace": "happy",
+			},
+		})
+
+	m := resmaptest_test.NewRmBuilder(t, rf).
+		AddR(r1).AddR(r2).AddR(r3).AddR(r4).AddR(r5).ResMap()
+
+	result := m.GetMatchingResourcesByCurrentId(
+		resid.NewResId(cmap, "alice").GvknEquals)
+	if len(result) != 1 {
+		t.Fatalf("Expected single map entry but got %v", result)
+	}
+	result = m.GetMatchingResourcesByCurrentId(
+		resid.NewResId(cmap, "bob").GvknEquals)
+	if len(result) != 2 {
+		t.Fatalf("Expected two, got %v", result)
+	}
+	result = m.GetMatchingResourcesByCurrentId(
+		resid.NewResIdWithNamespace(cmap, "bob", "system").GvknEquals)
+	if len(result) != 2 {
+		t.Fatalf("Expected two but got %v", result)
+	}
+	result = m.GetMatchingResourcesByCurrentId(
+		resid.NewResIdWithNamespace(cmap, "bob", "happy").Equals)
+	if len(result) != 1 {
+		t.Fatalf("Expected single map entry but got %v", result)
+	}
+	result = m.GetMatchingResourcesByCurrentId(
+		resid.NewResId(cmap, "charlie").GvknEquals)
+	if len(result) != 1 {
+		t.Fatalf("Expected single map entry but got %v", result)
+	}
+
+	// nolint:goconst
+	tests := []struct {
+		name    string
+		matcher IdMatcher
+		count   int
+	}{
+		{
+			"match everything",
+			func(resid.ResId) bool { return true },
+			5,
+		},
+		{
+			"match nothing",
+			func(resid.ResId) bool { return false },
+			0,
+		},
+		{
+			"name is alice",
+			func(x resid.ResId) bool { return x.Name == "alice" },
+			1,
+		},
+		{
+			"name is charlie",
+			func(x resid.ResId) bool { return x.Name == "charlie" },
+			2,
+		},
+		{
+			"name is bob",
+			func(x resid.ResId) bool { return x.Name == "bob" },
+			2,
+		},
+		{
+			"happy namespace",
+			func(x resid.ResId) bool {
+				return x.Namespace == "happy"
+			},
+			3,
+		},
+		{
+			"happy deployment",
+			func(x resid.ResId) bool {
+				return x.Namespace == "happy" &&
+					x.Gvk.Kind == "Deployment"
+			},
+			1,
+		},
+		{
+			"happy ConfigMap",
+			func(x resid.ResId) bool {
+				return x.Namespace == "happy" &&
+					x.Gvk.Kind == "ConfigMap"
+			},
+			2,
+		},
+	}
+	for _, tst := range tests {
+		result := m.GetMatchingResourcesByCurrentId(tst.matcher)
+		if len(result) != tst.count {
+			t.Fatalf("test '%s';  actual: %d, expected: %d",
+				tst.name, len(result), tst.count)
+		}
+	}
+}
+
+func TestSubsetThatCouldBeReferencedByResource(t *testing.T) {
+	r1 := rf.FromMap(
+		map[string]interface{}{
+			"apiVersion": "v1",
+			"kind":       "ConfigMap",
+			"metadata": map[string]interface{}{
+				"name": "alice",
+			},
+		})
+	r2 := rf.FromMap(
+		map[string]interface{}{
+			"apiVersion": "v1",
+			"kind":       "ConfigMap",
+			"metadata": map[string]interface{}{
+				"name": "bob",
+			},
+		})
+	r3 := rf.FromMap(
+		map[string]interface{}{
+			"apiVersion": "v1",
+			"kind":       "ConfigMap",
+			"metadata": map[string]interface{}{
+				"name":      "bob",
+				"namespace": "happy",
+			},
+		})
+	r4 := rf.FromMap(
+		map[string]interface{}{
+			"apiVersion": "v1",
+			"kind":       "Deployment",
+			"metadata": map[string]interface{}{
+				"name":      "charlie",
+				"namespace": "happy",
+			},
+		})
+	r5 := rf.FromMap(
+		map[string]interface{}{
+			"apiVersion": "v1",
+			"kind":       "ConfigMap",
+			"metadata": map[string]interface{}{
+				"name":      "charlie",
+				"namespace": "happy",
+			},
+		})
+	r5.AddNamePrefix("little-")
+	r6 := rf.FromMap(
+		map[string]interface{}{
+			"apiVersion": "v1",
+			"kind":       "Deployment",
+			"metadata": map[string]interface{}{
+				"name":      "domino",
+				"namespace": "happy",
+			},
+		})
+	r6.AddNamePrefix("little-")
+	r7 := rf.FromMap(
+		map[string]interface{}{
+			"apiVersion": "v1",
+			"kind":       "ClusterRoleBinding",
+			"metadata": map[string]interface{}{
+				"name": "meh",
+			},
+		})
+
+	tests := map[string]struct {
+		filter   *resource.Resource
+		expected ResMap
+	}{
+		"default namespace 1": {
+			filter: r2,
+			expected: resmaptest_test.NewRmBuilder(t, rf).
+				AddR(r1).AddR(r2).AddR(r7).ResMap(),
+		},
+		"default namespace 2": {
+			filter: r1,
+			expected: resmaptest_test.NewRmBuilder(t, rf).
+				AddR(r1).AddR(r2).AddR(r7).ResMap(),
+		},
+		"happy namespace no prefix": {
+			filter: r3,
+			expected: resmaptest_test.NewRmBuilder(t, rf).
+				AddR(r3).AddR(r4).AddR(r5).AddR(r6).AddR(r7).ResMap(),
+		},
+		"happy namespace with prefix": {
+			filter: r5,
+			expected: resmaptest_test.NewRmBuilder(t, rf).
+				AddR(r3).AddR(r4).AddR(r5).AddR(r6).AddR(r7).ResMap(),
+		},
+		"cluster level": {
+			filter: r7,
+			expected: resmaptest_test.NewRmBuilder(t, rf).
+				AddR(r1).AddR(r2).AddR(r3).AddR(r4).AddR(r5).AddR(r6).AddR(r7).ResMap(),
+		},
+	}
+	m := resmaptest_test.NewRmBuilder(t, rf).
+		AddR(r1).AddR(r2).AddR(r3).AddR(r4).AddR(r5).AddR(r6).AddR(r7).ResMap()
+	for name, test := range tests {
+		test := test
+		t.Run(name, func(t *testing.T) {
+			got := m.SubsetThatCouldBeReferencedByResource(test.filter)
+			err := test.expected.ErrorIfNotEqualLists(got)
+			if err != nil {
+				test.expected.Debug("expected")
+				got.Debug("actual")
+				t.Fatalf("Expected match")
+			}
+		})
+	}
+}
+
+func addPfxSfx(r *resource.Resource, prefixes []string, suffixes []string) {
+	for _, pfx := range prefixes {
+		r.AddNamePrefix(pfx)
+	}
+
+	for _, sfx := range suffixes {
+		r.AddNameSuffix(sfx)
+	}
+}
+
+func TestSubsetThatCouldBeReferencedByResourceMultiLevel(t *testing.T) {
+	// Simulates ConfigMap and Deployment defined at level 1
+	// No prefix nor suffix added at that level
+	cm1 := rf.FromMap(
+		map[string]interface{}{
+			"apiVersion": "v1",
+			"kind":       "ConfigMap",
+			"metadata": map[string]interface{}{
+				"name": "level1",
+			},
+		})
+	addPfxSfx(cm1, []string{""}, []string{""})
+	dep1 := rf.FromMap(
+		map[string]interface{}{
+			"apiVersion": "v1",
+			"kind":       "Deployment",
+			"metadata": map[string]interface{}{
+				"name": "level1",
+			},
+		})
+	addPfxSfx(dep1, []string{""}, []string{""})
+
+	// Simulates ConfigMap and Deployment defined at level 1
+	// and prefix added in level 2 of kustomization
+	cm2p := rf.FromMap(
+		map[string]interface{}{
+			"apiVersion": "v1",
+			"kind":       "ConfigMap",
+			"metadata": map[string]interface{}{
+				"name": "level2p",
+			},
+		})
+	addPfxSfx(cm2p, []string{"", "level2p-"}, []string{"", ""})
+
+	dep2p := rf.FromMap(
+		map[string]interface{}{
+			"apiVersion": "v1",
+			"kind":       "Deployment",
+			"metadata": map[string]interface{}{
+				"name": "level2p",
+			},
+		})
+	addPfxSfx(dep2p, []string{"", "level2p-"}, []string{"", ""})
+
+	// Simulates ConfigMap and Deployment defined at level 1
+	// and suffix added in level 2 of kustomization
+	cm2s := rf.FromMap(
+		map[string]interface{}{
+			"apiVersion": "v1",
+			"kind":       "ConfigMap",
+			"metadata": map[string]interface{}{
+				"name": "level2s",
+			},
+		})
+	addPfxSfx(cm2s, []string{"", ""}, []string{"", "-level2s"})
+
+	dep2s := rf.FromMap(
+		map[string]interface{}{
+			"apiVersion": "v1",
+			"kind":       "Deployment",
+			"metadata": map[string]interface{}{
+				"name": "level2s",
+			},
+		})
+	addPfxSfx(dep2s, []string{"", ""}, []string{"", "-level2s"})
+
+	// Simulates ConfigMap and Deployment defined at level 1,
+	// prefix added in levels 2 and 3 of kustomization.
+	cm3e := rf.FromMap(
+		map[string]interface{}{
+			"apiVersion": "v1",
+			"kind":       "ConfigMap",
+			"metadata": map[string]interface{}{
+				"name": "level3e",
+			},
+		})
+	addPfxSfx(cm3e, []string{"", "level2p-", "level3e-"}, []string{"", "", ""})
+
+	dep3e := rf.FromMap(
+		map[string]interface{}{
+			"apiVersion": "v1",
+			"kind":       "Deployment",
+			"metadata": map[string]interface{}{
+				"name": "level3e",
+			},
+		})
+	addPfxSfx(dep3e, []string{"", "level2p-", "level3e-"}, []string{"", "", ""})
+
+	// Simulates Deployment defined at level 1, ConfigMap defined at level 2,
+	// prefix added in levels 2 and 3 of kustomization.
+	// This reproduce issue 1440.
+	cm3i := rf.FromMap(
+		map[string]interface{}{
+			"apiVersion": "v1",
+			"kind":       "ConfigMap",
+			"metadata": map[string]interface{}{
+				"name": "level3i",
+			},
+		})
+	addPfxSfx(cm3i, []string{"level2p-", "level3i-"}, []string{"", ""})
+
+	dep3i := rf.FromMap(
+		map[string]interface{}{
+			"apiVersion": "v1",
+			"kind":       "Deployment",
+			"metadata": map[string]interface{}{
+				"name": "level3i",
+			},
+		})
+	addPfxSfx(dep3i, []string{"", "level2p-", "level3i-"}, []string{"", "", ""})
+
+	tests := map[string]struct {
+		filter   *resource.Resource
+		expected ResMap
+	}{
+		"level1": {
+			filter: dep1,
+			expected: resmaptest_test.NewRmBuilder(t, rf).
+				AddR(cm1).AddR(dep1).ResMap(),
+		},
+		"level2p": {
+			filter: dep2p,
+			expected: resmaptest_test.NewRmBuilder(t, rf).
+				AddR(cm2p).AddR(dep2p).ResMap(),
+		},
+		"level2s": {
+			filter: dep2s,
+			expected: resmaptest_test.NewRmBuilder(t, rf).
+				AddR(cm2s).AddR(dep2s).ResMap(),
+		},
+		"level3p": {
+			filter: dep3e,
+			expected: resmaptest_test.NewRmBuilder(t, rf).
+				AddR(cm3e).AddR(dep3e).ResMap(),
+		},
+		"level3i": {
+			filter: dep3i,
+			expected: resmaptest_test.NewRmBuilder(t, rf).
+				AddR(cm3i).AddR(dep3i).ResMap(),
+		},
+	}
+	m := resmaptest_test.NewRmBuilder(t, rf).
+		AddR(cm1).AddR(dep1).AddR(cm2s).AddR(dep2s).AddR(cm2p).AddR(dep2p).AddR(cm3e).AddR(dep3e).AddR(cm3i).AddR(dep3i).ResMap()
+	for name, test := range tests {
+		test := test
+		t.Run(name, func(t *testing.T) {
+			got := m.SubsetThatCouldBeReferencedByResource(test.filter)
+			err := test.expected.ErrorIfNotEqualLists(got)
+			if err != nil {
+				test.expected.Debug("expected")
+				got.Debug("actual")
+				t.Fatalf("Expected match")
+			}
+		})
+	}
+}
+
+func TestDeepCopy(t *testing.T) {
+	rm1 := resmaptest_test.NewRmBuilder(t, rf).Add(
+		map[string]interface{}{
+			"apiVersion": "v1",
+			"kind":       "ConfigMap",
+			"metadata": map[string]interface{}{
+				"name": "cm1",
+			},
+		}).Add(
+		map[string]interface{}{
+			"apiVersion": "v1",
+			"kind":       "ConfigMap",
+			"metadata": map[string]interface{}{
+				"name": "cm2",
+			},
+		}).ResMap()
+
+	rm2 := rm1.DeepCopy()
+
+	if &rm1 == &rm2 {
+		t.Fatal("DeepCopy returned a reference to itself instead of a copy")
+	}
+	err := rm1.ErrorIfNotEqualLists(rm1)
+	if err != nil {
+		t.Fatal(err)
+	}
+}
+
+func TestErrorIfNotEqualSets(t *testing.T) {
+	r1 := rf.FromMap(
+		map[string]interface{}{
+			"apiVersion": "v1",
+			"kind":       "ConfigMap",
+			"metadata": map[string]interface{}{
+				"name": "cm1",
+			},
+		})
+	r2 := rf.FromMap(
+		map[string]interface{}{
+			"apiVersion": "v1",
+			"kind":       "ConfigMap",
+			"metadata": map[string]interface{}{
+				"name": "cm2",
+			},
+		})
+	r3 := rf.FromMap(
+		map[string]interface{}{
+			"apiVersion": "v1",
+			"kind":       "ConfigMap",
+			"metadata": map[string]interface{}{
+				"name":      "cm2",
+				"namespace": "system",
+			},
+		})
+
+	m1 := resmaptest_test.NewRmBuilder(t, rf).AddR(r1).AddR(r2).AddR(r3).ResMap()
+	if err := m1.ErrorIfNotEqualSets(m1); err != nil {
+		t.Fatalf("object should equal itself %v", err)
+	}
+
+	m2 := resmaptest_test.NewRmBuilder(t, rf).AddR(r1).ResMap()
+	if err := m1.ErrorIfNotEqualSets(m2); err == nil {
+		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(
+		map[string]interface{}{
+			"apiVersion": "v1",
+			"kind":       "ConfigMap",
+			"metadata": map[string]interface{}{
+				"name": "cm1",
+			}}).ResMap()
+	if err := m2.ErrorIfNotEqualSets(m3); err != nil {
+		t.Fatalf("%v should equal %v %v", m2, m3, err)
+	}
+
+	m4 := resmaptest_test.NewRmBuilder(t, rf).AddR(r1).AddR(r2).AddR(r3).ResMap()
+	if err := m1.ErrorIfNotEqualSets(m4); err != nil {
+		t.Fatalf("expected equality between %v and %v, %v", m1, m4, err)
+	}
+
+	m4 = resmaptest_test.NewRmBuilder(t, rf).AddR(r3).AddR(r1).AddR(r2).ResMap()
+	if err := m1.ErrorIfNotEqualSets(m4); err != nil {
+		t.Fatalf("expected equality between %v and %v, %v", m1, m4, err)
+	}
+
+	m4 = m1.ShallowCopy()
+	if err := m1.ErrorIfNotEqualSets(m4); err != nil {
+		t.Fatalf("expected equality between %v and %v, %v", m1, m4, err)
+	}
+	m4 = m1.DeepCopy()
+	if err := m1.ErrorIfNotEqualSets(m4); err != nil {
+		t.Fatalf("expected equality between %v and %v, %v", m1, m4, err)
+	}
+}
+
+func TestErrorIfNotEqualLists(t *testing.T) {
+	r1 := rf.FromMap(
+		map[string]interface{}{
+			"apiVersion": "v1",
+			"kind":       "ConfigMap",
+			"metadata": map[string]interface{}{
+				"name": "cm1",
+			},
+		})
+	r2 := rf.FromMap(
+		map[string]interface{}{
+			"apiVersion": "v1",
+			"kind":       "ConfigMap",
+			"metadata": map[string]interface{}{
+				"name": "cm2",
+			},
+		})
+	r3 := rf.FromMap(
+		map[string]interface{}{
+			"apiVersion": "v1",
+			"kind":       "ConfigMap",
+			"metadata": map[string]interface{}{
+				"name":      "cm2",
+				"namespace": "system",
+			},
+		})
+
+	m1 := resmaptest_test.NewRmBuilder(t, rf).AddR(r1).AddR(r2).AddR(r3).ResMap()
+	if err := m1.ErrorIfNotEqualLists(m1); err != nil {
+		t.Fatalf("object should equal itself %v", err)
+	}
+
+	m2 := resmaptest_test.NewRmBuilder(t, rf).AddR(r1).ResMap()
+	if err := m1.ErrorIfNotEqualLists(m2); err == nil {
+		t.Fatalf("%v should not equal %v %v", m1, m2, err)
+	}
+
+	m3 := resmaptest_test.NewRmBuilder(t, rf).Add(
+		map[string]interface{}{
+			"apiVersion": "v1",
+			"kind":       "ConfigMap",
+			"metadata": map[string]interface{}{
+				"name": "cm1",
+			}}).ResMap()
+	if err := m2.ErrorIfNotEqualLists(m3); err != nil {
+		t.Fatalf("%v should equal %v %v", m2, m3, err)
+	}
+
+	m4 := resmaptest_test.NewRmBuilder(t, rf).AddR(r1).AddR(r2).AddR(r3).ResMap()
+	if err := m1.ErrorIfNotEqualLists(m4); err != nil {
+		t.Fatalf("expected equality between %v and %v, %v", m1, m4, err)
+	}
+
+	m4 = resmaptest_test.NewRmBuilder(t, rf).AddR(r3).AddR(r1).AddR(r2).ResMap()
+	if err := m1.ErrorIfNotEqualLists(m4); err == nil {
+		t.Fatalf("expected inequality between %v and %v, %v", m1, m4, err)
+	}
+
+	m4 = m1.ShallowCopy()
+	if err := m1.ErrorIfNotEqualLists(m4); err != nil {
+		t.Fatalf("expected equality between %v and %v, %v", m1, m4, err)
+	}
+	m4 = m1.DeepCopy()
+	if err := m1.ErrorIfNotEqualLists(m4); err != nil {
+		t.Fatalf("expected equality between %v and %v, %v", m1, m4, err)
+	}
+}
+
+func TestAppendAll(t *testing.T) {
+	r1 := rf.FromMap(
+		map[string]interface{}{
+			"apiVersion": "apps/v1",
+			"kind":       "Deployment",
+			"metadata": map[string]interface{}{
+				"name": "foo-deploy1",
+			},
+		})
+	input1 := rmF.FromResource(r1)
+	r2 := rf.FromMap(
+		map[string]interface{}{
+			"apiVersion": "apps/v1",
+			"kind":       "StatefulSet",
+			"metadata": map[string]interface{}{
+				"name": "bar-stateful",
+			},
+		})
+	input2 := rmF.FromResource(r2)
+
+	expected := New()
+	if err := expected.Append(r1); err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	if err := expected.Append(r2); err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	if err := input1.AppendAll(input2); err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	if err := expected.ErrorIfNotEqualLists(input1); err != nil {
+		input1.Debug("1")
+		expected.Debug("ex")
+		t.Fatalf("%#v doesn't equal expected %#v", input1, expected)
+	}
+	if err := input1.AppendAll(nil); err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	if err := expected.ErrorIfNotEqualLists(input1); err != nil {
+		t.Fatalf("%#v doesn't equal expected %#v", input1, expected)
+	}
+}
+
+func makeMap1() ResMap {
+	return rmF.FromResource(rf.FromMapAndOption(
+		map[string]interface{}{
+			"apiVersion": "apps/v1",
+			"kind":       "ConfigMap",
+			"metadata": map[string]interface{}{
+				"name": "cmap",
+			},
+			"data": map[string]interface{}{
+				"a": "x",
+				"b": "y",
+			},
+		}, &types.GeneratorArgs{
+			Behavior: "create",
+		}))
+}
+
+func makeMap2(b types.GenerationBehavior) ResMap {
+	return rmF.FromResource(rf.FromMapAndOption(
+		map[string]interface{}{
+			"apiVersion": "apps/v1",
+			"kind":       "ConfigMap",
+			"metadata": map[string]interface{}{
+				"name": "cmap",
+			},
+			"data": map[string]interface{}{
+				"a": "u",
+				"b": "v",
+				"c": "w",
+			},
+		}, &types.GeneratorArgs{
+			Behavior: b.String(),
+		}))
+}
+
+func TestAbsorbAll(t *testing.T) {
+	expected := rmF.FromResource(rf.FromMapAndOption(
+		map[string]interface{}{
+			"apiVersion": "apps/v1",
+			"kind":       "ConfigMap",
+			"metadata": map[string]interface{}{
+				"annotations": map[string]interface{}{},
+				"labels":      map[string]interface{}{},
+				"name":        "cmap",
+			},
+			"data": map[string]interface{}{
+				"a": "u",
+				"b": "v",
+				"c": "w",
+			},
+		}, &types.GeneratorArgs{
+			Behavior: "create",
+		}))
+	w := makeMap1()
+	if err := w.AbsorbAll(makeMap2(types.BehaviorMerge)); err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	if err := expected.ErrorIfNotEqualLists(w); err != nil {
+		t.Fatal(err)
+	}
+	w = makeMap1()
+	if err := w.AbsorbAll(nil); err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	if err := w.ErrorIfNotEqualLists(makeMap1()); err != nil {
+		t.Fatal(err)
+	}
+	w = makeMap1()
+	w2 := makeMap2(types.BehaviorReplace)
+	if err := w.AbsorbAll(w2); err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	if err := w2.ErrorIfNotEqualLists(w); err != nil {
+		t.Fatal(err)
+	}
+	w = makeMap1()
+	w2 = makeMap2(types.BehaviorUnspecified)
+	err := w.AbsorbAll(w2)
+	if err == nil {
+		t.Fatalf("expected error with unspecified behavior")
+	}
+}

api/resource/resource.go

@@ -14,55 +14,9 @@ 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 a representation of a Kubernetes Resource Model (KRM) object
+// paired with metadata used by kustomize.
+// For more history, see sigs.k8s.io/kustomize/api/ifc.Unstructured
 type Resource struct {
 	kunStr       ifc.Kunstructured
 	originalName string
@@ -75,7 +29,7 @@ type Resource struct {
 }
 
 func (r *Resource) ResetPrimaryData(incoming *Resource) {
-	r.kunStr = incoming.kunStr.Copy()
+	r.kunStr = incoming.Copy()
 }
 
 func (r *Resource) GetAnnotations() map[string]string {
@@ -86,26 +40,14 @@ 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()
 }
@@ -114,10 +56,6 @@ 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()
 }
@@ -130,14 +68,6 @@ 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()
 }
@@ -154,10 +84,6 @@ 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)
 }
@@ -170,10 +96,6 @@ 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)
 }
@@ -205,7 +127,7 @@ type ResCtxMatcher func(ResCtx) bool
 // DeepCopy returns a new copy of resource
 func (r *Resource) DeepCopy() *Resource {
 	rc := &Resource{
-		kunStr: r.kunStr.Copy(),
+		kunStr: r.Copy(),
 	}
 	rc.copyOtherFields(r)
 	return rc
@@ -213,11 +135,10 @@ 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)
 }
 
@@ -258,7 +179,7 @@ func (r *Resource) KunstructEqual(o *Resource) bool {
 // 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 +305,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 +315,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 +340,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 +350,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 +358,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

@@ -16,7 +16,7 @@ import (
 	"sigs.k8s.io/kustomize/api/types"
 )
 
-// Harness manages a kustomize environment for tests.
+// Harness manages a test environment.
 type Harness struct {
 	t    *testing.T
 	fSys filesys.FileSystem
@@ -72,15 +72,12 @@ func (th Harness) MakeDefaultOptions() krusty.Options {
 
 // This has no impact on Builtin plugins, as they are always enabled.
 func (th Harness) MakeOptionsPluginsDisabled() krusty.Options {
-	return krusty.Options{
-		LoadRestrictions: types.LoadRestrictionsRootOnly,
-		PluginConfig:     konfig.DisabledPluginConfig(),
-	}
+	return *krusty.MakeDefaultOptions()
 }
 
 // Enables use of non-builtin plugins.
 func (th Harness) MakeOptionsPluginsEnabled() krusty.Options {
-	c, err := konfig.EnabledPluginConfig(types.BploLoadFromFileSys)
+	pc, err := konfig.EnabledPluginConfig(types.BploLoadFromFileSys)
 	if err != nil {
 		if strings.Contains(err.Error(), "unable to find plugin root") {
 			th.t.Log(
@@ -89,10 +86,9 @@ func (th Harness) MakeOptionsPluginsEnabled() krusty.Options {
 		}
 		th.t.Fatal(err)
 	}
-	return krusty.Options{
-		LoadRestrictions: types.LoadRestrictionsRootOnly,
-		PluginConfig:     c,
-	}
+	o := *krusty.MakeDefaultOptions()
+	o.PluginConfig = pc
+	return o
 }
 
 // Run, failing on error.

api/testutils/kusttest/harnessenhanced.go

@@ -8,7 +8,7 @@ import (
 
 	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/api/ifc"
-	"sigs.k8s.io/kustomize/api/internal/k8sdeps/transformer"
+	"sigs.k8s.io/kustomize/api/internal/k8sdeps/merge"
 	pLdr "sigs.k8s.io/kustomize/api/internal/plugins/loader"
 	"sigs.k8s.io/kustomize/api/k8sdeps/kunstruct"
 	"sigs.k8s.io/kustomize/api/konfig"
@@ -46,16 +46,17 @@ func MakeEnhancedHarness(t *testing.T) *HarnessEnhanced {
 	if err != nil {
 		t.Fatal(err)
 	}
-
-	rf := resmap.NewFactory(
-		resource.NewFactory(kunstruct.NewKunstructuredFactoryImpl()),
-		transformer.NewFactoryImpl())
+	resourceFactory := resource.NewFactory(
+		kunstruct.NewKunstructuredFactoryImpl())
+	resmapFactory := resmap.NewFactory(
+		resourceFactory,
+		merge.NewMerginator(resourceFactory))
 
 	result := &HarnessEnhanced{
 		Harness: MakeHarness(t),
 		pte:     pte,
-		rf:      rf,
-		pl:      pLdr.NewLoader(pc, rf)}
+		rf:      resmapFactory,
+		pl:      pLdr.NewLoader(pc, resmapFactory)}
 
 	// Point the file loader to the root ('/') of the in-memory file system.
 	result.ResetLoaderRoot(filesys.Separator)

api/transform/mutatefield.go

@@ -1,77 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package transform
-
-import (
-	"fmt"
-	"log"
-	"strings"
-)
-
-type mutateFunc func(interface{}) (interface{}, error)
-
-func MutateField(
-	m map[string]interface{},
-	pathToField []string,
-	createIfNotPresent bool,
-	fns ...mutateFunc) error {
-	if len(pathToField) == 0 {
-		return nil
-	}
-
-	firstPathSegment, isArray := getFirstPathSegment(pathToField)
-
-	_, found := m[firstPathSegment]
-	if !found {
-		if !createIfNotPresent || isArray {
-			return nil
-		}
-		m[firstPathSegment] = map[string]interface{}{}
-	}
-
-	if len(pathToField) == 1 {
-		var err error
-		for _, fn := range fns {
-			m[firstPathSegment], err = fn(m[firstPathSegment])
-			if err != nil {
-				return err
-			}
-		}
-		return nil
-	}
-
-	v := m[firstPathSegment]
-	newPathToField := pathToField[1:]
-	switch typedV := v.(type) {
-	case nil:
-		log.Printf(
-			"nil value at `%s` ignored in mutation attempt",
-			strings.Join(pathToField, "."))
-		return nil
-	case map[string]interface{}:
-		return MutateField(typedV, newPathToField, createIfNotPresent, fns...)
-	case []interface{}:
-		for i := range typedV {
-			item := typedV[i]
-			typedItem, ok := item.(map[string]interface{})
-			if !ok {
-				return fmt.Errorf("%#v is expected to be %T", item, typedItem)
-			}
-			err := MutateField(typedItem, newPathToField, createIfNotPresent, fns...)
-			if err != nil {
-				return err
-			}
-		}
-		return nil
-	default:
-		return fmt.Errorf("%#v is not expected to be a primitive type", typedV)
-	}
-}
-
-func getFirstPathSegment(pathToField []string) (string, bool) {
-	if strings.HasSuffix(pathToField[0], "[]") {
-		return pathToField[0][:len(pathToField[0])-2], true
-	}
-	return pathToField[0], false
-}

api/transform/mutatefield_test.go

@@ -1,157 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package transform_test
-
-import (
-	"fmt"
-	"testing"
-
-	"sigs.k8s.io/kustomize/api/ifc"
-	"sigs.k8s.io/kustomize/api/k8sdeps/kunstruct"
-	. "sigs.k8s.io/kustomize/api/transform"
-)
-
-type noopMutator struct {
-	wasCalled     bool
-	errorToReturn error
-}
-
-var errExpected = fmt.Errorf("oops")
-
-const originalValue = "tomato"
-const newValue = "notThe" + originalValue
-
-func (m *noopMutator) mutate(_ interface{}) (interface{}, error) {
-	m.wasCalled = true
-	return newValue, m.errorToReturn
-}
-
-func makeTestDeployment() ifc.Kunstructured {
-	factory := kunstruct.NewKunstructuredFactoryImpl()
-	return factory.FromMap(
-		map[string]interface{}{
-			"group":      "apps",
-			"apiVersion": "v1",
-			"kind":       "Deployment",
-			"metadata": map[string]interface{}{
-				"name": originalValue,
-			},
-			"spec": map[string]interface{}{
-				"template": map[string]interface{}{
-					"env": []interface{}{
-						map[string]interface{}{
-							"name":  "HELLO",
-							"value": "hi there",
-						},
-						map[string]interface{}{
-							"name":  "GOODBYE",
-							"value": "adios!",
-						},
-					},
-					"metadata": map[string]interface{}{
-						"labels": map[string]interface{}{
-							"vegetable": originalValue,
-						},
-					},
-					"spec": map[string]interface{}{
-						"containers": []interface{}{
-							map[string]interface{}{
-								"name":  "tangerine",
-								"image": originalValue,
-							},
-						},
-					},
-				},
-			},
-		})
-}
-
-func getFieldValue(t *testing.T, obj ifc.Kunstructured, fieldName string) string {
-	v, err := obj.GetString(fieldName)
-	if err != nil {
-		t.Fatalf("unexpected field error: %v", err)
-	}
-	return v
-}
-
-func TestNoPath(t *testing.T) {
-	obj := makeTestDeployment()
-	m := &noopMutator{}
-	err := MutateField(
-		obj.Map(), []string{}, false, m.mutate)
-	if m.wasCalled {
-		t.Fatalf("mutator should not have been called.")
-	}
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-}
-
-func TestHappyPath(t *testing.T) {
-	obj := makeTestDeployment()
-	v := getFieldValue(t, obj, "metadata.name")
-	if v != originalValue {
-		t.Fatalf("unexpected original value: %v", v)
-	}
-	v = getFieldValue(t, obj, "spec.template.metadata.labels.vegetable")
-	if v != originalValue {
-		t.Fatalf("unexpected original value: %v", v)
-	}
-
-	m := &noopMutator{}
-	err := MutateField(
-		obj.Map(), []string{"metadata", "name"}, false, m.mutate)
-	if !m.wasCalled {
-		t.Fatalf("mutator should have been called.")
-	}
-	if err != nil {
-		t.Fatalf("unexpected mutate error: %v", err)
-	}
-	v = getFieldValue(t, obj, "metadata.name")
-	if v != newValue {
-		t.Fatalf("unexpected new value: %v", v)
-	}
-
-	m = &noopMutator{}
-	err = MutateField(
-		obj.Map(), []string{"spec", "template", "metadata", "labels", "vegetable"}, false, m.mutate)
-	if !m.wasCalled {
-		t.Fatalf("mutator should have been called.")
-	}
-	if err != nil {
-		t.Fatalf("unexpected mutate error: %v", err)
-	}
-	v = getFieldValue(t, obj, "spec.template.metadata.labels.vegetable")
-	if v != newValue {
-		t.Fatalf("unexpected new value: %v", v)
-	}
-}
-
-func TestWithError(t *testing.T) {
-	obj := makeTestDeployment()
-	m := noopMutator{errorToReturn: errExpected}
-	err := MutateField(
-		obj.Map(), []string{"metadata", "name"}, false, m.mutate)
-	if !m.wasCalled {
-		t.Fatalf("mutator was not called!")
-	}
-	if err != errExpected {
-		t.Fatalf("unexpected error: %v", err)
-	}
-}
-
-func TestWithNil(t *testing.T) {
-	obj := makeTestDeployment()
-	foo := obj.Map()["spec"]
-	foo = foo.(map[string]interface{})["template"]
-	foo = foo.(map[string]interface{})["metadata"]
-	foo.(map[string]interface{})["labels"] = nil
-
-	m := &noopMutator{}
-	err := MutateField(
-		obj.Map(), []string{"spec", "template", "metadata", "labels", "vegetable"}, false, m.mutate)
-	if err != nil {
-		t.Fatalf("Unexpected error: %v", err)
-	}
-}

api/types/kustomization_test.go

@@ -5,9 +5,11 @@ import (
 )
 
 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)
+	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) {

cmd/config/configcobra/live.go

@@ -54,9 +54,9 @@ func GetLive(name string) *cobra.Command {
 	cmd.AddCommand(
 		applyCmd,
 		initcmd.NewCmdInit(ioStreams),
-		preview.NewCmdPreview(f, ioStreams),
+		preview.GetPreviewRunner(f, ioStreams).Command,
 		diff.NewCmdDiff(f, ioStreams),
-		destroy.NewCmdDestroy(f, ioStreams))
+		destroy.GetDestroyRunner(f, ioStreams).Command)
 	return cmd
 }
 

cmd/config/go.mod

@@ -14,8 +14,8 @@ require (
 	k8s.io/cli-runtime v0.17.3
 	k8s.io/client-go v0.17.3
 	k8s.io/kubectl v0.0.0-20191219154910-1528d4eea6dd
-	sigs.k8s.io/cli-utils v0.18.0
-	sigs.k8s.io/kustomize/kyaml v0.6.0
+	sigs.k8s.io/cli-utils v0.19.0
+	sigs.k8s.io/kustomize/kyaml v0.6.1
 )
 
 replace sigs.k8s.io/kustomize/kyaml => ../../kyaml

cmd/config/go.sum

@@ -369,6 +369,7 @@ github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DM
 github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48=
 github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
 github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
@@ -614,8 +615,8 @@ modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk=
 modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k=
 modernc.org/strutil v1.0.0/go.mod h1:lstksw84oURvj9y3tn8lGvRxyRC1S2+g5uuIzNfIOBs=
 modernc.org/xc v1.0.0/go.mod h1:mRNCo0bvLjGhHO9WsyuKVU4q0ceiDDDoEeWDJHrNx8I=
-sigs.k8s.io/cli-utils v0.18.0 h1:PPFUhhwKsdMiYYm1DY9lZursNWSAEj8FYgMCZKVvOkQ=
-sigs.k8s.io/cli-utils v0.18.0/go.mod h1:B7KdqkSkHNIUn3cFbaR4aKUZMKtr+Benboi1w/HW/Fg=
+sigs.k8s.io/cli-utils v0.19.0 h1:lAoR5okhSV/dIusodaQp5VbDpHMcKnvjqKYHU+AB3a4=
+sigs.k8s.io/cli-utils v0.19.0/go.mod h1:B7KdqkSkHNIUn3cFbaR4aKUZMKtr+Benboi1w/HW/Fg=
 sigs.k8s.io/controller-runtime v0.4.0 h1:wATM6/m+3w8lj8FXNaO6Fs/rq/vqoOjO1Q116Z9NPsg=
 sigs.k8s.io/controller-runtime v0.4.0/go.mod h1:ApC79lpY3PHW9xj/w9pj+lYkLgwAAUZwfXkME1Lajns=
 sigs.k8s.io/kustomize v2.0.3+incompatible h1:JUufWFNlI44MdtnjUqVnvh29rR37PQFzPbLXqhyOyX0=

functions/examples/application-cr/image/go.mod

@@ -5,6 +5,6 @@ go 1.14
 require (
 	k8s.io/apimachinery v0.18.3
 	sigs.k8s.io/application v0.8.2
-	sigs.k8s.io/kustomize/kyaml v0.5.0
+	sigs.k8s.io/kustomize/kyaml v0.6.1
 	sigs.k8s.io/yaml v1.2.0
 )

functions/examples/application-cr/image/go.sum

@@ -327,6 +327,7 @@ github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DM
 github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48=
 github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
 github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
@@ -558,8 +559,8 @@ sigs.k8s.io/application v0.8.2 h1:XB7C33f7eW+1MbCJXoZa0+nP+R+S/VbAvYfCd3ufP1I=
 sigs.k8s.io/application v0.8.2/go.mod h1:Mv+ht9RE/QNtITYCzRbt3XTIN6t6so6cInmiyg6wOIg=
 sigs.k8s.io/controller-runtime v0.4.0 h1:wATM6/m+3w8lj8FXNaO6Fs/rq/vqoOjO1Q116Z9NPsg=
 sigs.k8s.io/controller-runtime v0.4.0/go.mod h1:ApC79lpY3PHW9xj/w9pj+lYkLgwAAUZwfXkME1Lajns=
-sigs.k8s.io/kustomize/kyaml v0.5.0 h1:xufpSxgpugQxtd0aN1ZsWnr3Kj0fpAi7GN4dnEs4oPg=
-sigs.k8s.io/kustomize/kyaml v0.5.0/go.mod h1:bEzbO5pN9OvlEeCLvFHo8Pu7SA26Herc2m60UeWZBdI=
+sigs.k8s.io/kustomize/kyaml v0.6.1 h1:mwffj5vt3MPdbWV3fZnnwol8SO7sUoGdgejBlvseyak=
+sigs.k8s.io/kustomize/kyaml v0.6.1/go.mod h1:bEzbO5pN9OvlEeCLvFHo8Pu7SA26Herc2m60UeWZBdI=
 sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI=
 sigs.k8s.io/structured-merge-diff v0.0.0-20190817042607-6149e4549fca/go.mod h1:IIgPezJWb76P0hotTxzDbWsMYB8APh18qZnxkomBpxA=
 sigs.k8s.io/structured-merge-diff v1.0.1-0.20191108220359-b1b620dd3f06 h1:zD2IemQ4LmOcAumeiyDWXKUI2SO0NYDe3H6QGvPOVgU=

functions/examples/injection-tshirt-sizes/image/go.mod

@@ -2,4 +2,4 @@ module sigs.k8s.io/kustomize/functions/examples/injection-tshirt-sizes
 
 go 1.14
 
-require sigs.k8s.io/kustomize/kyaml v0.5.0
+require sigs.k8s.io/kustomize/kyaml v0.6.1

functions/examples/injection-tshirt-sizes/image/go.sum

@@ -174,6 +174,7 @@ github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An
 github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48=
 github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.2.3-0.20181224173747-660f15d67dbb/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
@@ -262,5 +263,5 @@ gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200121175148-a6ecf24a6d71 h1:Xe2gvTZUJpsvOWUnvmL/tmhVBZUmHSvLbMjRj6NUUKo=
 gopkg.in/yaml.v3 v3.0.0-20200121175148-a6ecf24a6d71/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-sigs.k8s.io/kustomize/kyaml v0.5.0 h1:xufpSxgpugQxtd0aN1ZsWnr3Kj0fpAi7GN4dnEs4oPg=
-sigs.k8s.io/kustomize/kyaml v0.5.0/go.mod h1:bEzbO5pN9OvlEeCLvFHo8Pu7SA26Herc2m60UeWZBdI=
+sigs.k8s.io/kustomize/kyaml v0.6.1 h1:mwffj5vt3MPdbWV3fZnnwol8SO7sUoGdgejBlvseyak=
+sigs.k8s.io/kustomize/kyaml v0.6.1/go.mod h1:bEzbO5pN9OvlEeCLvFHo8Pu7SA26Herc2m60UeWZBdI=

functions/examples/template-go-nginx/image/go.mod

@@ -2,4 +2,4 @@ module sigs.k8s.io/kustomize/functions/examples/template-go-nginx
 
 go 1.14
 
-require sigs.k8s.io/kustomize/kyaml v0.5.0
+require sigs.k8s.io/kustomize/kyaml v0.6.1

functions/examples/template-go-nginx/image/go.sum

@@ -175,6 +175,7 @@ github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An
 github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48=
 github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.2.3-0.20181224173747-660f15d67dbb/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
@@ -263,5 +264,5 @@ gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200121175148-a6ecf24a6d71 h1:Xe2gvTZUJpsvOWUnvmL/tmhVBZUmHSvLbMjRj6NUUKo=
 gopkg.in/yaml.v3 v3.0.0-20200121175148-a6ecf24a6d71/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-sigs.k8s.io/kustomize/kyaml v0.5.0 h1:xufpSxgpugQxtd0aN1ZsWnr3Kj0fpAi7GN4dnEs4oPg=
-sigs.k8s.io/kustomize/kyaml v0.5.0/go.mod h1:bEzbO5pN9OvlEeCLvFHo8Pu7SA26Herc2m60UeWZBdI=
+sigs.k8s.io/kustomize/kyaml v0.6.1 h1:mwffj5vt3MPdbWV3fZnnwol8SO7sUoGdgejBlvseyak=
+sigs.k8s.io/kustomize/kyaml v0.6.1/go.mod h1:bEzbO5pN9OvlEeCLvFHo8Pu7SA26Herc2m60UeWZBdI=

functions/examples/validator-kubeval/image/go.mod

@@ -4,5 +4,5 @@ go 1.14
 
 require (
 	github.com/instrumenta/kubeval v0.0.0-20190918223246-8d013ec9fc56
-	sigs.k8s.io/kustomize/kyaml v0.5.0
+	sigs.k8s.io/kustomize/kyaml v0.6.1
 )

functions/examples/validator-kubeval/image/go.sum

@@ -195,6 +195,7 @@ github.com/spf13/viper v1.1.0/go.mod h1:A8kyI5cUJhb8N+3pkfONlcEcZbueH6nhAm0Fq7Sr
 github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48=
 github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.2.3-0.20181224173747-660f15d67dbb/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
@@ -293,7 +294,7 @@ gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200121175148-a6ecf24a6d71 h1:Xe2gvTZUJpsvOWUnvmL/tmhVBZUmHSvLbMjRj6NUUKo=
 gopkg.in/yaml.v3 v3.0.0-20200121175148-a6ecf24a6d71/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-sigs.k8s.io/kustomize/kyaml v0.5.0 h1:xufpSxgpugQxtd0aN1ZsWnr3Kj0fpAi7GN4dnEs4oPg=
-sigs.k8s.io/kustomize/kyaml v0.5.0/go.mod h1:bEzbO5pN9OvlEeCLvFHo8Pu7SA26Herc2m60UeWZBdI=
+sigs.k8s.io/kustomize/kyaml v0.6.1 h1:mwffj5vt3MPdbWV3fZnnwol8SO7sUoGdgejBlvseyak=
+sigs.k8s.io/kustomize/kyaml v0.6.1/go.mod h1:bEzbO5pN9OvlEeCLvFHo8Pu7SA26Herc2m60UeWZBdI=
 sigs.k8s.io/yaml v1.1.0 h1:4A07+ZFc2wgJwo8YNlQpr1rVlgUDlxXHhPJciaPY5gs=
 sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=

functions/examples/validator-resource-requests/image/go.mod

@@ -2,4 +2,4 @@ module sigs.k8s.io/kustomize/functions/examples/validator-resource-requests
 
 go 1.14
 
-require sigs.k8s.io/kustomize/kyaml v0.5.0
+require sigs.k8s.io/kustomize/kyaml v0.6.1

functions/examples/validator-resource-requests/image/go.sum

@@ -168,6 +168,7 @@ github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An
 github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48=
 github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.2.3-0.20181224173747-660f15d67dbb/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
@@ -256,5 +257,5 @@ gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200121175148-a6ecf24a6d71 h1:Xe2gvTZUJpsvOWUnvmL/tmhVBZUmHSvLbMjRj6NUUKo=
 gopkg.in/yaml.v3 v3.0.0-20200121175148-a6ecf24a6d71/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-sigs.k8s.io/kustomize/kyaml v0.5.0 h1:xufpSxgpugQxtd0aN1ZsWnr3Kj0fpAi7GN4dnEs4oPg=
-sigs.k8s.io/kustomize/kyaml v0.5.0/go.mod h1:bEzbO5pN9OvlEeCLvFHo8Pu7SA26Herc2m60UeWZBdI=
+sigs.k8s.io/kustomize/kyaml v0.6.1 h1:mwffj5vt3MPdbWV3fZnnwol8SO7sUoGdgejBlvseyak=
+sigs.k8s.io/kustomize/kyaml v0.6.1/go.mod h1:bEzbO5pN9OvlEeCLvFHo8Pu7SA26Herc2m60UeWZBdI=

hack/pinUnpinPluginApiDep.sh

@@ -6,13 +6,13 @@
 # released version of the kustomize API,
 # run this from the repo root:
 #
-#   ./hack/pinUnpinPluginApiDep.sh pin v0.2.0
+#   ./hack/pinUnpinPluginApiDep.sh pin api v0.2.0
 #
 # To replace fixed dependence with
 # dependence on local filesystem (HEAD)
 # run this from the repo root:
 #
-#   ./hack/pinUnpinPluginApiDep.sh unPin
+#   ./hack/pinUnpinPluginApiDep.sh unPin api
 #
 # All plugins, even plugins not written in Go,
 # have a unit test written in Go that depends
@@ -30,29 +30,26 @@
 # they are just examples - but likely should
 # remain unpinned too.  Nothing in the outside
 # world should depend on these plugin modules,
-# so there's no reason for them to be properly
-# pinned.
-#
-# An external plugin author will obviously
-# want to pin their plugin to some set of fixed
-# dependencies, and the go.mod files for the
-# plugins in this repo are just examples of how
-# to do so.
+# so there's no reason for them to be pinned.
 
 set -o errexit
 set -o nounset
-set -o pipefail
+#set -o pipefail
 
 function doUnPin {
-  oldV=$(grep -m 1 sigs.k8s.io/kustomize/api go.mod | awk '{print $NF}')
-  go mod edit -replace=sigs.k8s.io/kustomize/api@${oldV}=$1
+  oldV=$(grep -m 1 sigs.k8s.io/kustomize/${module} go.mod | awk '{print $NF}')
+  if [ ! -z $oldV ]; then
+    go mod edit -replace=sigs.k8s.io/kustomize/${module}@${oldV}=$1
+  fi
   go mod tidy
 }
 
 function doPin {
-  oldV=$(grep -m 1 sigs.k8s.io/kustomize/api go.mod | awk '{print $NF}')
-  go mod edit -dropreplace=sigs.k8s.io/kustomize/api@${oldV}
-  go mod edit -require=sigs.k8s.io/kustomize/api@$1
+  oldV=$(grep -m 1 sigs.k8s.io/kustomize/${module} go.mod | awk '{print $NF}')
+  if [ ! -z $oldV ]; then
+    go mod edit -dropreplace=sigs.k8s.io/kustomize/${module}@${oldV}
+    go mod edit -require=sigs.k8s.io/kustomize/${module}@$1
+  fi
   go mod tidy
 }
 
@@ -65,28 +62,46 @@ function forEachGoMod {
 }
 
 function unPin {
-  forEachGoMod doUnPin ./plugin/builtin                 ../../../api
-  forEachGoMod doUnPin ./plugin/someteam.example.com/v1 ../../../../api
+  echo "Unpinning $module"
+  forEachGoMod doUnPin ./plugin/builtin                 ../../../${module}
+  forEachGoMod doUnPin ./plugin/someteam.example.com/v1 ../../../../${module}
 }
 
 function pin {
-  forEachGoMod doPin ./plugin/builtin                 $version
-  forEachGoMod doPin ./plugin/someteam.example.com/v1 $version
+  echo "Pinning $module to $version"
+  forEachGoMod doPin ./plugin/builtin                 ${version}
+  forEachGoMod doPin ./plugin/someteam.example.com/v1 ${version}
 }
 
+if [ "$#" -eq 0 ]; then
+  echo "Pin or unpin plugins, e.g."
+  echo " "
+  echo "  ./hack/pinUnpinPluginApiDep.sh pin api v0.2.0"
+  echo " "
+  echo "  ./hack/pinUnpinPluginApiDep.sh unPin api"
+  echo " "
+  exit 1
+fi
+
 operation=$1
 if [[ ("$operation" != "pin") && ("$operation" != "unPin") ]]; then
   echo "unknown operation $operation"
   exit 1
 fi
 
+module=$2
+if [[ ("$module" != "api") && ("$module" != "kyaml") ]]; then
+  echo "unknown module $module"
+  exit 1
+fi
+
 version="unnecessary"
 if [ "$operation" == "pin" ]; then
-  if [ "$#" -le 1 ]; then
+  if [ "$#" -le 2 ]; then
     echo "Specify version to pin, e.g. '$0 pin v0.2.0'"
     exit 1
   fi
-  version=$2
+  version=$3
 fi
 
 $operation

kustomize/go.sum

@@ -239,7 +239,6 @@ github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.5.1 h1:JFrFEBb2xKufg6XkJsJr+WbKb4FQlURi5RUcBveYu9k=
 github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI=
 github.com/google/gofuzz v1.0.0 h1:A8PeW59pxE9IoFRqBp37U+mSNaQoZ46F1f0f863XSXw=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
@@ -459,6 +458,7 @@ github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DM
 github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48=
 github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
 github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
@@ -742,8 +742,8 @@ modernc.org/xc v1.0.0/go.mod h1:mRNCo0bvLjGhHO9WsyuKVU4q0ceiDDDoEeWDJHrNx8I=
 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/cli-utils v0.18.0 h1:PPFUhhwKsdMiYYm1DY9lZursNWSAEj8FYgMCZKVvOkQ=
-sigs.k8s.io/cli-utils v0.18.0/go.mod h1:B7KdqkSkHNIUn3cFbaR4aKUZMKtr+Benboi1w/HW/Fg=
+sigs.k8s.io/cli-utils v0.19.0 h1:lAoR5okhSV/dIusodaQp5VbDpHMcKnvjqKYHU+AB3a4=
+sigs.k8s.io/cli-utils v0.19.0/go.mod h1:B7KdqkSkHNIUn3cFbaR4aKUZMKtr+Benboi1w/HW/Fg=
 sigs.k8s.io/controller-runtime v0.4.0 h1:wATM6/m+3w8lj8FXNaO6Fs/rq/vqoOjO1Q116Z9NPsg=
 sigs.k8s.io/controller-runtime v0.4.0/go.mod h1:ApC79lpY3PHW9xj/w9pj+lYkLgwAAUZwfXkME1Lajns=
 sigs.k8s.io/kustomize v2.0.3+incompatible h1:JUufWFNlI44MdtnjUqVnvh29rR37PQFzPbLXqhyOyX0=

kustomize/internal/commands/build/build.go

@@ -95,6 +95,7 @@ func NewCmdBuild(out io.Writer) *cobra.Command {
 	addFlagEnablePlugins(cmd.Flags())
 	addFlagReorderOutput(cmd.Flags())
 	addFlagEnableManagedbyLabel(cmd.Flags())
+	addFlagEnableKyaml(cmd.Flags())
 
 	return cmd
 }
@@ -120,25 +121,19 @@ func (o *Options) Validate(args []string) (err error) {
 }
 
 func (o *Options) makeOptions() *krusty.Options {
-	opts := &krusty.Options{
-		DoLegacyResourceSort: o.outOrder == legacy,
-		LoadRestrictions:     getFlagLoadRestrictorValue(),
-	}
+	opts := krusty.MakeDefaultOptions()
+	opts.DoLegacyResourceSort = o.outOrder == legacy
+	opts.LoadRestrictions = getFlagLoadRestrictorValue()
 	if isFlagEnablePluginsSet() {
 		c, err := konfig.EnabledPluginConfig(types.BploUseStaticallyLinked)
 		if err != nil {
 			log.Fatal(err)
 		}
-
 		c.FnpLoadingOptions = o.fnOptions
-
 		opts.PluginConfig = c
-	} else {
-		opts.PluginConfig = konfig.DisabledPluginConfig()
-	}
-	if isManagedbyLabelEnabled() {
-		opts.AddManagedbyLabel = true
 	}
+	opts.AddManagedbyLabel = isManagedbyLabelEnabled()
+	opts.UseKyaml = flagEnableKyamlValue
 	return opts
 }
 

kustomize/internal/commands/build/flagEnableKyaml.go

@@ -0,0 +1,21 @@
+// Copyright 2019 The Kubernetes Authors.
+// SPDX-License-Identifier: Apache-2.0
+
+package build
+
+import (
+	"github.com/spf13/pflag"
+)
+
+var (
+	flagEnableKyamlValue = false
+)
+
+func addFlagEnableKyaml(set *pflag.FlagSet) {
+	set.BoolVar(
+		&flagEnableKyamlValue,
+		"enable_kyaml", // flag name
+		false,          // default value
+		"enable dependence on kyaml instead of k8sdeps.", // help
+	)
+}

kyaml/fn/runtime/container/container.go

@@ -123,15 +123,7 @@ import (
 //             ├── deployment_foo.yaml
 //             └── service_bar.yaml
 type Filter struct {
-
-	// Image is the container image to use to create a container.
-	Image string `yaml:"image,omitempty"`
-
-	// Network is the container network to use.
-	Network string `yaml:"network,omitempty"`
-
-	// StorageMounts is a list of storage options that the container will have mounted.
-	StorageMounts []runtimeutil.StorageMount `yaml:"mounts,omitempty"`
+	runtimeutil.ContainerSpec `json:",inline" yaml:",inline"`
 
 	Exec runtimeexec.Filter
 }
@@ -169,19 +161,13 @@ func (c *Filter) getCommand() (string, []string) {
 	// run the container using docker.  this is simpler than using the docker
 	// libraries, and ensures things like auth work the same as if the container
 	// was run from the cli.
-
-	network := "none"
-	if c.Network != "" {
-		network = c.Network
-	}
-
 	args := []string{"run",
 		"--rm",                                              // delete the container afterward
 		"-i", "-a", "STDIN", "-a", "STDOUT", "-a", "STDERR", // attach stdin, stdout, stderr
-		"--network", network,
+		"--network", string(c.ContainerSpec.Network.Name),
 
 		// added security options
-		"--user", "nobody", // run as nobody
+		"--user", c.User.String(),
 		"--security-opt=no-new-privileges", // don't allow the user to escalate privileges
 		// note: don't make fs readonly because things like heredoc rely on writing tmp files
 	}
@@ -207,3 +193,19 @@ func (c *Filter) getCommand() (string, []string) {
 	a := append(args, c.Image)
 	return "docker", a
 }
+
+// NewContainer returns a new container filter
+func NewContainer(spec runtimeutil.ContainerSpec) Filter {
+	f := Filter{ContainerSpec: spec}
+	// default user is nobody
+	if f.ContainerSpec.User.IsEmpty() {
+		f.ContainerSpec.User = runtimeutil.UserNobody
+	}
+
+	// default network name is none
+	if f.ContainerSpec.Network.Name == "" {
+		f.ContainerSpec.Network.Name = runtimeutil.NetworkNameNone
+	}
+
+	return f
+}

kyaml/fn/runtime/container/container_test.go

@@ -38,7 +38,12 @@ metadata:
 				"--user", "nobody",
 				"--security-opt=no-new-privileges",
 			},
-			instance: Filter{Image: "example.com:version"},
+			instance: NewContainer(
+				runtimeutil.ContainerSpec{
+					Image: "example.com:version",
+					User:  "nobody",
+				},
+			),
 		},
 
 		{
@@ -56,7 +61,15 @@ metadata:
 				"--user", "nobody",
 				"--security-opt=no-new-privileges",
 			},
-			instance: Filter{Image: "example.com:version", Network: "test-1"},
+			instance: NewContainer(
+				runtimeutil.ContainerSpec{
+					Image: "example.com:version",
+					Network: runtimeutil.ContainerNetwork{
+						Name: "test-1",
+					},
+					User: "nobody",
+				},
+			),
 		},
 
 		{
@@ -78,15 +91,40 @@ metadata:
 				"--mount", fmt.Sprintf("type=%s,source=%s,target=%s,readonly", "volume", "myvol", "/local/"),
 				"--mount", fmt.Sprintf("type=%s,source=%s,target=%s,readonly", "tmpfs", "", "/local/"),
 			},
-			instance: Filter{
-				Image: "example.com:version",
-				StorageMounts: []runtimeutil.StorageMount{
-					{MountType: "bind", Src: "/mount/path", DstPath: "/local/"},
-					{MountType: "bind", Src: "/mount/pathrw", DstPath: "/localrw/", ReadWriteMode: true},
-					{MountType: "volume", Src: "myvol", DstPath: "/local/"},
-					{MountType: "tmpfs", Src: "", DstPath: "/local/"},
+			instance: NewContainer(
+				runtimeutil.ContainerSpec{
+					Image: "example.com:version",
+					StorageMounts: []runtimeutil.StorageMount{
+						{MountType: "bind", Src: "/mount/path", DstPath: "/local/"},
+						{MountType: "bind", Src: "/mount/pathrw", DstPath: "/localrw/", ReadWriteMode: true},
+						{MountType: "volume", Src: "myvol", DstPath: "/local/"},
+						{MountType: "tmpfs", Src: "", DstPath: "/local/"},
+					},
+					User: "nobody",
 				},
+			),
+		},
+		{
+			name: "root user",
+			functionConfig: `apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: foo
+`,
+			expectedArgs: []string{
+				"run",
+				"--rm",
+				"-i", "-a", "STDIN", "-a", "STDOUT", "-a", "STDERR",
+				"--network", "none",
+				"--user", "root",
+				"--security-opt=no-new-privileges",
 			},
+			instance: NewContainer(
+				runtimeutil.ContainerSpec{
+					Image: "example.com:version",
+					User:  "root",
+				},
+			),
 		},
 	}
 
@@ -183,7 +221,7 @@ metadata:
 	}
 }
 func TestFilter_String(t *testing.T) {
-	instance := Filter{Image: "foo"}
+	instance := Filter{ContainerSpec: runtimeutil.ContainerSpec{Image: "foo"}}
 	if !assert.Equal(t, "foo", instance.String()) {
 		t.FailNow()
 	}
@@ -214,7 +252,7 @@ func TestFilter_ExitCode(t *testing.T) {
 func TestIgnoreEnv(t *testing.T) {
 	os.Setenv(tmpDirEnvKey, "")
 
-	fltr := Filter{Image: "example.com:version"}
+	fltr := Filter{ContainerSpec: runtimeutil.ContainerSpec{Image: "example.com:version"}}
 	_, args := fltr.getCommand()
 	for _, arg := range args {
 		if arg == tmpDirEnvKey {

kyaml/fn/runtime/runtimeutil/functiontypes.go

@@ -18,11 +18,31 @@ const (
 
 var functionAnnotationKeys = []string{FunctionAnnotationKey, oldFunctionAnnotationKey}
 
+// ContainerUser is a type for username/uid used in container
+type ContainerUser string
+
+func (u *ContainerUser) String() string {
+	return string(*u)
+}
+
+func (u *ContainerUser) IsEmpty() bool {
+	return string(*u) == ""
+}
+
+const (
+	UserNobody ContainerUser = "nobody"
+)
+
+// ContainerNetworkName is a type for network name used in container
+type ContainerNetworkName string
+
+const (
+	NetworkNameNone  ContainerNetworkName = "none"
+	NetworkNameEmpty ContainerNetworkName = ""
+)
+
 // FunctionSpec defines a spec for running a function
 type FunctionSpec struct {
-	// Network is the name of the network to use from a container
-	Network string `json:"network,omitempty" yaml:"network,omitempty"`
-
 	DeferFailure bool `json:"deferFailure,omitempty" yaml:"deferFailure,omitempty"`
 
 	// Container is the spec for running a function as a container
@@ -52,12 +72,18 @@ type ContainerSpec struct {
 
 	// Mounts are the storage or directories to mount into the container
 	StorageMounts []StorageMount `json:"mounts,omitempty" yaml:"mounts,omitempty"`
+
+	// User is the username/uid that application runs as in continer
+	User ContainerUser `json:"user,omitempty" yaml:"user,omitempty"`
 }
 
 // ContainerNetwork
 type ContainerNetwork struct {
 	// Required specifies that function requires a network
 	Required bool `json:"required,omitempty" yaml:"required,omitempty"`
+
+	// Name is the name of the network to use from a container
+	Name ContainerNetworkName `json:"name,omitempty" yaml:"name,omitempty"`
 }
 
 // StarlarkSpec defines how to run a function as a starlark program
@@ -110,7 +136,7 @@ func GetFunctionSpec(n *yaml.RNode) *FunctionSpec {
 	}
 
 	if fn := getFunctionSpecFromAnnotation(n, meta); fn != nil {
-		fn.Network = ""
+		fn.Container.Network.Name = NetworkNameEmpty
 		fn.StorageMounts = []StorageMount{}
 		return fn
 	}

kyaml/go.sum

@@ -185,6 +185,7 @@ github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An
 github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48=
 github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.2.3-0.20181224173747-660f15d67dbb/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=

kyaml/kio/kio.go

@@ -99,10 +99,6 @@ func (p Pipeline) ExecuteWithCallback(callback PipelineExecuteCallbackFunc) erro
 		}
 		result = append(result, nodes...)
 	}
-	if len(result) == 0 {
-		// no inputs to operate on
-		return nil
-	}
 
 	// apply operations
 	var err error
@@ -112,6 +108,9 @@ func (p Pipeline) ExecuteWithCallback(callback PipelineExecuteCallbackFunc) erro
 			callback(op)
 		}
 		result, err = op.Filter(result)
+		// TODO (issue 2872): This len(result) == 0 should be removed and empty result list should be
+		// handled by outputs. However currently some writer like LocalPackageReadWriter
+		// will clear the output directory and which will cause unpredictable results
 		if len(result) == 0 || err != nil {
 			return errors.Wrap(err)
 		}

kyaml/kio/kio_test.go

@@ -4,7 +4,9 @@
 package kio_test
 
 import (
+	"bytes"
 	"reflect"
+	"strings"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -75,3 +77,75 @@ func TestPipelineWithCallback(t *testing.T) {
 		)
 	}
 }
+
+func TestEmptyInput(t *testing.T) {
+	actual := &bytes.Buffer{}
+	output := ByteWriter{
+		Sort:               true,
+		WrappingKind:       ResourceListKind,
+		WrappingAPIVersion: ResourceListAPIVersion,
+	}
+	output.Writer = actual
+
+	p := Pipeline{
+		Outputs: []Writer{output},
+	}
+
+	err := p.Execute()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	expected := `
+apiVersion: config.kubernetes.io/v1alpha1
+kind: ResourceList
+items: []
+`
+
+	if !assert.Equal(t,
+		strings.TrimSpace(expected), strings.TrimSpace(actual.String())) {
+		t.FailNow()
+	}
+}
+
+func TestEmptyInputWithFilter(t *testing.T) {
+	actual := &bytes.Buffer{}
+	output := ByteWriter{
+		Sort:               true,
+		WrappingKind:       ResourceListKind,
+		WrappingAPIVersion: ResourceListAPIVersion,
+	}
+	output.Writer = actual
+
+	filters := []Filter{
+		FilterFunc(func(nodes []*yaml.RNode) ([]*yaml.RNode, error) {
+			nodes = append(nodes, yaml.NewMapRNode(&map[string]string{
+				"foo": "bar",
+			}))
+			return nodes, nil
+		}),
+		FilterFunc(func(nodes []*yaml.RNode) ([]*yaml.RNode, error) { return nodes, nil }),
+	}
+
+	p := Pipeline{
+		Outputs: []Writer{output},
+		Filters: filters,
+	}
+
+	err := p.Execute()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	expected := `
+apiVersion: config.kubernetes.io/v1alpha1
+kind: ResourceList
+items:
+- foo: bar
+`
+
+	if !assert.Equal(t,
+		strings.TrimSpace(expected), strings.TrimSpace(actual.String())) {
+		t.FailNow()
+	}
+}

kyaml/runfn/runfn.go

@@ -87,6 +87,9 @@ type RunFns struct {
 	// this is a variable so it can be mocked in tests
 	functionFilterProvider func(
 		filter runtimeutil.FunctionSpec, api *yaml.RNode) (kio.Filter, error)
+
+	// User username used to run the application in container,
+	User runtimeutil.ContainerUser
 }
 
 // Execute runs the command
@@ -277,8 +280,13 @@ func (r RunFns) getFunctionFilters(global bool, fns ...*yaml.RNode) (
 				// TODO(eddiezane): Provide error info about which function needs the network
 				return fltrs, errors.Errorf("network required but not enabled with --network")
 			}
-			spec.Network = r.NetworkName
+			spec.Container.Network.Name = runtimeutil.ContainerNetworkName(r.NetworkName)
 		}
+		// command line username has higher priority
+		if r.User != "" {
+			spec.Container.User = r.User
+		}
+
 		c, err := r.functionFilterProvider(*spec, api)
 		if err != nil {
 			return nil, err
@@ -381,11 +389,13 @@ func (r *RunFns) ffp(spec runtimeutil.FunctionSpec, api *yaml.RNode) (kio.Filter
 	}
 	if !r.DisableContainers && spec.Container.Image != "" {
 		// TODO: Add a test for this behavior
-		cf := &container.Filter{
+		c := container.NewContainer(runtimeutil.ContainerSpec{
 			Image:         spec.Container.Image,
-			Network:       spec.Network,
+			Network:       spec.Container.Network,
 			StorageMounts: r.StorageMounts,
-		}
+			User:          spec.Container.User,
+		})
+		cf := &c
 		cf.Exec.FunctionConfig = api
 		cf.Exec.GlobalScope = r.GlobalScope
 		cf.Exec.ResultsFile = resultsFile

kyaml/runfn/runfn_test.go

@@ -60,7 +60,8 @@ kind:
 		return
 	}
 	filter, _ := instance.functionFilterProvider(spec, api)
-	cf := &container.Filter{Image: "example.com:version"}
+	c := container.NewContainer(runtimeutil.ContainerSpec{Image: "example.com:version"})
+	cf := &c
 	cf.Exec.FunctionConfig = api
 	assert.Equal(t, cf, filter)
 }
@@ -90,7 +91,8 @@ kind:
 		return
 	}
 	filter, _ := instance.functionFilterProvider(spec, api)
-	cf := &container.Filter{Image: "example.com:version"}
+	c := container.NewContainer(runtimeutil.ContainerSpec{Image: "example.com:version"})
+	cf := &c
 	cf.Exec.FunctionConfig = api
 	cf.Exec.GlobalScope = true
 	assert.Equal(t, cf, filter)
@@ -920,10 +922,10 @@ func TestCmd_Execute_enableLogSteps(t *testing.T) {
 
 	logs := &bytes.Buffer{}
 	instance := RunFns{
-		Path: dir,
+		Path:                   dir,
 		functionFilterProvider: getFilterProvider(t),
-		LogSteps: true,
-		LogWriter: logs,
+		LogSteps:               true,
+		LogWriter:              logs,
 	}
 	if !assert.NoError(t, instance.Execute()) {
 		t.FailNow()

kyaml/yaml/rnode.go

@@ -168,6 +168,16 @@ type RNode struct {
 	Match []string
 }
 
+// Copy returns a distinct copy.
+func (rn *RNode) Copy() *RNode {
+	if rn == nil {
+		return nil
+	}
+	result := *rn
+	result.value = CopyYNode(rn.value)
+	return &result
+}
+
 var ErrMissingMetadata = fmt.Errorf("missing Resource metadata")
 
 // Field names

kyaml/yaml/rnode_test.go

@@ -4,6 +4,7 @@
 package yaml
 
 import (
+	"reflect"
 	"strings"
 	"testing"
 
@@ -206,6 +207,33 @@ func TestIsMissingOrNull(t *testing.T) {
 	}
 }
 
+func TestCopy(t *testing.T) {
+	rn := RNode{
+		fieldPath: []string{"fp1", "fp2"},
+		value: &Node{
+			Kind: 200,
+		},
+		Match: []string{"m1", "m2"},
+	}
+	rnC := rn.Copy()
+	if !reflect.DeepEqual(&rn, rnC) {
+		t.Fatalf("copy %v is not deep equal to %v", rnC, rn)
+	}
+	tmp := rn.value.Kind
+	rn.value.Kind = 666
+	if reflect.DeepEqual(rn, rnC) {
+		t.Fatalf("changing component should break equality")
+	}
+	rn.value.Kind = tmp
+	if !reflect.DeepEqual(&rn, rnC) {
+		t.Fatalf("should be back to normal")
+	}
+	rn.fieldPath[0] = "Different"
+	if reflect.DeepEqual(rn, rnC) {
+		t.Fatalf("changing fieldpath should break equality")
+	}
+}
+
 func TestFieldRNodes(t *testing.T) {
 	testCases := []struct {
 		testName string

kyaml/yaml/types.go

@@ -12,6 +12,23 @@ import (
 	"sigs.k8s.io/kustomize/kyaml/sets"
 )
 
+// CopyYNode returns a distinct copy of its argument.
+// Use https://github.com/jinzhu/copier instead?
+func CopyYNode(n *yaml.Node) *yaml.Node {
+	if n == nil {
+		return nil
+	}
+	c := *n
+	if len(n.Content) > 0 {
+		// Using Go 'copy' here doesn't yield independent slices.
+		c.Content = make([]*Node, len(n.Content))
+		for i, item := range n.Content {
+			c.Content[i] = CopyYNode(item)
+		}
+	}
+	return &c
+}
+
 // IsYNodeTaggedNull returns true if the node is explicitly tagged Null.
 func IsYNodeTaggedNull(n *yaml.Node) bool {
 	return n != nil && n.Tag == NodeTagNull

kyaml/yaml/types_test.go

@@ -4,9 +4,60 @@
 package yaml
 
 import (
+	"reflect"
 	"testing"
 )
 
+func TestCopyYNode(t *testing.T) {
+	ynSub1 := Node{
+		Kind: 100,
+	}
+	ynSub2 := Node{
+		Kind: 200,
+	}
+	ynSub3 := Node{
+		Kind: 300,
+	}
+	yn := Node{
+		Kind:        5000,
+		Style:       6000,
+		Tag:         "red",
+		Value:       "green",
+		Anchor:      "blue",
+		Alias:       &ynSub3,
+		Content:     []*Node{&ynSub1, &ynSub2},
+		HeadComment: "apple",
+		LineComment: "peach",
+		FootComment: "banana",
+		Line:        7000,
+		Column:      8000,
+	}
+	ynAddr := &yn
+	if !reflect.DeepEqual(&yn, ynAddr) {
+		t.Fatalf("truly %v should equal %v", &yn, ynAddr)
+	}
+	ynC := CopyYNode(&yn)
+	if !reflect.DeepEqual(yn.Content, ynC.Content) {
+		t.Fatalf("copy content %v is not deep equal to %v", ynC, yn)
+	}
+	if !reflect.DeepEqual(&yn, ynC) {
+		t.Fatalf("\noriginal: %v\n    copy: %v\nShould be equal.", yn, ynC)
+	}
+	tmp := yn.Content[0].Kind
+	yn.Content[0].Kind = 666
+	if reflect.DeepEqual(&yn, ynC) {
+		t.Fatalf("changing component should break equality")
+	}
+	yn.Content[0].Kind = tmp
+	if !reflect.DeepEqual(&yn, ynC) {
+		t.Fatalf("should be okay now")
+	}
+	yn.Tag = "Different"
+	if yn.Tag == ynC.Tag {
+		t.Fatalf("field aliased!")
+	}
+}
+
 func TestIsYNodeTaggedNull(t *testing.T) {
 	if IsYNodeTaggedNull(nil) {
 		t.Fatalf("nil cannot be tagged null")

plugin/builtin/annotationstransformer/go.mod

@@ -4,8 +4,10 @@ go 1.14
 
 require (
 	sigs.k8s.io/kustomize/api v0.5.1
-	sigs.k8s.io/kustomize/kyaml v0.5.0
+	sigs.k8s.io/kustomize/kyaml v0.6.1
 	sigs.k8s.io/yaml v1.2.0
 )
 
 replace sigs.k8s.io/kustomize/api v0.5.1 => ../../../api
+
+replace sigs.k8s.io/kustomize/kyaml v0.6.1 => ../../../kyaml

plugin/builtin/annotationstransformer/go.sum

@@ -334,6 +334,7 @@ github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DM
 github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48=
 github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
 github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
@@ -521,8 +522,6 @@ 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.5.0 h1:xufpSxgpugQxtd0aN1ZsWnr3Kj0fpAi7GN4dnEs4oPg=
-sigs.k8s.io/kustomize/kyaml v0.5.0/go.mod h1:bEzbO5pN9OvlEeCLvFHo8Pu7SA26Herc2m60UeWZBdI=
 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=

plugin/builtin/configmapgenerator/go.sum

@@ -334,6 +334,7 @@ github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DM
 github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48=
 github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
 github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
@@ -521,8 +522,8 @@ 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.5.0 h1:xufpSxgpugQxtd0aN1ZsWnr3Kj0fpAi7GN4dnEs4oPg=
-sigs.k8s.io/kustomize/kyaml v0.5.0/go.mod h1:bEzbO5pN9OvlEeCLvFHo8Pu7SA26Herc2m60UeWZBdI=
+sigs.k8s.io/kustomize/kyaml v0.6.1 h1:mwffj5vt3MPdbWV3fZnnwol8SO7sUoGdgejBlvseyak=
+sigs.k8s.io/kustomize/kyaml v0.6.1/go.mod h1:bEzbO5pN9OvlEeCLvFHo8Pu7SA26Herc2m60UeWZBdI=
 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=

plugin/builtin/hashtransformer/go.sum

@@ -334,6 +334,7 @@ github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DM
 github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48=
 github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
 github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
@@ -521,8 +522,8 @@ 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.5.0 h1:xufpSxgpugQxtd0aN1ZsWnr3Kj0fpAi7GN4dnEs4oPg=
-sigs.k8s.io/kustomize/kyaml v0.5.0/go.mod h1:bEzbO5pN9OvlEeCLvFHo8Pu7SA26Herc2m60UeWZBdI=
+sigs.k8s.io/kustomize/kyaml v0.6.1 h1:mwffj5vt3MPdbWV3fZnnwol8SO7sUoGdgejBlvseyak=
+sigs.k8s.io/kustomize/kyaml v0.6.1/go.mod h1:bEzbO5pN9OvlEeCLvFHo8Pu7SA26Herc2m60UeWZBdI=
 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=

plugin/builtin/imagetagtransformer/go.mod

@@ -4,8 +4,10 @@ go 1.14
 
 require (
 	sigs.k8s.io/kustomize/api v0.5.1
-	sigs.k8s.io/kustomize/kyaml v0.5.0
+	sigs.k8s.io/kustomize/kyaml v0.6.1
 	sigs.k8s.io/yaml v1.2.0
 )
 
 replace sigs.k8s.io/kustomize/api v0.5.1 => ../../../api
+
+replace sigs.k8s.io/kustomize/kyaml v0.6.1 => ../../../kyaml

plugin/builtin/imagetagtransformer/go.sum

@@ -334,6 +334,7 @@ github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DM
 github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48=
 github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
 github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
@@ -521,8 +522,6 @@ 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.5.0 h1:xufpSxgpugQxtd0aN1ZsWnr3Kj0fpAi7GN4dnEs4oPg=
-sigs.k8s.io/kustomize/kyaml v0.5.0/go.mod h1:bEzbO5pN9OvlEeCLvFHo8Pu7SA26Herc2m60UeWZBdI=
 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=

plugin/builtin/labeltransformer/go.mod

@@ -4,8 +4,10 @@ go 1.14
 
 require (
 	sigs.k8s.io/kustomize/api v0.5.1
-	sigs.k8s.io/kustomize/kyaml v0.5.0
+	sigs.k8s.io/kustomize/kyaml v0.6.1
 	sigs.k8s.io/yaml v1.2.0
 )
 
 replace sigs.k8s.io/kustomize/api v0.5.1 => ../../../api
+
+replace sigs.k8s.io/kustomize/kyaml v0.6.1 => ../../../kyaml

plugin/builtin/labeltransformer/go.sum

@@ -334,6 +334,7 @@ github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DM
 github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48=
 github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
 github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
@@ -521,8 +522,6 @@ 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.5.0 h1:xufpSxgpugQxtd0aN1ZsWnr3Kj0fpAi7GN4dnEs4oPg=
-sigs.k8s.io/kustomize/kyaml v0.5.0/go.mod h1:bEzbO5pN9OvlEeCLvFHo8Pu7SA26Herc2m60UeWZBdI=
 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=

plugin/builtin/legacyordertransformer/go.sum

@@ -334,6 +334,7 @@ github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DM
 github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48=
 github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
 github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
@@ -521,8 +522,8 @@ 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.5.0 h1:xufpSxgpugQxtd0aN1ZsWnr3Kj0fpAi7GN4dnEs4oPg=
-sigs.k8s.io/kustomize/kyaml v0.5.0/go.mod h1:bEzbO5pN9OvlEeCLvFHo8Pu7SA26Herc2m60UeWZBdI=
+sigs.k8s.io/kustomize/kyaml v0.6.1 h1:mwffj5vt3MPdbWV3fZnnwol8SO7sUoGdgejBlvseyak=
+sigs.k8s.io/kustomize/kyaml v0.6.1/go.mod h1:bEzbO5pN9OvlEeCLvFHo8Pu7SA26Herc2m60UeWZBdI=
 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=

plugin/builtin/namespacetransformer/go.mod

@@ -4,8 +4,10 @@ go 1.14
 
 require (
 	sigs.k8s.io/kustomize/api v0.5.1
-	sigs.k8s.io/kustomize/kyaml v0.5.0
+	sigs.k8s.io/kustomize/kyaml v0.6.1
 	sigs.k8s.io/yaml v1.2.0
 )
 
 replace sigs.k8s.io/kustomize/api v0.5.1 => ../../../api
+
+replace sigs.k8s.io/kustomize/kyaml v0.6.1 => ../../../kyaml

plugin/builtin/namespacetransformer/go.sum

@@ -334,6 +334,7 @@ github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DM
 github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48=
 github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
 github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
@@ -521,8 +522,6 @@ 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.5.0 h1:xufpSxgpugQxtd0aN1ZsWnr3Kj0fpAi7GN4dnEs4oPg=
-sigs.k8s.io/kustomize/kyaml v0.5.0/go.mod h1:bEzbO5pN9OvlEeCLvFHo8Pu7SA26Herc2m60UeWZBdI=
 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=

plugin/builtin/patchjson6902transformer/go.mod

@@ -6,8 +6,10 @@ require (
 	github.com/evanphx/json-patch v4.5.0+incompatible
 	github.com/pkg/errors v0.8.1
 	sigs.k8s.io/kustomize/api v0.5.1
-	sigs.k8s.io/kustomize/kyaml v0.5.0
+	sigs.k8s.io/kustomize/kyaml v0.6.1
 	sigs.k8s.io/yaml v1.2.0
 )
 
 replace sigs.k8s.io/kustomize/api v0.5.1 => ../../../api
+
+replace sigs.k8s.io/kustomize/kyaml v0.6.1 => ../../../kyaml

plugin/builtin/patchjson6902transformer/go.sum

@@ -334,6 +334,7 @@ github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DM
 github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48=
 github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
 github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
@@ -521,8 +522,6 @@ 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.5.0 h1:xufpSxgpugQxtd0aN1ZsWnr3Kj0fpAi7GN4dnEs4oPg=
-sigs.k8s.io/kustomize/kyaml v0.5.0/go.mod h1:bEzbO5pN9OvlEeCLvFHo8Pu7SA26Herc2m60UeWZBdI=
 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=

plugin/builtin/patchstrategicmergetransformer/PatchStrategicMergeTransformer.go

@@ -68,7 +68,7 @@ func (p *plugin) Config(
 }
 
 func (p *plugin) Transform(m resmap.ResMap) error {
-	patches, err := p.h.ResmapFactory().MergePatches(p.loadedPatches)
+	patches, err := p.h.ResmapFactory().Merge(p.loadedPatches)
 	if err != nil {
 		return err
 	}

plugin/builtin/patchstrategicmergetransformer/go.mod

@@ -5,11 +5,11 @@ go 1.14
 require (
 	github.com/pkg/errors v0.8.1
 	sigs.k8s.io/kustomize/api v0.5.1
-	sigs.k8s.io/kustomize/kyaml v0.5.0
+	sigs.k8s.io/kustomize/kyaml v0.6.1
 	sigs.k8s.io/yaml v1.2.0
 )
 
 replace (
 	sigs.k8s.io/kustomize/api v0.5.1 => ../../../api
-	sigs.k8s.io/kustomize/kyaml v0.5.0 => ../../../kyaml
+	sigs.k8s.io/kustomize/kyaml v0.6.1 => ../../../kyaml
 )

plugin/builtin/patchstrategicmergetransformer/go.sum

@@ -334,6 +334,7 @@ github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DM
 github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48=
 github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
 github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=

plugin/builtin/patchtransformer/go.mod

@@ -5,8 +5,10 @@ go 1.14
 require (
 	github.com/evanphx/json-patch v4.5.0+incompatible
 	sigs.k8s.io/kustomize/api v0.5.1
-	sigs.k8s.io/kustomize/kyaml v0.5.0
+	sigs.k8s.io/kustomize/kyaml v0.6.1
 	sigs.k8s.io/yaml v1.2.0
 )
 
 replace sigs.k8s.io/kustomize/api v0.5.1 => ../../../api
+
+replace sigs.k8s.io/kustomize/kyaml v0.6.1 => ../../../kyaml

plugin/builtin/patchtransformer/go.sum

@@ -334,6 +334,7 @@ github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DM
 github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48=
 github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
 github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
@@ -521,8 +522,6 @@ 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.5.0 h1:xufpSxgpugQxtd0aN1ZsWnr3Kj0fpAi7GN4dnEs4oPg=
-sigs.k8s.io/kustomize/kyaml v0.5.0/go.mod h1:bEzbO5pN9OvlEeCLvFHo8Pu7SA26Herc2m60UeWZBdI=
 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=

plugin/builtin/prefixsuffixtransformer/go.mod

@@ -4,8 +4,10 @@ go 1.14
 
 require (
 	sigs.k8s.io/kustomize/api v0.5.1
-	sigs.k8s.io/kustomize/kyaml v0.5.0
+	sigs.k8s.io/kustomize/kyaml v0.6.1
 	sigs.k8s.io/yaml v1.2.0
 )
 
 replace sigs.k8s.io/kustomize/api v0.5.1 => ../../../api
+
+replace sigs.k8s.io/kustomize/kyaml v0.6.1 => ../../../kyaml

plugin/builtin/prefixsuffixtransformer/go.sum

@@ -334,6 +334,7 @@ github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DM
 github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48=
 github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
 github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
@@ -521,8 +522,6 @@ 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.5.0 h1:xufpSxgpugQxtd0aN1ZsWnr3Kj0fpAi7GN4dnEs4oPg=
-sigs.k8s.io/kustomize/kyaml v0.5.0/go.mod h1:bEzbO5pN9OvlEeCLvFHo8Pu7SA26Herc2m60UeWZBdI=
 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=

plugin/builtin/replicacounttransformer/go.mod

@@ -4,8 +4,10 @@ go 1.14
 
 require (
 	sigs.k8s.io/kustomize/api v0.5.1
-	sigs.k8s.io/kustomize/kyaml v0.5.0
+	sigs.k8s.io/kustomize/kyaml v0.6.1
 	sigs.k8s.io/yaml v1.2.0
 )
 
 replace sigs.k8s.io/kustomize/api v0.5.1 => ../../../api
+
+replace sigs.k8s.io/kustomize/kyaml v0.6.1 => ../../../kyaml

plugin/builtin/replicacounttransformer/go.sum

@@ -334,6 +334,7 @@ github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DM
 github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48=
 github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
 github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
@@ -521,8 +522,6 @@ 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.5.0 h1:xufpSxgpugQxtd0aN1ZsWnr3Kj0fpAi7GN4dnEs4oPg=
-sigs.k8s.io/kustomize/kyaml v0.5.0/go.mod h1:bEzbO5pN9OvlEeCLvFHo8Pu7SA26Herc2m60UeWZBdI=
 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=

plugin/builtin/secretgenerator/go.sum

@@ -334,6 +334,7 @@ github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DM
 github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48=
 github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
 github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
@@ -519,8 +520,8 @@ 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.5.0 h1:xufpSxgpugQxtd0aN1ZsWnr3Kj0fpAi7GN4dnEs4oPg=
-sigs.k8s.io/kustomize/kyaml v0.5.0/go.mod h1:bEzbO5pN9OvlEeCLvFHo8Pu7SA26Herc2m60UeWZBdI=
+sigs.k8s.io/kustomize/kyaml v0.6.1 h1:mwffj5vt3MPdbWV3fZnnwol8SO7sUoGdgejBlvseyak=
+sigs.k8s.io/kustomize/kyaml v0.6.1/go.mod h1:bEzbO5pN9OvlEeCLvFHo8Pu7SA26Herc2m60UeWZBdI=
 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=

plugin/builtin/valueaddtransformer/go.mod

@@ -4,8 +4,10 @@ go 1.14
 
 require (
 	sigs.k8s.io/kustomize/api v0.5.1
-	sigs.k8s.io/kustomize/kyaml v0.5.0
+	sigs.k8s.io/kustomize/kyaml v0.6.1
 	sigs.k8s.io/yaml v1.2.0
 )
 
 replace sigs.k8s.io/kustomize/api v0.5.1 => ../../../api
+
+replace sigs.k8s.io/kustomize/kyaml v0.6.1 => ../../../kyaml

plugin/builtin/valueaddtransformer/go.sum

@@ -334,6 +334,7 @@ github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DM
 github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48=
 github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
 github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
@@ -521,8 +522,6 @@ 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.5.0 h1:xufpSxgpugQxtd0aN1ZsWnr3Kj0fpAi7GN4dnEs4oPg=
-sigs.k8s.io/kustomize/kyaml v0.5.0/go.mod h1:bEzbO5pN9OvlEeCLvFHo8Pu7SA26Herc2m60UeWZBdI=
 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=

plugin/someteam.example.com/v1/bashedconfigmap/go.sum

@@ -334,6 +334,7 @@ github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DM
 github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48=
 github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
 github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
@@ -521,8 +522,8 @@ 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.5.0 h1:xufpSxgpugQxtd0aN1ZsWnr3Kj0fpAi7GN4dnEs4oPg=
-sigs.k8s.io/kustomize/kyaml v0.5.0/go.mod h1:bEzbO5pN9OvlEeCLvFHo8Pu7SA26Herc2m60UeWZBdI=
+sigs.k8s.io/kustomize/kyaml v0.6.1 h1:mwffj5vt3MPdbWV3fZnnwol8SO7sUoGdgejBlvseyak=
+sigs.k8s.io/kustomize/kyaml v0.6.1/go.mod h1:bEzbO5pN9OvlEeCLvFHo8Pu7SA26Herc2m60UeWZBdI=
 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=

plugin/someteam.example.com/v1/chartinflator/go.sum

@@ -334,6 +334,7 @@ github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DM
 github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48=
 github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
 github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
@@ -521,8 +522,8 @@ 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.5.0 h1:xufpSxgpugQxtd0aN1ZsWnr3Kj0fpAi7GN4dnEs4oPg=
-sigs.k8s.io/kustomize/kyaml v0.5.0/go.mod h1:bEzbO5pN9OvlEeCLvFHo8Pu7SA26Herc2m60UeWZBdI=
+sigs.k8s.io/kustomize/kyaml v0.6.1 h1:mwffj5vt3MPdbWV3fZnnwol8SO7sUoGdgejBlvseyak=
+sigs.k8s.io/kustomize/kyaml v0.6.1/go.mod h1:bEzbO5pN9OvlEeCLvFHo8Pu7SA26Herc2m60UeWZBdI=
 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=

plugin/someteam.example.com/v1/dateprefixer/go.sum

@@ -334,6 +334,7 @@ github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DM
 github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48=
 github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
 github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
@@ -521,8 +522,8 @@ 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.5.0 h1:xufpSxgpugQxtd0aN1ZsWnr3Kj0fpAi7GN4dnEs4oPg=
-sigs.k8s.io/kustomize/kyaml v0.5.0/go.mod h1:bEzbO5pN9OvlEeCLvFHo8Pu7SA26Herc2m60UeWZBdI=
+sigs.k8s.io/kustomize/kyaml v0.6.1 h1:mwffj5vt3MPdbWV3fZnnwol8SO7sUoGdgejBlvseyak=
+sigs.k8s.io/kustomize/kyaml v0.6.1/go.mod h1:bEzbO5pN9OvlEeCLvFHo8Pu7SA26Herc2m60UeWZBdI=
 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=

plugin/someteam.example.com/v1/gogetter/go.sum

@@ -334,6 +334,7 @@ github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DM
 github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48=
 github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
 github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
@@ -521,8 +522,8 @@ 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.5.0 h1:xufpSxgpugQxtd0aN1ZsWnr3Kj0fpAi7GN4dnEs4oPg=
-sigs.k8s.io/kustomize/kyaml v0.5.0/go.mod h1:bEzbO5pN9OvlEeCLvFHo8Pu7SA26Herc2m60UeWZBdI=
+sigs.k8s.io/kustomize/kyaml v0.6.1 h1:mwffj5vt3MPdbWV3fZnnwol8SO7sUoGdgejBlvseyak=
+sigs.k8s.io/kustomize/kyaml v0.6.1/go.mod h1:bEzbO5pN9OvlEeCLvFHo8Pu7SA26Herc2m60UeWZBdI=
 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=

plugin/someteam.example.com/v1/printpluginenv/go.sum

@@ -334,6 +334,7 @@ github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DM
 github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48=
 github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
 github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
@@ -521,8 +522,8 @@ 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.5.0 h1:xufpSxgpugQxtd0aN1ZsWnr3Kj0fpAi7GN4dnEs4oPg=
-sigs.k8s.io/kustomize/kyaml v0.5.0/go.mod h1:bEzbO5pN9OvlEeCLvFHo8Pu7SA26Herc2m60UeWZBdI=
+sigs.k8s.io/kustomize/kyaml v0.6.1 h1:mwffj5vt3MPdbWV3fZnnwol8SO7sUoGdgejBlvseyak=
+sigs.k8s.io/kustomize/kyaml v0.6.1/go.mod h1:bEzbO5pN9OvlEeCLvFHo8Pu7SA26Herc2m60UeWZBdI=
 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=

plugin/someteam.example.com/v1/replacementtransformer/go.sum

@@ -334,6 +334,7 @@ github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DM
 github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48=
 github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
 github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
@@ -521,8 +522,8 @@ 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.5.0 h1:xufpSxgpugQxtd0aN1ZsWnr3Kj0fpAi7GN4dnEs4oPg=
-sigs.k8s.io/kustomize/kyaml v0.5.0/go.mod h1:bEzbO5pN9OvlEeCLvFHo8Pu7SA26Herc2m60UeWZBdI=
+sigs.k8s.io/kustomize/kyaml v0.6.1 h1:mwffj5vt3MPdbWV3fZnnwol8SO7sUoGdgejBlvseyak=
+sigs.k8s.io/kustomize/kyaml v0.6.1/go.mod h1:bEzbO5pN9OvlEeCLvFHo8Pu7SA26Herc2m60UeWZBdI=
 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=