Multiple declarative functions in the same file should execute in order

Makefile

@@ -26,21 +26,22 @@ verify-kustomize: \
 	lint-kustomize \
 	test-unit-kustomize-all \
 	test-examples-kustomize-against-HEAD \
-	test-examples-kustomize-against-3.9.0 \
-	test-examples-kustomize-against-3.8.8
+	test-examples-kustomize-against-3.8.6
 
 # The following target referenced by a file in
 # https://github.com/kubernetes/test-infra/tree/master/config/jobs/kubernetes-sigs/kustomize
 .PHONY: prow-presubmit-check
 prow-presubmit-check: \
 	lint-kustomize \
-	test-multi-module \
 	test-unit-kustomize-all \
 	test-unit-cmd-all \
 	test-go-mod \
 	test-examples-kustomize-against-HEAD \
-	test-examples-kustomize-against-3.9.0 \
-	test-examples-kustomize-against-3.8.8
+	test-examples-kustomize-against-3.8.6
+
+# test-multi-module \
+# Temporarily removed from prow-presubmit-check
+# See https://github.com/kubernetes-sigs/kustomize/issues/3191
 
 .PHONY: verify-kustomize-e2e
 verify-kustomize-e2e: test-examples-e2e-kustomize
@@ -192,27 +193,24 @@ $(pGen)/%.go: $(MYGOBIN)/pluginator
 .PHONY: generate-kustomize-builtin-plugins
 generate-kustomize-builtin-plugins: $(builtinplugins)
 
-.PHONY: build-kustomize-external-go-plugin
-build-kustomize-external-go-plugin:
+.PHONY: kustomize-external-go-plugin-build
+kustomize-external-go-plugin-build:
 	./hack/buildExternalGoPlugins.sh ./plugin
 
-.PHONY: clean-kustomize-external-go-plugin
-clean-kustomize-external-go-plugin:
+.PHONY: kustomize-external-go-plugin-clean
+kustomize-external-go-plugin-clean:
 	./hack/buildExternalGoPlugins.sh ./plugin clean
 
 ### End kustomize plugin rules.
 
 .PHONY: lint-kustomize
 lint-kustomize: install-tools $(builtinplugins)
-	cd api; $(MYGOBIN)/golangci-lint-kustomize \
-	  -c ../.golangci-kustomize.yml \
-	  run ./...
-	cd kustomize; $(MYGOBIN)/golangci-lint-kustomize \
-	  -c ../.golangci-kustomize.yml \
-	  run ./...
-	cd cmd/pluginator; $(MYGOBIN)/golangci-lint-kustomize \
-	  -c ../../.golangci-kustomize.yml \
-	  run ./...
+	cd api; \
+	$(MYGOBIN)/golangci-lint-kustomize -c ../.golangci-kustomize.yml run ./...
+	cd kustomize; \
+	$(MYGOBIN)/golangci-lint-kustomize -c ../.golangci-kustomize.yml run ./...
+	cd cmd/pluginator; \
+	$(MYGOBIN)/golangci-lint-kustomize -c ../../.golangci-kustomize.yml run ./...
 
 # Used to add non-default compilation flags when experimenting with
 # plugin-to-api compatibility checks.
@@ -220,10 +218,6 @@ lint-kustomize: install-tools $(builtinplugins)
 build-kustomize-api: $(builtinplugins)
 	cd api; go build ./...
 
-.PHONY: generate-kustomize-api
-generate-kustomize-api:
-	cd api; go generate ./...
-
 .PHONY: test-unit-kustomize-api
 test-unit-kustomize-api: build-kustomize-api
 	cd api; go test ./...  -ldflags "-X sigs.k8s.io/kustomize/api/provenance.version=v444.333.222"
@@ -276,12 +270,17 @@ test-examples-kustomize-against-HEAD: $(MYGOBIN)/kustomize $(MYGOBIN)/mdrip
 	./hack/testExamplesAgainstKustomize.sh HEAD
 
 .PHONY:
-test-examples-kustomize-against-3.9.0: $(MYGOBIN)/mdrip
-	./hack/testExamplesAgainstKustomize.sh v3.9.0
-
-.PHONY:
-test-examples-kustomize-against-3.8.8: $(MYGOBIN)/mdrip
-	./hack/testExamplesAgainstKustomize.sh v3.8.8
+test-examples-kustomize-against-3.8.6: $(MYGOBIN)/mdrip
+	( \
+		set -e; \
+		tag=v3.8.6; \
+		/bin/rm -f $(MYGOBIN)/kustomize; \
+		echo "Installing kustomize $$tag."; \
+		GO111MODULE=on go get sigs.k8s.io/kustomize/kustomize/v3@$${tag}; \
+		./hack/testExamplesAgainstKustomize.sh $$tag; \
+		echo "Reinstalling kustomize from HEAD."; \
+		cd kustomize; go install .; \
+	)
 
 # linux only.
 # This is for testing an example plugin that
@@ -355,15 +354,13 @@ $(MYGOBIN)/gh:
 	)
 
 .PHONY: clean
-clean: clean-kustomize-external-go-plugin
+clean: kustomize-external-go-plugin-clean
 	go clean --cache
 	rm -f $(builtinplugins)
+	rm -f $(MYGOBIN)/pluginator
 	rm -f $(MYGOBIN)/kustomize
 	rm -f $(MYGOBIN)/golangci-lint-kustomize
 
-# Handle pluginator manually.
-# rm -f $(MYGOBIN)/pluginator
-
 # Nuke the site from orbit.  It's the only way to be sure.
 .PHONY: nuke
 nuke: clean

README.md

@@ -20,20 +20,15 @@ This tool is sponsored by [sig-cli] ([KEP]).
 
 ## kubectl integration
 
-The kustomize build flow at [v2.0.3] was added
-to [kubectl v1.14][kubectl announcement].  The kustomize
-flow in kubectl has remained frozen at v2.0.3 while work
-to extract kubectl from the k/k repo, and work to remove
-kustomize's dependence on core k/k code ([#2506]) has proceeded.
-The reintegration effort is tracked in [#1500] (and its blocking
-issues).
+Since [v1.14][kubectl announcement] the kustomize build system has been included in kubectl.
 
-[v2.0.3]: /../../tree/v2.0.3
-[#2506]: https://github.com/kubernetes-sigs/kustomize/issues/2506
-[#1500]: https://github.com/kubernetes-sigs/kustomize/issues/1500
+| kubectl version | kustomize version |
+|---------|--------|
+| v1.16.0 | [v2.0.3](/../../tree/v2.0.3) |
+| v1.15.x | [v2.0.3](/../../tree/v2.0.3) |
+| v1.14.x | [v2.0.3](/../../tree/v2.0.3) |
 
-For examples and guides for using the kubectl integration please
-see the [kubectl book] or the [kubernetes documentation].
+For examples and guides for using the kubectl integration please see the [kubectl book] or the [kubernetes documentation].
 
 ## Usage
 
@@ -153,7 +148,7 @@ is governed by the [Kubernetes Code of Conduct].
 [imageBase]: docs/images/base.jpg
 [imageOverlay]: docs/images/overlay.jpg
 [kubectl announcement]: https://kubernetes.io/blog/2019/03/25/kubernetes-1-14-release-announcement
-[kubectl book]: https://kubectl.docs.kubernetes.io/guides/introduction/kustomize/
+[kubectl book]: https://kubectl.docs.kubernetes.io/pages/app_customization/introduction.html
 [kubernetes documentation]: https://kubernetes.io/docs/tasks/manage-kubernetes-objects/kustomization/
 [kubernetes style]: https://kubernetes-sigs.github.io/kustomize/api-reference/glossary#kubernetes-style-object
 [kustomization]: https://kubernetes-sigs.github.io/kustomize/api-reference/glossary#kustomization

api/builtins/HelmChartInflationGenerator.go

@@ -6,15 +6,12 @@ package builtins
 import (
 	"bytes"
 	"fmt"
-	"io"
-	"io/ioutil"
 	"os"
 	"os/exec"
 	"path"
 	"regexp"
 	"strings"
 
-	"github.com/imdario/mergo"
 	"github.com/pkg/errors"
 	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/api/resmap"
@@ -65,9 +62,6 @@ func (p *HelmChartInflationGeneratorPlugin) Config(h *resmap.PluginHelpers, conf
 	if p.Values == "" {
 		p.Values = path.Join(p.ChartHome, p.ChartName, "values.yaml")
 	}
-	if p.ValuesMerge == "" {
-		p.ValuesMerge = "override"
-	}
 	// runHelmCommand will run `helm` command with args provided. Return stdout
 	// and error if there is any.
 	p.runHelmCommand = func(args []string) ([]byte, error) {
@@ -94,63 +88,6 @@ func (p *HelmChartInflationGeneratorPlugin) Config(h *resmap.PluginHelpers, conf
 	return nil
 }
 
-// EncodeValues for writing
-func (p *HelmChartInflationGeneratorPlugin) EncodeValues(w io.Writer) error {
-	d, err := yaml.Marshal(p.ValuesLocal)
-	if err != nil {
-		return err
-	}
-	_, err = w.Write(d)
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-// useValuesLocal process (merge) inflator config provided values with chart default values.yaml
-func (p *HelmChartInflationGeneratorPlugin) useValuesLocal() error {
-	fn := path.Join(p.ChartHome, p.ChartName, "kustomize-values.yaml")
-	vf, err := os.Create(fn)
-	defer vf.Close()
-	if err != nil {
-		return err
-	}
-	// override, merge, none
-	if p.ValuesMerge == "none" || p.ValuesMerge == "no" || p.ValuesMerge == "false" {
-		p.Values = fn
-	} else {
-		pValues, err := ioutil.ReadFile(p.Values)
-		if err != nil {
-			return err
-		}
-		chValues := make(map[string]interface{})
-		err = yaml.Unmarshal(pValues, &chValues)
-		if err != nil {
-			return err
-		}
-		if p.ValuesMerge == "override" {
-			err = mergo.Merge(&chValues, p.ValuesLocal, mergo.WithOverride)
-			if err != nil {
-				return err
-			}
-		}
-		if p.ValuesMerge == "merge" {
-			err = mergo.Merge(&chValues, p.ValuesLocal)
-			if err != nil {
-				return err
-			}
-		}
-		p.ValuesLocal = chValues
-		p.Values = fn
-	}
-	err = p.EncodeValues(vf)
-	if err != nil {
-		return err
-	}
-	vf.Sync()
-	return nil
-}
-
 // Generate implements generator
 func (p *HelmChartInflationGeneratorPlugin) Generate() (resmap.ResMap, error) {
 	// cleanup
@@ -167,15 +104,6 @@ func (p *HelmChartInflationGeneratorPlugin) Generate() (resmap.ResMap, error) {
 			return nil, err
 		}
 	}
-
-	// inflator config valuesLocal
-	if len(p.ValuesLocal) > 0 {
-		err := p.useValuesLocal()
-		if err != nil {
-			return nil, err
-		}
-	}
-
 	// render the charts
 	stdout, err := p.runHelmCommand(p.getTemplateCommandArgs())
 	if err != nil {
@@ -197,7 +125,6 @@ func (p *HelmChartInflationGeneratorPlugin) getTemplateCommandArgs() []string {
 	if p.Values != "" {
 		args = append(args, "--values", p.Values)
 	}
-	args = append(args, p.ExtraArgs...)
 	return args
 }
 

api/builtins/PatchStrategicMergeTransformer.go

@@ -5,14 +5,19 @@ package builtins
 
 import (
 	"fmt"
+	"strings"
 
+	"github.com/pkg/errors"
+	"sigs.k8s.io/kustomize/api/filters/patchstrategicmerge"
 	"sigs.k8s.io/kustomize/api/resmap"
 	"sigs.k8s.io/kustomize/api/resource"
 	"sigs.k8s.io/kustomize/api/types"
+	"sigs.k8s.io/kustomize/kyaml/filtersutil"
 	"sigs.k8s.io/yaml"
 )
 
 type PatchStrategicMergeTransformerPlugin struct {
+	h             *resmap.PluginHelpers
 	loadedPatches []*resource.Resource
 	Paths         []types.PatchStrategicMerge `json:"paths,omitempty" yaml:"paths,omitempty"`
 	Patches       string                      `json:"patches,omitempty" yaml:"patches,omitempty"`
@@ -20,6 +25,7 @@ type PatchStrategicMergeTransformerPlugin struct {
 
 func (p *PatchStrategicMergeTransformerPlugin) Config(
 	h *resmap.PluginHelpers, c []byte) (err error) {
+	p.h = h
 	err = yaml.Unmarshal(c, p)
 	if err != nil {
 		return err
@@ -29,18 +35,13 @@ func (p *PatchStrategicMergeTransformerPlugin) Config(
 	}
 	if len(p.Paths) != 0 {
 		for _, onePath := range p.Paths {
-			// The following oddly attempts to interpret a path string as an
-			// actual patch (instead of as a path to a file containing a patch).
-			// All tests pass if this code is commented out.  This code should
-			// be deleted; the user should use the Patches field which
-			// exists for this purpose (inline patch declaration).
-			res, err := h.ResmapFactory().RF().SliceFromBytes([]byte(onePath))
+			res, err := p.h.ResmapFactory().RF().SliceFromBytes([]byte(onePath))
 			if err == nil {
 				p.loadedPatches = append(p.loadedPatches, res...)
 				continue
 			}
-			res, err = h.ResmapFactory().RF().SliceFromPatches(
-				h.Loader(), []types.PatchStrategicMerge{onePath})
+			res, err = p.h.ResmapFactory().RF().SliceFromPatches(
+				p.h.Loader(), []types.PatchStrategicMerge{onePath})
 			if err != nil {
 				return err
 			}
@@ -48,7 +49,7 @@ func (p *PatchStrategicMergeTransformerPlugin) Config(
 		}
 	}
 	if p.Patches != "" {
-		res, err := h.ResmapFactory().RF().SliceFromBytes([]byte(p.Patches))
+		res, err := p.h.ResmapFactory().RF().SliceFromBytes([]byte(p.Patches))
 		if err != nil {
 			return err
 		}
@@ -59,25 +60,57 @@ func (p *PatchStrategicMergeTransformerPlugin) Config(
 		return fmt.Errorf(
 			"patch appears to be empty; files=%v, Patch=%s", p.Paths, p.Patches)
 	}
-	// Merge the patches, looking for conflicts.
-	m, err := h.ResmapFactory().ConflatePatches(p.loadedPatches)
-	if err != nil {
-		return err
-	}
-	p.loadedPatches = m.Resources()
-	return nil
+	return err
 }
 
 func (p *PatchStrategicMergeTransformerPlugin) Transform(m resmap.ResMap) error {
-	for _, patch := range p.loadedPatches {
+	patches, err := p.h.ResmapFactory().Merge(p.loadedPatches)
+	if err != nil {
+		return err
+	}
+	for _, patch := range patches.Resources() {
 		target, err := m.GetById(patch.OrgId())
 		if err != nil {
 			return err
 		}
-		if err = m.ApplySmPatch(
-			resource.MakeIdSet([]*resource.Resource{target}), patch); err != nil {
+		patchCopy := patch.DeepCopy()
+		patchCopy.SetName(target.GetName())
+		patchCopy.SetNamespace(target.GetNamespace())
+		patchCopy.SetGvk(target.GetGvk())
+		node, err := filtersutil.GetRNode(patchCopy)
+		if err != nil {
 			return err
 		}
+		err = filtersutil.ApplyToJSON(patchstrategicmerge.Filter{
+			Patch: node,
+		}, target)
+		if err != nil {
+			// Check for an error string from UnmarshalJSON that's indicative
+			// of an object that's missing basic KRM fields, and thus may have been
+			// entirely deleted (an acceptable outcome).  This error handling should
+			// be deleted along with use of ResMap and apimachinery functions like
+			// UnmarshalJSON.
+			if !strings.Contains(err.Error(), "Object 'Kind' is missing") {
+				// Some unknown error, let it through.
+				return err
+			}
+			if !target.IsEmpty() {
+				return errors.Wrapf(
+					err, "with unexpectedly non-empty object map of size %d",
+					len(target.Map()))
+			}
+			// Fall through to handle deleted object.
+		}
+		if target.IsEmpty() {
+			// This means all fields have been removed from the object.
+			// This can happen if a patch required deletion of the
+			// entire resource (not just a part of it).  This means
+			// the overall resmap must shrink by one.
+			err = m.Remove(target.CurId())
+			if err != nil {
+				return err
+			}
+		}
 	}
 	return nil
 }

api/builtins/PatchTransformer.go

@@ -8,7 +8,9 @@ import (
 	"strings"
 
 	jsonpatch "github.com/evanphx/json-patch"
+	"github.com/pkg/errors"
 	"sigs.k8s.io/kustomize/api/filters/patchjson6902"
+	"sigs.k8s.io/kustomize/api/filters/patchstrategicmerge"
 	"sigs.k8s.io/kustomize/api/resmap"
 	"sigs.k8s.io/kustomize/api/resource"
 	"sigs.k8s.io/kustomize/api/types"
@@ -39,6 +41,7 @@ func (p *PatchTransformerPlugin) Config(
 		return fmt.Errorf(
 			"patch and path can't be set at the same time\n%s", string(c))
 	}
+
 	if p.Path != "" {
 		loaded, loadErr := h.Loader().Load(p.Path)
 		if loadErr != nil {
@@ -85,13 +88,66 @@ func (p *PatchTransformerPlugin) transformStrategicMerge(m resmap.ResMap, patch
 		if err != nil {
 			return err
 		}
-		return target.ApplySmPatch(patch)
+		return p.applySMPatch(target, patch)
 	}
-	selected, err := m.Select(*p.Target)
+
+	resources, err := m.Select(*p.Target)
 	if err != nil {
 		return err
 	}
-	return m.ApplySmPatch(resource.MakeIdSet(selected), patch)
+	for _, res := range resources {
+		patchCopy := patch.DeepCopy()
+		patchCopy.SetName(res.GetName())
+		patchCopy.SetNamespace(res.GetNamespace())
+		patchCopy.SetGvk(res.GetGvk())
+		err := p.applySMPatch(res, patchCopy)
+		if err != nil {
+			// Check for an error string from UnmarshalJSON that's indicative
+			// of an object that's missing basic KRM fields, and thus may have been
+			// entirely deleted (an acceptable outcome).  This error handling should
+			// be deleted along with use of ResMap and apimachinery functions like
+			// UnmarshalJSON.
+			if !strings.Contains(err.Error(), "Object 'Kind' is missing") {
+				// Some unknown error, let it through.
+				return err
+			}
+			if !res.IsEmpty() {
+				return errors.Wrapf(
+					err, "with unexpectedly non-empty object map of size %d",
+					len(res.Map()))
+			}
+			// Fall through to handle deleted object.
+		}
+		if res.IsEmpty() {
+			// This means all fields have been removed from the object.
+			// This can happen if a patch required deletion of the
+			// entire resource (not just a part of it).  This means
+			// the overall resmap must shrink by one.
+			err = m.Remove(res.CurId())
+			if err != nil {
+				return err
+			}
+		}
+	}
+	return nil
+}
+
+// applySMPatch applies the provided strategic merge patch to the
+// given resource.
+func (p *PatchTransformerPlugin) applySMPatch(resource, patch *resource.Resource) error {
+	node, err := filtersutil.GetRNode(patch)
+	if err != nil {
+		return err
+	}
+	n, ns := resource.GetName(), resource.GetNamespace()
+	err = filtersutil.ApplyToJSON(patchstrategicmerge.Filter{
+		Patch: node,
+	}, resource)
+	if !resource.IsEmpty() {
+		resource.SetName(n)
+		resource.SetNamespace(ns)
+	}
+	return err
 }
 
 // transformJson6902 applies the provided json6902 patch

api/filters/imagetag/imagetag_test.go

@@ -21,7 +21,7 @@ func TestImageTagUpdater_Filter(t *testing.T) {
 	}{
 		"ignore CustomResourceDefinition": {
 			input: `
-apiVersion: apiextensions.k8s.io/v1
+apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   name: whatever
@@ -30,7 +30,7 @@ spec:
   - image: whatever
 `,
 			expectedOutput: `
-apiVersion: apiextensions.k8s.io/v1
+apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   name: whatever

api/filters/nameref/nameref_test.go

@@ -5,9 +5,10 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"sigs.k8s.io/kustomize/api/provider"
+	"sigs.k8s.io/kustomize/api/k8sdeps/kunstruct"
 	"sigs.k8s.io/kustomize/api/resid"
 	"sigs.k8s.io/kustomize/api/resmap"
+	"sigs.k8s.io/kustomize/api/resource"
 	filtertest_test "sigs.k8s.io/kustomize/api/testutils/filtertest"
 	"sigs.k8s.io/kustomize/api/types"
 )
@@ -219,7 +220,7 @@ map:
 
 	for tn, tc := range testCases {
 		t.Run(tn, func(t *testing.T) {
-			factory := provider.NewDefaultDepProvider().GetResourceFactory()
+			factory := resource.NewFactory(kunstruct.NewKunstructuredFactoryImpl())
 			referrer, err := factory.FromBytes([]byte(tc.input))
 			if err != nil {
 				t.Fatal(err)
@@ -320,7 +321,7 @@ metadata:
 
 	for tn, tc := range testCases {
 		t.Run(tn, func(t *testing.T) {
-			factory := provider.NewDefaultDepProvider().GetResourceFactory()
+			factory := resource.NewFactory(kunstruct.NewKunstructuredFactoryImpl())
 			referrer, err := factory.FromBytes([]byte(tc.input))
 			if err != nil {
 				t.Fatal(err)
@@ -731,7 +732,7 @@ ref:
 
 	for tn, tc := range testCases {
 		t.Run(tn, func(t *testing.T) {
-			factory := provider.NewDefaultDepProvider().GetResourceFactory()
+			factory := resource.NewFactory(kunstruct.NewKunstructuredFactoryImpl())
 			referrer, err := factory.FromBytes([]byte(tc.input))
 			if err != nil {
 				t.Fatal(err)

api/filters/patchstrategicmerge/patchstrategicmerge_test.go

@@ -15,101 +15,6 @@ func TestFilter(t *testing.T) {
 		patch    *yaml.RNode
 		expected string
 	}{
-		"simple": {
-			input: `apiVersion: v1
-kind: Deployment
-metadata:
-  name: clown
-spec:
-  numReplicas: 1
-`,
-			patch: yaml.MustParse(`apiVersion: v1
-kind: Deployment
-metadata:
-  name: clown
-spec:
-  numReplicas: 999
-`),
-			expected: `apiVersion: v1
-kind: Deployment
-metadata:
-  name: clown
-spec:
-  numReplicas: 999
-`,
-		},
-		"nullMapEntry1": {
-			input: `
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: my-foo
-spec:
-  bar:
-    B:
-    C: Z
-`,
-			patch: yaml.MustParse(`
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: my-foo
-spec:
-  bar:
-    C: Z
-    D: W
-  baz:
-    hello: world
-`),
-			expected: `
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: my-foo
-spec:
-  bar:
-    C: Z
-    D: W
-  baz:
-    hello: world
-`,
-		},
-		"nullMapEntry2": {
-			input: `
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: my-foo
-spec:
-  bar:
-    C: Z
-    D: W
-  baz:
-    hello: world
-`,
-			patch: yaml.MustParse(`
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: my-foo
-spec:
-  bar:
-    B:
-    C: Z
-`),
-			expected: `
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: my-foo
-spec:
-  bar:
-    C: Z
-    D: W
-  baz:
-    hello: world
-`,
-		},
 		"simple patch": {
 			input: `
 apiVersion: apps/v1

api/go.mod

@@ -1,26 +1,26 @@
 module sigs.k8s.io/kustomize/api
 
-go 1.15
+go 1.14
 
 require (
 	github.com/evanphx/json-patch v4.5.0+incompatible
-	github.com/go-errors/errors v1.0.1
 	github.com/go-openapi/spec v0.19.5
 	github.com/golangci/golangci-lint v1.21.0
 	github.com/google/go-cmp v0.3.0
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
 	github.com/hashicorp/go-multierror v1.1.0
-	github.com/imdario/mergo v0.3.5
 	github.com/pkg/errors v0.8.1
 	github.com/stretchr/testify v1.4.0
-	github.com/yujunz/go-getter v1.5.1-lite.0.20201201013212-6d9c071adddf
+	github.com/yujunz/go-getter v1.4.1-lite
 	golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e
 	gopkg.in/yaml.v2 v2.3.0
-	gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c
+	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.10.5
+	sigs.k8s.io/kustomize/kyaml v0.9.3
 	sigs.k8s.io/yaml v1.2.0
 )
+
+replace sigs.k8s.io/kustomize/kyaml v0.9.3 => ../kyaml

api/go.sum

@@ -158,7 +158,6 @@ github.com/go-toolsmith/strparse v1.0.0 h1:Vcw78DnpCAKlM20kSbAyO4mPfJn/lyYA4BJUD
 github.com/go-toolsmith/strparse v1.0.0/go.mod h1:YI2nUKP9YGZnL/L1/DLFBfixrcjslWct4wyljWhSRy8=
 github.com/go-toolsmith/typep v1.0.0 h1:zKymWyA1TRYvqYrYDrfEMZULyrhcnGY3x7LDKU2XQaA=
 github.com/go-toolsmith/typep v1.0.0/go.mod h1:JSQCQMUPdRlMZFswiq3TGpNp1GMktqkR2Ns5AIQkATU=
-github.com/gobuffalo/here v0.6.0/go.mod h1:wAG085dHOYqUpf+Ap+WOdrPTp5IYcDAs/x7PLa8Y5fM=
 github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
 github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
 github.com/gofrs/flock v0.0.0-20190320160742-5135e617513b h1:ekuhfTjngPhisSjOJ0QWKpPQE8/rbknHaes6WVJj5Hw=
@@ -167,7 +166,6 @@ github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7a
 github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
 github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d h1:3PaI8p3seN09VjbTYC/QWlUZdZ1qS1zGjy7LH2Wt07I=
 github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
-github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
@@ -227,7 +225,6 @@ github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+
 github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d h1:7XGaL1e6bYS1yIonGp9761ExpPPV1ui0SAC59Yube9k=
 github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
 github.com/gophercloud/gophercloud v0.1.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8=
-github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q=
 github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
 github.com/gostaticanalysis/analysisutil v0.0.0-20190318220348-4088753ea4d3 h1:JVnpOZS+qxli+rgVl98ILOXVNbW+kb5wcxeGx8ShUIw=
 github.com/gostaticanalysis/analysisutil v0.0.0-20190318220348-4088753ea4d3/go.mod h1:eEOZF4jCKGi+aprrirO9e7WKB3beBRtWgqGunKl6pKE=
@@ -252,7 +249,6 @@ github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
 github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/imdario/mergo v0.3.5 h1:JboBksRwiiAJWvIYJVo46AfV+IAIKZpfrSzVKj42R4Q=
 github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
 github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
@@ -291,7 +287,6 @@ github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN
 github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.7.0 h1:aizVhC/NAAcKWb+5QsU1iNOZb4Yws5UO2I+aIprQITM=
 github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs=
-github.com/markbates/pkger v0.17.1/go.mod h1:0JoVlrol20BSywW79rN3kdFFsE5xYM+rSCQDXbLhiuI=
 github.com/matoous/godox v0.0.0-20190911065817-5d6d842e92eb h1:RHba4YImhrUVQDHUCe2BNSOz4tVy2yGyXhvYDvxGgeE=
 github.com/matoous/godox v0.0.0-20190911065817-5d6d842e92eb/go.mod h1:1BELzlh859Sh1c6+90blK8lbYy0kwQf1bYlBhBysy1s=
 github.com/mattn/go-colorable v0.1.4 h1:snbPLB8fVfU9iwbbo30TPtbLRzwWu6aJS6Xh4eaaviA=
@@ -370,7 +365,6 @@ github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e h1:MZM7FHLqUHYI0Y/mQAt
 github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk=
 github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041 h1:llrF3Fs4018ePo4+G/HV/uQUqEI1HMDjCeOf2V6puPc=
 github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041/go.mod h1:N5mDOmsrJOB+vfqUK+7DmDyjhSLIIBnXo9lvZJj3MWQ=
-github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
@@ -412,8 +406,8 @@ github.com/timakin/bodyclose v0.0.0-20190930140734-f7f2e9bca95e/go.mod h1:Qimiff
 github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
 github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
-github.com/ulikunitz/xz v0.5.8 h1:ERv8V6GKqVi23rgu5cj9pVfVzJbOqAY2Ntl88O6c2nQ=
-github.com/ulikunitz/xz v0.5.8/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
+github.com/ulikunitz/xz v0.5.5 h1:pFrO0lVpTBXLpYw+pnLj6TbvHuyjXMfjGeCwSqCVwok=
+github.com/ulikunitz/xz v0.5.5/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8=
 github.com/ultraware/funlen v0.0.2 h1:Av96YVBwwNSe4MLR7iI/BIa3VyI7/djnto/pK3Uxbdo=
 github.com/ultraware/funlen v0.0.2/go.mod h1:Dp4UiAus7Wdb9KUZsYWZEWiRzGuM2kXM1lPbfaF6xhA=
 github.com/ultraware/whitespace v0.0.4 h1:If7Va4cM03mpgrNH9k49/VOicWpGoG70XPBFFODYDsg=
@@ -429,8 +423,8 @@ github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q
 github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca h1:1CFlNzQhALwjS9mBAUkycX616GzgsuYUOCHA5+HSlXI=
 github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca/go.mod h1:ce1O1j6UtZfjr22oyGxGLbauSBp2YVXpARAosm7dHBg=
 github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
-github.com/yujunz/go-getter v1.5.1-lite.0.20201201013212-6d9c071adddf h1:gvEmqF83GB8R5XtrMseJb6A6R0OCtNAS8f4TmZg2dGc=
-github.com/yujunz/go-getter v1.5.1-lite.0.20201201013212-6d9c071adddf/go.mod h1:bL0Pr07HEdsMZ1WBqZIxXj96r5LnFsY4LgPaPEGkw1k=
+github.com/yujunz/go-getter v1.4.1-lite h1:FhvNc94AXMZkfqUwfMKhnQEC9phkphSGdPTL7tIdhOM=
+github.com/yujunz/go-getter v1.4.1-lite/go.mod h1:sbmqxXjyLunH1PkF3n7zSlnVeMvmYUuIl9ZVs/7NyCc=
 go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.mongodb.org/mongo-driver v1.0.3/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
 go.mongodb.org/mongo-driver v1.1.1/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
@@ -567,13 +561,12 @@ gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bl
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+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=
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.1-2019.2.3 h1:3JgtbtFHMiCmsznwGVTUWbgGov+pVqnlf1dEJTNAXeM=
@@ -599,8 +592,6 @@ mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b h1:DxJ5nJdkhDlLok9K6qO+5290kphD
 mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b/go.mod h1:2odslEg/xrtNQqCYg2/jCoyKnw3vv5biOc3JnIcYfL4=
 mvdan.cc/unparam v0.0.0-20190720180237-d51796306d8f h1:Cq7MalBHYACRd6EesksG1Q8EoIAKOsiZviGKbOLIej4=
 mvdan.cc/unparam v0.0.0-20190720180237-d51796306d8f/go.mod h1:4G1h5nDURzA3bwVMZIVpwbkw+04kSxk3rAtzlimaUJw=
-sigs.k8s.io/kustomize/kyaml v0.10.5 h1:PbJcsZsEM7O3hHtUWTR+4WkHVbQRW9crSy75or1gRbI=
-sigs.k8s.io/kustomize/kyaml v0.10.5/go.mod h1:P6Oy/ah/GZMKzJMIJA2a3/bc8YrBkuL5kJji13PSIzY=
 sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI=
 sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
 sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q=

api/ifc/ifc.go

@@ -43,12 +43,12 @@ type Kunstructured interface {
 	// Several uses.
 	Copy() Kunstructured
 
-	// GetAnnotations returns the k8s annotations.
+	// 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
 
-	// GetData returns a top-level "data" field, as in a ConfigMap.
-	GetDataMap() map[string]string
-
 	// Used by ResAccumulator and ReplacementTransformer.
 	GetFieldValue(string) (interface{}, error)
 
@@ -58,7 +58,7 @@ type Kunstructured interface {
 	// Used by resource.Factory.SliceFromBytes
 	GetKind() string
 
-	// GetLabels returns the k8s labels.
+	// Used by Resource.Replace
 	GetLabels() map[string]string
 
 	// Used by Resource.CurId and resource factory.
@@ -84,22 +84,19 @@ type Kunstructured interface {
 	// Used by resWrangler.Select
 	MatchesLabelSelector(selector string) (bool, error)
 
-	// SetAnnotations replaces the k8s annotations.
+	// Used by Resource.Replace.
 	SetAnnotations(map[string]string)
 
-	// SetDataMap sets a top-level "data" field, as in a ConfigMap.
-	SetDataMap(map[string]string)
-
 	// Used by PatchStrategicMergeTransformer.
 	SetGvk(resid.Gvk)
 
-	// SetLabels replaces the k8s labels.
+	// Used by Resource.Replace and used to remove "validated by" labels.
 	SetLabels(map[string]string)
 
-	// SetName changes the name.
+	// Used by Resource.Replace.
 	SetName(string)
 
-	// SetNamespace changes the namespace.
+	// Used by Resource.Replace.
 	SetNamespace(string)
 
 	// Needed, for now, by kyaml/filtersutil.ApplyToJSON.

api/internal/accumulator/namereferencetransformer_test.go

@@ -8,14 +8,17 @@ import (
 	"testing"
 
 	"sigs.k8s.io/kustomize/api/internal/plugins/builtinconfig"
-	"sigs.k8s.io/kustomize/api/provider"
+	"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"
 )
 
 func TestNameReferenceHappyRun(t *testing.T) {
-	m := resmaptest_test.NewRmBuilderDefault(t).AddWithName(
+	rf := resource.NewFactory(
+		kunstruct.NewKunstructuredFactoryImpl())
+	m := resmaptest_test.NewRmBuilder(t, rf).AddWithName(
 		"cm1",
 		map[string]interface{}{
 			"apiVersion": "v1",
@@ -217,7 +220,6 @@ func TestNameReferenceHappyRun(t *testing.T) {
 						"secret1",
 						"secret1",
 						"secret2",
-						"cm1",
 					},
 				},
 			},
@@ -259,8 +261,7 @@ func TestNameReferenceHappyRun(t *testing.T) {
 			},
 		}).ResMap()
 
-	expected := resmaptest_test.NewSeededRmBuilderDefault(
-		t, m.ShallowCopy()).ReplaceResource(
+	expected := resmaptest_test.NewSeededRmBuilder(t, rf, m.ShallowCopy()).ReplaceResource(
 		map[string]interface{}{
 			"group":      "apps",
 			"apiVersion": "v1",
@@ -421,7 +422,6 @@ func TestNameReferenceHappyRun(t *testing.T) {
 						"someprefix-secret1-somehash",
 						"someprefix-secret1-somehash",
 						"secret2",
-						"someprefix-cm1-somehash",
 					},
 				},
 			},
@@ -475,12 +475,14 @@ func TestNameReferenceHappyRun(t *testing.T) {
 }
 
 func TestNameReferenceUnhappyRun(t *testing.T) {
+	rf := resource.NewFactory(
+		kunstruct.NewKunstructuredFactoryImpl())
 	tests := []struct {
 		resMap      resmap.ResMap
 		expectedErr string
 	}{
 		{
-			resMap: resmaptest_test.NewRmBuilderDefault(t).Add(
+			resMap: resmaptest_test.NewRmBuilder(t, rf).Add(
 				map[string]interface{}{
 					"apiVersion": "rbac.authorization.k8s.io/v1",
 					"kind":       "ClusterRole",
@@ -500,7 +502,7 @@ func TestNameReferenceUnhappyRun(t *testing.T) {
 				}).ResMap(),
 			expectedErr: "is expected to be"},
 		{
-			resMap: resmaptest_test.NewRmBuilderDefault(t).Add(
+			resMap: resmaptest_test.NewRmBuilder(t, rf).Add(
 				map[string]interface{}{
 					"apiVersion": "rbac.authorization.k8s.io/v1",
 					"kind":       "ClusterRole",
@@ -536,7 +538,8 @@ func TestNameReferenceUnhappyRun(t *testing.T) {
 }
 
 func TestNameReferencePersistentVolumeHappyRun(t *testing.T) {
-	rf := provider.NewDefaultDepProvider().GetResourceFactory()
+	rf := resource.NewFactory(
+		kunstruct.NewKunstructuredFactoryImpl())
 
 	v1 := rf.FromMapWithName(
 		"volume1",
@@ -661,7 +664,9 @@ const (
 // object with the same original names (uniquename) in different namespaces
 // and with different current Id.
 func TestNameReferenceNamespace(t *testing.T) {
-	m := resmaptest_test.NewRmBuilderDefault(t).
+	rf := resource.NewFactory(
+		kunstruct.NewKunstructuredFactoryImpl())
+	m := resmaptest_test.NewRmBuilder(t, rf).
 		// Add ConfigMap with the same org name in noNs, "ns1" and "ns2" namespaces
 		AddWithName(orgname, map[string]interface{}{
 			"apiVersion": "v1",
@@ -710,7 +715,7 @@ func TestNameReferenceNamespace(t *testing.T) {
 		AddWithNsAndName(ns1, orgname, deploymentMap(ns1, prefixedname, orgname, orgname)).
 		AddWithNsAndName(ns2, orgname, deploymentMap(ns2, suffixedname, orgname, orgname)).ResMap()
 
-	expected := resmaptest_test.NewSeededRmBuilderDefault(t, m.ShallowCopy()).
+	expected := resmaptest_test.NewSeededRmBuilder(t, rf, m.ShallowCopy()).
 		ReplaceResource(deploymentMap(defaultNs, modifiedname, modifiedname, modifiedname)).
 		ReplaceResource(deploymentMap(ns1, prefixedname, prefixedname, prefixedname)).
 		ReplaceResource(deploymentMap(ns2, suffixedname, suffixedname, suffixedname)).ResMap()
@@ -730,7 +735,9 @@ func TestNameReferenceNamespace(t *testing.T) {
 // object with the same original names (uniquename) in different namespaces
 // and with different current Id.
 func TestNameReferenceClusterWide(t *testing.T) {
-	m := resmaptest_test.NewRmBuilderDefault(t).
+	rf := resource.NewFactory(
+		kunstruct.NewKunstructuredFactoryImpl())
+	m := resmaptest_test.NewRmBuilder(t, rf).
 		// Add ServiceAccount with the same org name in noNs, "ns1" and "ns2" namespaces
 		AddWithName(orgname, map[string]interface{}{
 			"apiVersion": "v1",
@@ -809,7 +816,7 @@ func TestNameReferenceClusterWide(t *testing.T) {
 				},
 			}}).ResMap()
 
-	expected := resmaptest_test.NewSeededRmBuilderDefault(t, m.ShallowCopy()).
+	expected := resmaptest_test.NewSeededRmBuilder(t, rf, m.ShallowCopy()).
 		ReplaceResource(
 			map[string]interface{}{
 				"apiVersion": "rbac.authorization.k8s.io/v1",
@@ -891,7 +898,9 @@ func TestNameReferenceClusterWide(t *testing.T) {
 // object with the same original names (uniquename) in different namespaces
 // and with different current Id.
 func TestNameReferenceNamespaceTransformation(t *testing.T) {
-	m := resmaptest_test.NewRmBuilderDefault(t).
+	rf := resource.NewFactory(
+		kunstruct.NewKunstructuredFactoryImpl())
+	m := resmaptest_test.NewRmBuilder(t, rf).
 		AddWithNsAndName(ns4, orgname, map[string]interface{}{
 			"apiVersion": "v1",
 			"kind":       "Secret",
@@ -955,7 +964,7 @@ func TestNameReferenceNamespaceTransformation(t *testing.T) {
 				},
 			}}).ResMap()
 
-	expected := resmaptest_test.NewSeededRmBuilderDefault(t, m.ShallowCopy()).
+	expected := resmaptest_test.NewSeededRmBuilder(t, rf, m.ShallowCopy()).
 		ReplaceResource(
 			map[string]interface{}{
 				"apiVersion": "rbac.authorization.k8s.io/v1",
@@ -1017,7 +1026,9 @@ func TestNameReferenceNamespaceTransformation(t *testing.T) {
 // It validates the change done is IsSameFuzzyNamespace which
 // uses the IsNsEquals method instead of the simple == operator.
 func TestNameReferenceCandidateSelection(t *testing.T) {
-	m := resmaptest_test.NewRmBuilderDefault(t).
+	rf := resource.NewFactory(
+		kunstruct.NewKunstructuredFactoryImpl())
+	m := resmaptest_test.NewRmBuilder(t, rf).
 		AddWithName("cm1", map[string]interface{}{
 			"apiVersion": "v1",
 			"kind":       "ConfigMap",
@@ -1034,7 +1045,7 @@ func TestNameReferenceCandidateSelection(t *testing.T) {
 		AddWithName("deploy1", deploymentMap("", "p1-deploy1", "cm1", "secret1")).
 		ResMap()
 
-	expected := resmaptest_test.NewSeededRmBuilderDefault(t, m.ShallowCopy()).
+	expected := resmaptest_test.NewSeededRmBuilder(t, rf, m.ShallowCopy()).
 		ReplaceResource(deploymentMap("", "p1-deploy1", "p1-cm1-hash", "p1-secret1-hash")).
 		ResMap()
 

api/internal/accumulator/refvartransformer_test.go

@@ -7,8 +7,10 @@ import (
 	"reflect"
 	"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"
 )
@@ -44,7 +46,8 @@ func TestRefVarTransformer(t *testing.T) {
 					{Gvk: resid.Gvk{Version: "v1", Kind: "ConfigMap"}, Path: "data/interface"},
 					{Gvk: resid.Gvk{Version: "v1", Kind: "ConfigMap"}, Path: "data/num"},
 				},
-				res: resmaptest_test.NewRmBuilderDefault(t).
+				res: resmaptest_test.NewRmBuilder(
+					t, resource.NewFactory(kunstruct.NewKunstructuredFactoryImpl())).
 					Add(map[string]interface{}{
 						"apiVersion": "v1",
 						"kind":       "ConfigMap",
@@ -74,7 +77,8 @@ func TestRefVarTransformer(t *testing.T) {
 						}}).ResMap(),
 			},
 			expected: expected{
-				res: resmaptest_test.NewRmBuilderDefault(t).
+				res: resmaptest_test.NewRmBuilder(
+					t, resource.NewFactory(kunstruct.NewKunstructuredFactoryImpl())).
 					Add(map[string]interface{}{
 						"apiVersion": "v1",
 						"kind":       "ConfigMap",
@@ -112,7 +116,8 @@ func TestRefVarTransformer(t *testing.T) {
 				fs: []types.FieldSpec{
 					{Gvk: resid.Gvk{Version: "v1", Kind: "ConfigMap"}, Path: "data/slice"},
 				},
-				res: resmaptest_test.NewRmBuilderDefault(t).
+				res: resmaptest_test.NewRmBuilder(
+					t, resource.NewFactory(kunstruct.NewKunstructuredFactoryImpl())).
 					Add(map[string]interface{}{
 						"apiVersion": "v1",
 						"kind":       "ConfigMap",
@@ -133,7 +138,8 @@ func TestRefVarTransformer(t *testing.T) {
 				fs: []types.FieldSpec{
 					{Gvk: resid.Gvk{Version: "v1", Kind: "ConfigMap"}, Path: "data/nil"},
 				},
-				res: resmaptest_test.NewRmBuilderDefault(t).
+				res: resmaptest_test.NewRmBuilder(
+					t, resource.NewFactory(kunstruct.NewKunstructuredFactoryImpl())).
 					Add(map[string]interface{}{
 						"apiVersion": "v1",
 						"kind":       "ConfigMap",
@@ -145,7 +151,8 @@ func TestRefVarTransformer(t *testing.T) {
 						}}).ResMap(),
 			},
 			expected: expected{
-				res: resmaptest_test.NewRmBuilderDefault(t).
+				res: resmaptest_test.NewRmBuilder(
+					t, resource.NewFactory(kunstruct.NewKunstructuredFactoryImpl())).
 					Add(map[string]interface{}{
 						"apiVersion": "v1",
 						"kind":       "ConfigMap",

api/internal/accumulator/resaccumulator.go

@@ -41,11 +41,13 @@ func (ra *ResAccumulator) Vars() []types.Var {
 	return ra.varSet.AsSlice()
 }
 
-func (ra *ResAccumulator) AppendAll(resources resmap.ResMap) error {
+func (ra *ResAccumulator) AppendAll(
+	resources resmap.ResMap) error {
 	return ra.resMap.AppendAll(resources)
 }
 
-func (ra *ResAccumulator) AbsorbAll(resources resmap.ResMap) error {
+func (ra *ResAccumulator) AbsorbAll(
+	resources resmap.ResMap) error {
 	return ra.resMap.AbsorbAll(resources)
 }
 

api/internal/accumulator/resaccumulator_test.go

@@ -12,7 +12,7 @@ import (
 
 	. "sigs.k8s.io/kustomize/api/internal/accumulator"
 	"sigs.k8s.io/kustomize/api/internal/plugins/builtinconfig"
-	"sigs.k8s.io/kustomize/api/provider"
+	"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"
@@ -20,14 +20,16 @@ import (
 	"sigs.k8s.io/kustomize/api/types"
 )
 
-func makeResAccumulator(t *testing.T) *ResAccumulator {
+func makeResAccumulator(t *testing.T) (*ResAccumulator, *resource.Factory) {
 	ra := MakeEmptyAccumulator()
 	err := ra.MergeConfig(builtinconfig.MakeDefaultConfig())
 	if err != nil {
 		t.Fatalf("unexpected err: %v", err)
 	}
+	rf := resource.NewFactory(
+		kunstruct.NewKunstructuredFactoryImpl())
 	err = ra.AppendAll(
-		resmaptest_test.NewRmBuilderDefault(t).
+		resmaptest_test.NewRmBuilder(t, rf).
 			Add(map[string]interface{}{
 				"apiVersion": "apps/v1",
 				"kind":       "Deployment",
@@ -64,11 +66,11 @@ func makeResAccumulator(t *testing.T) *ResAccumulator {
 	if err != nil {
 		t.Fatalf("unexpected err: %v", err)
 	}
-	return ra
+	return ra, rf
 }
 
 func TestResolveVarsHappy(t *testing.T) {
-	ra := makeResAccumulator(t)
+	ra, _ := makeResAccumulator(t)
 	err := ra.MergeVars([]types.Var{
 		{
 			Name: "SERVICE_ONE",
@@ -97,7 +99,7 @@ func TestResolveVarsHappy(t *testing.T) {
 }
 
 func TestResolveVarsOneUnused(t *testing.T) {
-	ra := makeResAccumulator(t)
+	ra, _ := makeResAccumulator(t)
 	err := ra.MergeVars([]types.Var{
 		{
 			Name: "SERVICE_ONE",
@@ -138,10 +140,11 @@ func expectLog(t *testing.T, log bytes.Buffer, expect string) {
 }
 
 func TestResolveVarsVarNeedsDisambiguation(t *testing.T) {
-	ra := makeResAccumulator(t)
+	ra, rf := makeResAccumulator(t)
+
 	rm0 := resmap.New()
 	err := rm0.Append(
-		provider.NewDefaultDepProvider().GetResourceFactory().FromMap(
+		rf.FromMap(
 			map[string]interface{}{
 				"apiVersion": "v1",
 				"kind":       "Service",
@@ -210,7 +213,8 @@ func makeVarToNamepaceAndPath(
 }
 
 func TestResolveVarConflicts(t *testing.T) {
-	rf := provider.NewDefaultDepProvider().GetResourceFactory()
+	rf := resource.NewFactory(kunstruct.NewKunstructuredFactoryImpl())
+
 	// create configmaps in foo and bar namespaces with `data.provider` values.
 	fooAws := makeNamespacedConfigMapWithDataProviderValue("foo", "aws")
 	barAws := makeNamespacedConfigMapWithDataProviderValue("bar", "aws")
@@ -257,7 +261,7 @@ func TestResolveVarConflicts(t *testing.T) {
 }
 
 func TestResolveVarsGoodResIdBadField(t *testing.T) {
-	ra := makeResAccumulator(t)
+	ra, _ := makeResAccumulator(t)
 	err := ra.MergeVars([]types.Var{
 		{
 			Name: "SERVICE_ONE",
@@ -282,7 +286,7 @@ func TestResolveVarsGoodResIdBadField(t *testing.T) {
 }
 
 func TestResolveVarsUnmappableVar(t *testing.T) {
-	ra := makeResAccumulator(t)
+	ra, _ := makeResAccumulator(t)
 	err := ra.MergeVars([]types.Var{
 		{
 			Name: "SERVICE_THREE",
@@ -306,7 +310,7 @@ func TestResolveVarsUnmappableVar(t *testing.T) {
 }
 
 func TestResolveVarsWithNoambiguation(t *testing.T) {
-	ra1 := makeResAccumulator(t)
+	ra1, rf := makeResAccumulator(t)
 	err := ra1.MergeVars([]types.Var{
 		{
 			Name: "SERVICE_ONE",
@@ -323,7 +327,7 @@ func TestResolveVarsWithNoambiguation(t *testing.T) {
 	// Create another accumulator having a resource with different prefix
 	ra2 := MakeEmptyAccumulator()
 
-	m := resmaptest_test.NewRmBuilderDefault(t).
+	m := resmaptest_test.NewRmBuilder(t, rf).
 		Add(map[string]interface{}{
 			"apiVersion": "apps/v1",
 			"kind":       "Deployment",

api/internal/conflict/factory.go

@@ -1,23 +0,0 @@
-// Copyright 2020 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package conflict
-
-import (
-	"sigs.k8s.io/kustomize/api/resid"
-	"sigs.k8s.io/kustomize/api/resource"
-)
-
-type cdFactory struct{}
-
-var _ resource.ConflictDetectorFactory = &cdFactory{}
-
-// NewFactory returns a new conflict detector factory.
-func NewFactory() resource.ConflictDetectorFactory {
-	return &cdFactory{}
-}
-
-// New returns an instance of smPatchMergeOnlyDetector.
-func (c cdFactory) New(_ resid.Gvk) (resource.ConflictDetector, error) {
-	return &smPatchMergeOnlyDetector{}, nil
-}

api/internal/conflict/smpatchmergeonlydetector.go

@@ -1,33 +0,0 @@
-// Copyright 2020 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package conflict
-
-import (
-	"sigs.k8s.io/kustomize/api/resource"
-)
-
-// smPatchMergeOnlyDetector ignores conflicts,
-// but does real strategic merge patching.
-// This is part of an effort to eliminate dependence on
-// apimachinery package to allow kustomize integration
-// into kubectl (#2506 and #1500)
-type smPatchMergeOnlyDetector struct{}
-
-var _ resource.ConflictDetector = &smPatchMergeOnlyDetector{}
-
-func (c *smPatchMergeOnlyDetector) HasConflict(
-	_, _ *resource.Resource) (bool, error) {
-	return false, nil
-}
-
-// There's at least one case that doesn't work.  Suppose one has a
-// Deployment with a volume with the bizarre "emptyDir: {}" entry.
-// If you want to get rid of this entry via a patch containing
-// the entry "emptyDir: null", then the following won't work,
-// because null entries are eliminated.
-func (c *smPatchMergeOnlyDetector) MergePatches(
-	r, patch *resource.Resource) (*resource.Resource, error) {
-	err := r.ApplySmPatch(patch)
-	return r, err
-}

api/internal/crawl/doc/doc.go

@@ -7,13 +7,14 @@ import (
 	"sort"
 	"strings"
 
+	"sigs.k8s.io/kustomize/api/k8sdeps/kunstruct"
 	"sigs.k8s.io/kustomize/api/konfig"
-	"sigs.k8s.io/kustomize/api/provider"
-	"sigs.k8s.io/kustomize/api/resource"
 	"sigs.k8s.io/kustomize/api/types"
 	"sigs.k8s.io/yaml"
 )
 
+var fileReader = kunstruct.NewKunstructuredFactoryImpl()
+
 // This document is meant to be used at the elasticsearch document type.
 // Fields are serialized as-is to elasticsearch, where indices are built
 // to facilitate text search queries. Identifiers, Values, FilePath,
@@ -41,7 +42,6 @@ type KustomizationDocument struct {
 	Kinds       []string `json:"kinds,omitempty"`
 	Identifiers []string `json:"identifiers,omitempty"`
 	Values      []string `json:"values,omitempty"`
-	resFactory  *resource.Factory
 }
 
 type set map[string]struct{}
@@ -52,7 +52,6 @@ func (doc *KustomizationDocument) Copy() *KustomizationDocument {
 		Kinds:       doc.Kinds,
 		Identifiers: doc.Identifiers,
 		Values:      doc.Values,
-		resFactory:  provider.NewDefaultDepProvider().GetResourceFactory(),
 	}
 }
 
@@ -151,7 +150,7 @@ func (doc *KustomizationDocument) readBytes() ([]map[string]interface{}, error)
 	}
 
 	configs := make([]map[string]interface{}, 0)
-	ks, err := doc.resFactory.SliceFromBytes(data)
+	ks, err := fileReader.SliceFromBytes(data)
 	if err != nil {
 		return nil, fmt.Errorf("unable to parse resource: %v", err)
 	}

api/internal/crawl/go.mod

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

api/internal/crawl/go.sum

@@ -145,7 +145,6 @@ github.com/go-toolsmith/pkgload v0.0.0-20181119091011-e9e65178eee8/go.mod h1:WoM
 github.com/go-toolsmith/pkgload v1.0.0/go.mod h1:5eFArkbO80v7Z0kdngIxsRXRMTaX4Ilcwuh3clNrQJc=
 github.com/go-toolsmith/strparse v1.0.0/go.mod h1:YI2nUKP9YGZnL/L1/DLFBfixrcjslWct4wyljWhSRy8=
 github.com/go-toolsmith/typep v1.0.0/go.mod h1:JSQCQMUPdRlMZFswiq3TGpNp1GMktqkR2Ns5AIQkATU=
-github.com/gobuffalo/here v0.6.0/go.mod h1:wAG085dHOYqUpf+Ap+WOdrPTp5IYcDAs/x7PLa8Y5fM=
 github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
 github.com/gofrs/flock v0.0.0-20190320160742-5135e617513b/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
@@ -220,7 +219,6 @@ github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
 github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/imdario/mergo v0.3.5 h1:JboBksRwiiAJWvIYJVo46AfV+IAIKZpfrSzVKj42R4Q=
 github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
@@ -255,7 +253,6 @@ github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN
 github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.7.0 h1:aizVhC/NAAcKWb+5QsU1iNOZb4Yws5UO2I+aIprQITM=
 github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs=
-github.com/markbates/pkger v0.17.1/go.mod h1:0JoVlrol20BSywW79rN3kdFFsE5xYM+rSCQDXbLhiuI=
 github.com/matoous/godox v0.0.0-20190911065817-5d6d842e92eb/go.mod h1:1BELzlh859Sh1c6+90blK8lbYy0kwQf1bYlBhBysy1s=
 github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
 github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
@@ -320,7 +317,6 @@ github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR
 github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/securego/gosec v0.0.0-20191002120514-e680875ea14d/go.mod h1:w5+eXa0mYznDkHaMCXA4XYffjlH+cy1oyKbfzJXa2Do=
 github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
-github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=
 github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
 github.com/shirou/gopsutil v0.0.0-20190901111213-e4ec7b275ada/go.mod h1:WWnYX4lzhCH5h/3YBfyVA3VbLYjlMZZAQcW9ojMexNc=
 github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4/go.mod h1:qsXQc7+bwAM3Q1u/4XEfrquwF8Lw7D7y5cD8CuHnfIc=
@@ -359,8 +355,8 @@ github.com/timakin/bodyclose v0.0.0-20190930140734-f7f2e9bca95e/go.mod h1:Qimiff
 github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
 github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
-github.com/ulikunitz/xz v0.5.8 h1:ERv8V6GKqVi23rgu5cj9pVfVzJbOqAY2Ntl88O6c2nQ=
-github.com/ulikunitz/xz v0.5.8/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
+github.com/ulikunitz/xz v0.5.5 h1:pFrO0lVpTBXLpYw+pnLj6TbvHuyjXMfjGeCwSqCVwok=
+github.com/ulikunitz/xz v0.5.5/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8=
 github.com/ultraware/funlen v0.0.2/go.mod h1:Dp4UiAus7Wdb9KUZsYWZEWiRzGuM2kXM1lPbfaF6xhA=
 github.com/ultraware/whitespace v0.0.4/go.mod h1:aVMh/gQve5Maj9hQ/hg+F75lr/X5A89uZnzAmWSineA=
 github.com/uudashr/gocognit v0.0.0-20190926065955-1655d0de0517/go.mod h1:j44Ayx2KW4+oB6SWMv8KsmHzZrOInQav7D3cQMJ5JUM=
@@ -373,8 +369,8 @@ github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q
 github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca h1:1CFlNzQhALwjS9mBAUkycX616GzgsuYUOCHA5+HSlXI=
 github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca/go.mod h1:ce1O1j6UtZfjr22oyGxGLbauSBp2YVXpARAosm7dHBg=
 github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
-github.com/yujunz/go-getter v1.5.1-lite.0.20201201013212-6d9c071adddf h1:gvEmqF83GB8R5XtrMseJb6A6R0OCtNAS8f4TmZg2dGc=
-github.com/yujunz/go-getter v1.5.1-lite.0.20201201013212-6d9c071adddf/go.mod h1:bL0Pr07HEdsMZ1WBqZIxXj96r5LnFsY4LgPaPEGkw1k=
+github.com/yujunz/go-getter v1.4.1-lite h1:FhvNc94AXMZkfqUwfMKhnQEC9phkphSGdPTL7tIdhOM=
+github.com/yujunz/go-getter v1.4.1-lite/go.mod h1:sbmqxXjyLunH1PkF3n7zSlnVeMvmYUuIl9ZVs/7NyCc=
 go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.mongodb.org/mongo-driver v1.0.3/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
 go.mongodb.org/mongo-driver v1.1.1/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
@@ -507,13 +503,12 @@ gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+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=
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
@@ -534,8 +529,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.10.5 h1:PbJcsZsEM7O3hHtUWTR+4WkHVbQRW9crSy75or1gRbI=
-sigs.k8s.io/kustomize/kyaml v0.10.5/go.mod h1:P6Oy/ah/GZMKzJMIJA2a3/bc8YrBkuL5kJji13PSIzY=
+sigs.k8s.io/kustomize/kyaml v0.9.3 h1:kZ5HnNmmnbndSXFivrAVM6u3Ik1dwu4kbpaV8KNwy8I=
+sigs.k8s.io/kustomize/kyaml v0.9.3/go.mod h1:UTm64bSWVdBUA8EQoYCxVOaBQxUdIOr5LKWxA4GNbkw=
 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/generators/configmap.go

@@ -1,51 +0,0 @@
-// Copyright 2020 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package generators
-
-import (
-	"sigs.k8s.io/kustomize/api/filters/filtersutil"
-	"sigs.k8s.io/kustomize/api/ifc"
-	"sigs.k8s.io/kustomize/api/types"
-	"sigs.k8s.io/kustomize/kyaml/yaml"
-)
-
-// MakeConfigMap makes a configmap.
-//
-// ConfigMap: https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.19/#configmap-v1-core
-//
-// ConfigMaps and Secrets are similar.
-//
-// Both objects have a `data` field, which contains a map from keys to
-// values that must be UTF-8 valid strings.  Such data might be simple text,
-// or whoever made the data may have done so by performing a base64 encoding
-// on binary data. Regardless, k8s has no means to know this, so it treats
-// the data field as a string.
-//
-// The ConfigMap has an additional field `binaryData`, also a map, but its
-// values are _intended_ to be interpreted as a base64 encoding of []byte,
-// by whatever makes use of the ConfigMap.
-//
-// In a ConfigMap, any key used in `data` cannot also be used in `binaryData`
-// and vice-versa.  A key must be unique across both maps.
-func MakeConfigMap(
-	ldr ifc.KvLoader, args *types.ConfigMapArgs) (rn *yaml.RNode, err error) {
-	rn, err = makeBaseNode("ConfigMap", args.Name, args.Namespace)
-	if err != nil {
-		return nil, err
-	}
-	m, err := makeValidatedDataMap(ldr, args.Name, args.KvPairSources)
-	if err != nil {
-		return nil, err
-	}
-	for _, k := range filtersutil.SortedMapKeys(m) {
-		fldName, vrN := makeConfigMapValueRNode(m[k])
-		if _, err = rn.Pipe(
-			yaml.LookupCreate(yaml.MappingNode, fldName),
-			yaml.SetField(k, vrN)); err != nil {
-			return nil, err
-		}
-	}
-	copyLabelsAndAnnotations(rn, args.Options)
-	return rn, err
-}

api/internal/generators/configmap_test.go

@@ -1,223 +0,0 @@
-// Copyright 2020 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package generators_test
-
-import (
-	"path/filepath"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"sigs.k8s.io/kustomize/api/filesys"
-	. "sigs.k8s.io/kustomize/api/internal/generators"
-	"sigs.k8s.io/kustomize/api/kv"
-	"sigs.k8s.io/kustomize/api/loader"
-	valtest_test "sigs.k8s.io/kustomize/api/testutils/valtest"
-	"sigs.k8s.io/kustomize/api/types"
-)
-
-var binaryHello = []byte{
-	0xff, // non-utf8
-	0x68, // h
-	0x65, // e
-	0x6c, // l
-	0x6c, // l
-	0x6f, // o
-}
-
-func manyHellos(count int) (result []byte) {
-	for i := 0; i < count; i++ {
-		result = append(result, binaryHello...)
-	}
-	return
-}
-
-func TestMakeConfigMap(t *testing.T) {
-	type expected struct {
-		out    string
-		errMsg string
-	}
-
-	testCases := map[string]struct {
-		args types.ConfigMapArgs
-		exp  expected
-	}{
-		"construct config map from env": {
-			args: types.ConfigMapArgs{
-				GeneratorArgs: types.GeneratorArgs{
-					Name: "envConfigMap",
-					KvPairSources: types.KvPairSources{
-						EnvSources: []string{
-							filepath.Join("configmap", "app.env"),
-						},
-					},
-				},
-			},
-			exp: expected{
-				out: `apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: envConfigMap
-data:
-  DB_PASSWORD: qwerty
-  DB_USERNAME: admin
-`,
-			},
-		},
-		"construct config map from text file": {
-			args: types.ConfigMapArgs{
-				GeneratorArgs: types.GeneratorArgs{
-					Name: "fileConfigMap1",
-					KvPairSources: types.KvPairSources{
-						FileSources: []string{
-							filepath.Join("configmap", "app-init.ini"),
-						},
-					},
-				},
-			},
-			exp: expected{
-				out: `apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: fileConfigMap1
-data:
-  app-init.ini: |
-    FOO=bar
-    BAR=baz
-`,
-			},
-		},
-		"construct config map from text and binary file": {
-			args: types.ConfigMapArgs{
-				GeneratorArgs: types.GeneratorArgs{
-					Name: "fileConfigMap2",
-					KvPairSources: types.KvPairSources{
-						FileSources: []string{
-							filepath.Join("configmap", "app-init.ini"),
-							filepath.Join("configmap", "app.bin"),
-						},
-					},
-				},
-			},
-			exp: expected{
-				out: `apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: fileConfigMap2
-data:
-  app-init.ini: |
-    FOO=bar
-    BAR=baz
-binaryData:
-  app.bin: |
-    /2hlbGxv/2hlbGxv/2hlbGxv/2hlbGxv/2hlbGxv/2hlbGxv/2hlbGxv/2hlbGxv/2hlbG
-    xv/2hlbGxv/2hlbGxv/2hlbGxv/2hlbGxv/2hlbGxv/2hlbGxv/2hlbGxv/2hlbGxv/2hl
-    bGxv/2hlbGxv/2hlbGxv/2hlbGxv/2hlbGxv/2hlbGxv/2hlbGxv/2hlbGxv/2hlbGxv/2
-    hlbGxv/2hlbGxv/2hlbGxv/2hlbGxv
-`,
-			},
-		},
-		"construct config map from literal": {
-			args: types.ConfigMapArgs{
-				GeneratorArgs: types.GeneratorArgs{
-					Name: "literalConfigMap1",
-					KvPairSources: types.KvPairSources{
-						LiteralSources: []string{"a=x", "b=y", "c=\"Hello World\"", "d='true'"},
-					},
-					Options: &types.GeneratorOptions{
-						Labels: map[string]string{
-							"foo": "bar",
-						},
-					},
-				},
-			},
-			exp: expected{
-				out: `apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: literalConfigMap1
-  labels:
-    foo: 'bar'
-data:
-  a: x
-  b: y
-  c: Hello World
-  d: "true"
-`,
-			},
-		},
-		"construct config map from literal with GeneratorOptions in ConfigMapArgs": {
-			args: types.ConfigMapArgs{
-				GeneratorArgs: types.GeneratorArgs{
-					Name: "literalConfigMap2",
-					KvPairSources: types.KvPairSources{
-						LiteralSources: []string{"a=x", "b=y", "c=\"Hello World\"", "d='true'"},
-					},
-					Options: &types.GeneratorOptions{
-						Labels: map[string]string{
-							"veggie": "celery",
-							"dog":    "beagle",
-							"cat":    "annoying",
-						},
-						Annotations: map[string]string{
-							"river": "Missouri",
-							"city":  "Iowa City",
-						},
-					},
-				},
-			},
-			exp: expected{
-				out: `apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: literalConfigMap2
-  labels:
-    cat: 'annoying'
-    dog: 'beagle'
-    veggie: 'celery'
-  annotations:
-    city: 'Iowa City'
-    river: 'Missouri'
-data:
-  a: x
-  b: y
-  c: Hello World
-  d: "true"
-`,
-			},
-		},
-	}
-	fSys := filesys.MakeFsInMemory()
-	fSys.WriteFile(
-		filesys.RootedPath("configmap", "app.env"),
-		[]byte("DB_USERNAME=admin\nDB_PASSWORD=qwerty\n"))
-	fSys.WriteFile(
-		filesys.RootedPath("configmap", "app-init.ini"),
-		[]byte("FOO=bar\nBAR=baz\n"))
-	fSys.WriteFile(
-		filesys.RootedPath("configmap", "app.bin"),
-		manyHellos(30))
-	kvLdr := kv.NewLoader(
-		loader.NewFileLoaderAtRoot(fSys),
-		valtest_test.MakeFakeValidator())
-
-	for n := range testCases {
-		tc := testCases[n]
-		t.Run(n, func(t *testing.T) {
-			rn, err := MakeConfigMap(kvLdr, &tc.args)
-			if err != nil {
-				if !assert.EqualError(t, err, tc.exp.errMsg) {
-					t.FailNow()
-				}
-				return
-			}
-			if tc.exp.errMsg != "" {
-				t.Fatalf("%s: should return error '%s'", n, tc.exp.errMsg)
-			}
-			output := rn.MustString()
-			if !assert.Equal(t, tc.exp.out, output) {
-				t.FailNow()
-			}
-		})
-	}
-}

api/internal/generators/secret.go

@@ -1,64 +0,0 @@
-// Copyright 2020 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package generators
-
-import (
-	"sigs.k8s.io/kustomize/api/filters/filtersutil"
-	"sigs.k8s.io/kustomize/api/ifc"
-	"sigs.k8s.io/kustomize/api/types"
-	"sigs.k8s.io/kustomize/kyaml/yaml"
-)
-
-// MakeSecret makes a kubernetes Secret.
-//
-// Secret: https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.19/#secret-v1-core
-//
-// ConfigMaps and Secrets are similar.
-//
-// Like a ConfigMap, a Secret has a `data` field, but unlike a ConfigMap it has
-// no `binaryData` field.
-//
-// All of a Secret's data is assumed to be opaque in nature, and assumed to be
-// base64 encoded from its original representation, regardless of whether the
-// original data was UTF-8 text or binary.
-//
-// This encoding provides no secrecy. It's just a neutral, common means to
-// represent opaque text and binary data.  Beneath the base64 encoding
-// is presumably further encoding under control of the Secret's consumer.
-//
-// A Secret has string field `type` which holds an identifier, used by the
-// client, to choose the algorithm to interpret the `data` field.  Kubernetes
-// cannot make use of this data; it's up to a controller or some pod's service
-// to interpret the value, using `type` as a clue as to how to do this.
-func MakeSecret(
-	ldr ifc.KvLoader, args *types.SecretArgs) (rn *yaml.RNode, err error) {
-	rn, err = makeBaseNode("Secret", args.Name, args.Namespace)
-	if err != nil {
-		return nil, err
-	}
-	t := "Opaque"
-	if args.Type != "" {
-		t = args.Type
-	}
-	if _, err := rn.Pipe(
-		yaml.FieldSetter{
-			Name:  "type",
-			Value: yaml.NewStringRNode(t)}); err != nil {
-		return nil, err
-	}
-	m, err := makeValidatedDataMap(ldr, args.Name, args.KvPairSources)
-	if err != nil {
-		return nil, err
-	}
-	for _, k := range filtersutil.SortedMapKeys(m) {
-		vrN := makeSecretValueRNode(m[k])
-		if _, err = rn.Pipe(
-			yaml.LookupCreate(yaml.MappingNode, yaml.DataField),
-			yaml.SetField(k, vrN)); err != nil {
-			return nil, err
-		}
-	}
-	copyLabelsAndAnnotations(rn, args.Options)
-	return rn, err
-}

api/internal/generators/secret_test.go

@@ -1,231 +0,0 @@
-// Copyright 2020 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package generators_test
-
-import (
-	"path/filepath"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"sigs.k8s.io/kustomize/api/filesys"
-	. "sigs.k8s.io/kustomize/api/internal/generators"
-	"sigs.k8s.io/kustomize/api/kv"
-	"sigs.k8s.io/kustomize/api/loader"
-	valtest_test "sigs.k8s.io/kustomize/api/testutils/valtest"
-	"sigs.k8s.io/kustomize/api/types"
-)
-
-func TestMakeSecret(t *testing.T) {
-	type expected struct {
-		out    string
-		errMsg string
-	}
-
-	testCases := map[string]struct {
-		args types.SecretArgs
-		exp  expected
-	}{
-		"construct secret from env": {
-			args: types.SecretArgs{
-				GeneratorArgs: types.GeneratorArgs{
-					Name: "envSecret",
-					KvPairSources: types.KvPairSources{
-						EnvSources: []string{
-							filepath.Join("secret", "app.env"),
-						},
-					},
-				},
-			},
-			exp: expected{
-				out: `apiVersion: v1
-kind: Secret
-metadata:
-  name: envSecret
-type: Opaque
-data:
-  DB_PASSWORD: cXdlcnR5
-  DB_USERNAME: YWRtaW4=
-`,
-			},
-		},
-		"construct secret from text file": {
-			args: types.SecretArgs{
-				GeneratorArgs: types.GeneratorArgs{
-					Name: "fileSecret1",
-					KvPairSources: types.KvPairSources{
-						FileSources: []string{
-							filepath.Join("secret", "app-init.ini"),
-						},
-					},
-				},
-			},
-			exp: expected{
-				out: `apiVersion: v1
-kind: Secret
-metadata:
-  name: fileSecret1
-type: Opaque
-data:
-  app-init.ini: Rk9PPWJhcgpCQVI9YmF6Cg==
-`,
-			},
-		},
-		"construct secret from text and binary file": {
-			args: types.SecretArgs{
-				GeneratorArgs: types.GeneratorArgs{
-					Name: "fileSecret2",
-					KvPairSources: types.KvPairSources{
-						FileSources: []string{
-							filepath.Join("secret", "app-init.ini"),
-							filepath.Join("secret", "app.bin"),
-						},
-					},
-				},
-			},
-			exp: expected{
-				out: `apiVersion: v1
-kind: Secret
-metadata:
-  name: fileSecret2
-type: Opaque
-data:
-  app-init.ini: Rk9PPWJhcgpCQVI9YmF6Cg==
-  app.bin: //0=
-`,
-			},
-		},
-		"construct secret from literal": {
-			args: types.SecretArgs{
-				GeneratorArgs: types.GeneratorArgs{
-					Name: "literalSecret1",
-					KvPairSources: types.KvPairSources{
-						LiteralSources: []string{"a=x", "b=y", "c=\"Hello World\"", "d='true'"},
-					},
-					Options: &types.GeneratorOptions{
-						Labels: map[string]string{
-							"foo": "bar",
-						},
-					},
-				},
-			},
-			exp: expected{
-				out: `apiVersion: v1
-kind: Secret
-metadata:
-  name: literalSecret1
-  labels:
-    foo: 'bar'
-type: Opaque
-data:
-  a: eA==
-  b: eQ==
-  c: SGVsbG8gV29ybGQ=
-  d: dHJ1ZQ==
-`,
-			},
-		},
-		"construct secret with type": {
-			args: types.SecretArgs{
-				GeneratorArgs: types.GeneratorArgs{
-					Name: "literalSecret1",
-					KvPairSources: types.KvPairSources{
-						LiteralSources: []string{"a=x"},
-					},
-					Options: &types.GeneratorOptions{
-						Labels: map[string]string{
-							"foo": "bar",
-						},
-					},
-				},
-				Type: "foobar",
-			},
-			exp: expected{
-				out: `apiVersion: v1
-kind: Secret
-metadata:
-  name: literalSecret1
-  labels:
-    foo: 'bar'
-type: foobar
-data:
-  a: eA==
-`,
-			},
-		},
-		"construct secret from literal with GeneratorOptions in SecretArgs": {
-			args: types.SecretArgs{
-				GeneratorArgs: types.GeneratorArgs{
-					Name: "literalSecret2",
-					KvPairSources: types.KvPairSources{
-						LiteralSources: []string{"a=x", "b=y", "c=\"Hello World\"", "d='true'"},
-					},
-					Options: &types.GeneratorOptions{
-						Labels: map[string]string{
-							"veggie": "celery",
-							"dog":    "beagle",
-							"cat":    "annoying",
-						},
-						Annotations: map[string]string{
-							"river": "Missouri",
-							"city":  "Iowa City",
-						},
-					},
-				},
-			},
-			exp: expected{
-				out: `apiVersion: v1
-kind: Secret
-metadata:
-  name: literalSecret2
-  labels:
-    cat: 'annoying'
-    dog: 'beagle'
-    veggie: 'celery'
-  annotations:
-    city: 'Iowa City'
-    river: 'Missouri'
-type: Opaque
-data:
-  a: eA==
-  b: eQ==
-  c: SGVsbG8gV29ybGQ=
-  d: dHJ1ZQ==
-`,
-			},
-		},
-	}
-	fSys := filesys.MakeFsInMemory()
-	fSys.WriteFile(
-		filesys.RootedPath("secret", "app.env"),
-		[]byte("DB_USERNAME=admin\nDB_PASSWORD=qwerty\n"))
-	fSys.WriteFile(
-		filesys.RootedPath("secret", "app-init.ini"),
-		[]byte("FOO=bar\nBAR=baz\n"))
-	fSys.WriteFile(
-		filesys.RootedPath("secret", "app.bin"),
-		[]byte{0xff, 0xfd})
-	kvLdr := kv.NewLoader(
-		loader.NewFileLoaderAtRoot(fSys),
-		valtest_test.MakeFakeValidator())
-
-	for n := range testCases {
-		tc := testCases[n]
-		t.Run(n, func(t *testing.T) {
-			rn, err := MakeSecret(kvLdr, &tc.args)
-			if err != nil {
-				if !assert.EqualError(t, err, tc.exp.errMsg) {
-					t.FailNow()
-				}
-				return
-			}
-			if tc.exp.errMsg != "" {
-				t.Fatalf("%s: should return error '%s'", n, tc.exp.errMsg)
-			}
-			output := rn.MustString()
-			if !assert.Equal(t, tc.exp.out, output) {
-				t.FailNow()
-			}
-		})
-	}
-}

api/internal/generators/utils.go

@@ -1,139 +0,0 @@
-// Copyright 2020 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package generators
-
-import (
-	"encoding/base64"
-	"fmt"
-	"strings"
-	"unicode/utf8"
-
-	"github.com/go-errors/errors"
-	"sigs.k8s.io/kustomize/api/filters/filtersutil"
-	"sigs.k8s.io/kustomize/api/ifc"
-	"sigs.k8s.io/kustomize/api/types"
-	"sigs.k8s.io/kustomize/kyaml/yaml"
-)
-
-func makeBaseNode(kind, name, namespace string) (*yaml.RNode, error) {
-	rn, err := yaml.Parse(fmt.Sprintf(`
-apiVersion: v1
-kind: %s
-`, kind))
-	if err != nil {
-		return nil, err
-	}
-	if name == "" {
-		return nil, errors.Errorf("a configmap must have a name")
-	}
-	if _, err := rn.Pipe(yaml.SetK8sName(name)); err != nil {
-		return nil, err
-	}
-	if namespace != "" {
-		if _, err := rn.Pipe(yaml.SetK8sNamespace(namespace)); err != nil {
-			return nil, err
-		}
-	}
-	return rn, nil
-}
-
-func makeValidatedDataMap(
-	ldr ifc.KvLoader, name string, sources types.KvPairSources) (map[string]string, error) {
-	pairs, err := ldr.Load(sources)
-	if err != nil {
-		return nil, errors.WrapPrefix(err, "loading KV pairs", 0)
-	}
-	knownKeys := make(map[string]string)
-	for _, p := range pairs {
-		// legal key: alphanumeric characters, '-', '_' or '.'
-		if err := ldr.Validator().ErrIfInvalidKey(p.Key); err != nil {
-			return nil, err
-		}
-		if _, ok := knownKeys[p.Key]; ok {
-			return nil, errors.Errorf(
-				"configmap %s illegally repeats the key `%s`", name, p.Key)
-		}
-		knownKeys[p.Key] = p.Value
-	}
-	return knownKeys, nil
-}
-
-// copyLabelsAndAnnotations copies labels and annotations from
-// GeneratorOptions into the given object.
-func copyLabelsAndAnnotations(
-	rn *yaml.RNode, opts *types.GeneratorOptions) error {
-	if opts == nil {
-		return nil
-	}
-	for _, k := range filtersutil.SortedMapKeys(opts.Labels) {
-		v := opts.Labels[k]
-		if _, err := rn.Pipe(yaml.SetLabel(k, v)); err != nil {
-			return err
-		}
-	}
-	for _, k := range filtersutil.SortedMapKeys(opts.Annotations) {
-		v := opts.Annotations[k]
-		if _, err := rn.Pipe(yaml.SetAnnotation(k, v)); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-// In a secret, all data is base64 encoded, regardless of its conformance
-// or lack thereof to UTF-8.
-func makeSecretValueRNode(s string) *yaml.RNode {
-	yN := &yaml.Node{Kind: yaml.ScalarNode}
-	// Purposely don't use YAML tags to identify the data as being plain text or
-	// binary.  It kubernetes Secrets the values in the `data` map are expected
-	// to be base64 encoded, and in ConfigMaps that same can be said for the
-	// values in the `binaryData` field.
-	yN.Tag = yaml.NodeTagString
-	yN.Value = encodeBase64(s)
-	if strings.Contains(yN.Value, "\n") {
-		yN.Style = yaml.LiteralStyle
-	}
-	return yaml.NewRNode(yN)
-}
-
-func makeConfigMapValueRNode(s string) (field string, rN *yaml.RNode) {
-	yN := &yaml.Node{Kind: yaml.ScalarNode}
-	yN.Tag = yaml.NodeTagString
-	if utf8.ValidString(s) {
-		field = yaml.DataField
-		yN.Value = s
-	} else {
-		field = yaml.BinaryDataField
-		yN.Value = encodeBase64(s)
-	}
-	if strings.Contains(yN.Value, "\n") {
-		yN.Style = yaml.LiteralStyle
-	}
-	return field, yaml.NewRNode(yN)
-}
-
-// encodeBase64 encodes s as base64 that is broken up into multiple lines
-// as appropriate for the resulting length.
-func encodeBase64(s string) string {
-	const lineLen = 70
-	encLen := base64.StdEncoding.EncodedLen(len(s))
-	lines := encLen/lineLen + 1
-	buf := make([]byte, encLen*2+lines)
-	in := buf[0:encLen]
-	out := buf[encLen:]
-	base64.StdEncoding.Encode(in, []byte(s))
-	k := 0
-	for i := 0; i < len(in); i += lineLen {
-		j := i + lineLen
-		if j > len(in) {
-			j = len(in)
-		}
-		k += copy(out[k:], in[i:j])
-		if lines > 1 {
-			out[k] = '\n'
-			k++
-		}
-	}
-	return string(out[:k])
-}

api/internal/git/cloner.go

@@ -4,6 +4,10 @@
 package git
 
 import (
+	"log"
+	"os/exec"
+
+	"github.com/pkg/errors"
 	"sigs.k8s.io/kustomize/api/filesys"
 )
 
@@ -14,29 +18,70 @@ type Cloner func(repoSpec *RepoSpec) error
 // to say, some remote API, to obtain a local clone of
 // a remote repo.
 func ClonerUsingGitExec(repoSpec *RepoSpec) error {
-	r, err := newCmdRunner()
+	gitProgram, err := exec.LookPath("git")
+	if err != nil {
+		return errors.Wrap(err, "no 'git' program on path")
+	}
+	repoSpec.Dir, err = filesys.NewTmpConfirmedDir()
 	if err != nil {
 		return err
 	}
-	repoSpec.Dir = r.dir
-	if err = r.run("init"); err != nil {
-		return err
+
+	cmd := exec.Command(
+		gitProgram,
+		"clone",
+		"--depth=1",
+		repoSpec.CloneSpec(),
+		repoSpec.Dir.String())
+	out, err := cmd.CombinedOutput()
+	if err != nil {
+		log.Printf("Error cloning git repo: %s", out)
+		return errors.Wrapf(
+			err,
+			"trouble cloning git repo %v in %s",
+			repoSpec.CloneSpec(), repoSpec.Dir.String())
 	}
-	if err = r.run(
-		"remote", "add", "origin", repoSpec.CloneSpec()); err != nil {
-		return err
-	}
-	ref := "HEAD"
+
 	if repoSpec.Ref != "" {
-		ref = repoSpec.Ref
+		cmd = exec.Command(
+			gitProgram,
+			"fetch",
+			"--depth=1",
+			"origin",
+			repoSpec.Ref)
+		cmd.Dir = repoSpec.Dir.String()
+		out, err = cmd.CombinedOutput()
+		if err != nil {
+			log.Printf("Error fetching ref: %s", out)
+			return errors.Wrapf(err, "trouble fetching %s", repoSpec.Ref)
+		}
+
+		cmd = exec.Command(
+			gitProgram,
+			"checkout",
+			"FETCH_HEAD")
+		cmd.Dir = repoSpec.Dir.String()
+		out, err = cmd.CombinedOutput()
+		if err != nil {
+			log.Printf("Error checking out ref: %s", out)
+			return errors.Wrapf(err, "trouble checking out %s", repoSpec.Ref)
+		}
 	}
-	if err = r.run("fetch", "--depth=1", "origin", ref); err != nil {
-		return err
+
+	cmd = exec.Command(
+		gitProgram,
+		"submodule",
+		"update",
+		"--init",
+		"--recursive")
+	cmd.Dir = repoSpec.Dir.String()
+	out, err = cmd.CombinedOutput()
+	if err != nil {
+		log.Printf("Error fetching submodules: %s", out)
+		return errors.Wrapf(err, "trouble fetching submodules for %s", repoSpec.CloneSpec())
 	}
-	if err = r.run("checkout", "FETCH_HEAD"); err != nil {
-		return err
-	}
-	return r.run("submodule", "update", "--init", "--recursive")
+
+	return nil
 }
 
 // DoNothingCloner returns a cloner that only sets

api/internal/git/gitrunner.go

@@ -1,58 +0,0 @@
-// Copyright 2020 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package git
-
-import (
-	"os/exec"
-	"time"
-
-	"github.com/pkg/errors"
-	"sigs.k8s.io/kustomize/api/filesys"
-	"sigs.k8s.io/kustomize/api/internal/utils"
-)
-
-// Arbitrary, but non-infinite, timeout for running commands.
-const defaultDuration = 27 * time.Second
-
-// gitRunner runs the external git binary.
-type gitRunner struct {
-	gitProgram string
-	duration   time.Duration
-	dir        filesys.ConfirmedDir
-}
-
-// newCmdRunner returns a gitRunner if it can find the binary.
-// It also creats a temp directory for cloning repos.
-func newCmdRunner() (*gitRunner, error) {
-	gitProgram, err := exec.LookPath("git")
-	if err != nil {
-		return nil, errors.Wrap(err, "no 'git' program on path")
-	}
-	dir, err := filesys.NewTmpConfirmedDir()
-	if err != nil {
-		return nil, err
-	}
-	return &gitRunner{
-		gitProgram: gitProgram,
-		duration:   defaultDuration,
-		dir:        dir,
-	}, nil
-}
-
-// run a command with a timeout.
-func (r gitRunner) run(args ...string) error {
-	//nolint: gosec
-	cmd := exec.Command(r.gitProgram, args...)
-	cmd.Dir = r.dir.String()
-	return utils.TimedCall(
-		cmd.String(),
-		r.duration,
-		func() error {
-			_, err := cmd.CombinedOutput()
-			if err != nil {
-				return errors.Wrapf(err, "git cmd = '%s'", cmd.String())
-			}
-			return err
-		})
-}

api/internal/k8sdeps/conflict/conflictdetectorjson.go

@@ -1,43 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package conflict
-
-import (
-	"encoding/json"
-
-	jsonpatch "github.com/evanphx/json-patch"
-	"k8s.io/apimachinery/pkg/util/mergepatch"
-	"sigs.k8s.io/kustomize/api/resource"
-)
-
-// conflictDetectorJson detects conflicts in a list of JSON patches.
-type conflictDetectorJson struct {
-	resourceFactory *resource.Factory
-}
-
-var _ resource.ConflictDetector = &conflictDetectorJson{}
-
-func (cd *conflictDetectorJson) HasConflict(
-	p1, p2 *resource.Resource) (bool, error) {
-	return mergepatch.HasConflicts(p1.Map(), p2.Map())
-}
-
-func (cd *conflictDetectorJson) MergePatches(
-	patch1, patch2 *resource.Resource) (*resource.Resource, error) {
-	baseBytes, err := json.Marshal(patch1.Map())
-	if err != nil {
-		return nil, err
-	}
-	patchBytes, err := json.Marshal(patch2.Map())
-	if err != nil {
-		return nil, err
-	}
-	mergedBytes, err := jsonpatch.MergeMergePatches(baseBytes, patchBytes)
-	if err != nil {
-		return nil, err
-	}
-	mergedMap := make(map[string]interface{})
-	err = json.Unmarshal(mergedBytes, &mergedMap)
-	return cd.resourceFactory.FromMap(mergedMap), err
-}

api/internal/k8sdeps/conflict/conflictdetectorsm.go

@@ -1,65 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package conflict
-
-import (
-	"fmt"
-
-	"k8s.io/apimachinery/pkg/util/strategicpatch"
-	"sigs.k8s.io/kustomize/api/resource"
-)
-
-// conflictDetectorSm detects conflicts in a list of strategic merge patches.
-type conflictDetectorSm struct {
-	lookupPatchMeta strategicpatch.LookupPatchMeta
-	resourceFactory *resource.Factory
-}
-
-var _ resource.ConflictDetector = &conflictDetectorSm{}
-
-func (cd *conflictDetectorSm) HasConflict(
-	p1, p2 *resource.Resource) (bool, error) {
-	return strategicpatch.MergingMapsHaveConflicts(
-		p1.Map(), p2.Map(), cd.lookupPatchMeta)
-}
-
-func (cd *conflictDetectorSm) MergePatches(
-	patch1, patch2 *resource.Resource) (*resource.Resource, error) {
-	if cd.hasDeleteDirectiveMarker(patch2.Map()) {
-		if cd.hasDeleteDirectiveMarker(patch1.Map()) {
-			return nil, fmt.Errorf(
-				"cannot merge patches both containing '$patch: delete' directives")
-		}
-		patch1, patch2 = patch2, patch1
-	}
-	mergedMap, err := strategicpatch.MergeStrategicMergeMapPatchUsingLookupPatchMeta(
-		cd.lookupPatchMeta, patch1.Map(), patch2.Map())
-	return cd.resourceFactory.FromMap(mergedMap), err
-}
-
-func (cd *conflictDetectorSm) hasDeleteDirectiveMarker(
-	patch map[string]interface{}) bool {
-	if v, ok := patch["$patch"]; ok && v == "delete" {
-		return true
-	}
-	for _, v := range patch {
-		switch typedV := v.(type) {
-		case map[string]interface{}:
-			if cd.hasDeleteDirectiveMarker(typedV) {
-				return true
-			}
-		case []interface{}:
-			for _, sv := range typedV {
-				typedE, ok := sv.(map[string]interface{})
-				if !ok {
-					break
-				}
-				if cd.hasDeleteDirectiveMarker(typedE) {
-					return true
-				}
-			}
-		}
-	}
-	return false
-}

api/internal/k8sdeps/conflict/factory.go

@@ -1,45 +0,0 @@
-// Copyright 2020 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package conflict
-
-import (
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/runtime/schema"
-	sp "k8s.io/apimachinery/pkg/util/strategicpatch"
-	"k8s.io/client-go/kubernetes/scheme"
-	"sigs.k8s.io/kustomize/api/resid"
-	"sigs.k8s.io/kustomize/api/resource"
-)
-
-type cdFactory struct {
-	rf *resource.Factory
-}
-
-var _ resource.ConflictDetectorFactory = &cdFactory{}
-
-// NewFactory returns a conflict detector factory.
-// The detector uses a resource factory to convert resources to/from
-// json/yaml/maps representations.
-func NewFactory(rf *resource.Factory) resource.ConflictDetectorFactory {
-	return &cdFactory{rf: rf}
-}
-
-// New returns a conflict detector that's aware of the GVK type.
-func (f *cdFactory) New(gvk resid.Gvk) (resource.ConflictDetector, error) {
-	// Convert to apimachinery representation of object
-	obj, err := scheme.Scheme.New(schema.GroupVersionKind{
-		Group:   gvk.Group,
-		Version: gvk.Version,
-		Kind:    gvk.Kind,
-	})
-	if err == nil {
-		meta, err := sp.NewPatchMetaFromStruct(obj)
-		return &conflictDetectorSm{
-			lookupPatchMeta: meta, resourceFactory: f.rf}, err
-	}
-	if runtime.IsNotRegisteredError(err) {
-		return &conflictDetectorJson{resourceFactory: f.rf}, nil
-	}
-	return nil, err
-}

api/internal/k8sdeps/merge/merginator.go

@@ -0,0 +1,239 @@
+// Copyright 2019 The Kubernetes Authors.
+// SPDX-License-Identifier: Apache-2.0
+
+package merge
+
+import (
+	"encoding/json"
+	"fmt"
+
+	jsonpatch "github.com/evanphx/json-patch"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/util/mergepatch"
+	"k8s.io/apimachinery/pkg/util/strategicpatch"
+	"k8s.io/client-go/kubernetes/scheme"
+	"sigs.k8s.io/kustomize/api/resid"
+	"sigs.k8s.io/kustomize/api/resmap"
+	"sigs.k8s.io/kustomize/api/resource"
+)
+
+type conflictDetector interface {
+	hasConflict(patch1, patch2 *resource.Resource) (bool, error)
+	findConflict(
+		conflictingPatchIdx int,
+		patches []*resource.Resource) (*resource.Resource, error)
+	mergePatches(patch1, patch2 *resource.Resource) (*resource.Resource, error)
+}
+
+type jsonMergePatch struct {
+	resourceFactory *resource.Factory
+}
+
+var _ conflictDetector = &jsonMergePatch{}
+
+func newJMPConflictDetector(rf *resource.Factory) conflictDetector {
+	return &jsonMergePatch{resourceFactory: rf}
+}
+
+func (jmp *jsonMergePatch) hasConflict(
+	patch1, patch2 *resource.Resource) (bool, error) {
+	return mergepatch.HasConflicts(patch1.Map(), patch2.Map())
+}
+
+func (jmp *jsonMergePatch) findConflict(
+	conflictingPatchIdx int,
+	patches []*resource.Resource) (*resource.Resource, error) {
+	for i, patch := range patches {
+		if i == conflictingPatchIdx {
+			continue
+		}
+		if !patches[conflictingPatchIdx].OrgId().Equals(patch.OrgId()) {
+			continue
+		}
+		conflict, err := mergepatch.HasConflicts(
+			patch.Map(),
+			patches[conflictingPatchIdx].Map())
+		if err != nil {
+			return nil, err
+		}
+		if conflict {
+			return patch, nil
+		}
+	}
+	return nil, nil
+}
+
+func (jmp *jsonMergePatch) mergePatches(
+	patch1, patch2 *resource.Resource) (*resource.Resource, error) {
+	baseBytes, err := json.Marshal(patch1.Map())
+	if err != nil {
+		return nil, err
+	}
+	patchBytes, err := json.Marshal(patch2.Map())
+	if err != nil {
+		return nil, err
+	}
+	mergedBytes, err := jsonpatch.MergeMergePatches(baseBytes, patchBytes)
+	if err != nil {
+		return nil, err
+	}
+	mergedMap := make(map[string]interface{})
+	err = json.Unmarshal(mergedBytes, &mergedMap)
+	return jmp.resourceFactory.FromMap(mergedMap), err
+}
+
+type strategicMergePatch struct {
+	lookupPatchMeta strategicpatch.LookupPatchMeta
+	rf              *resource.Factory
+}
+
+var _ conflictDetector = &strategicMergePatch{}
+
+func newSMPConflictDetector(
+	versionedObj runtime.Object,
+	rf *resource.Factory) (conflictDetector, error) {
+	lookupPatchMeta, err := strategicpatch.NewPatchMetaFromStruct(versionedObj)
+	return &strategicMergePatch{lookupPatchMeta: lookupPatchMeta, rf: rf}, err
+}
+
+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) {
+	for i, patch := range patches {
+		if i == conflictingPatchIdx {
+			continue
+		}
+		if !patches[conflictingPatchIdx].OrgId().Equals(patch.OrgId()) {
+			continue
+		}
+		conflict, err := strategicpatch.MergingMapsHaveConflicts(
+			patch.Map(),
+			patches[conflictingPatchIdx].Map(),
+			smp.lookupPatchMeta)
+		if err != nil {
+			return nil, err
+		}
+		if conflict {
+			return patch, nil
+		}
+	}
+	return nil, nil
+}
+
+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")
+		}
+		patch1, patch2 = patch2, patch1
+	}
+	mergeJSONMap, err := strategicpatch.MergeStrategicMergeMapPatchUsingLookupPatchMeta(
+		smp.lookupPatchMeta, patch1.Map(), patch2.Map())
+	return smp.rf.FromMap(mergeJSONMap), err
+}
+
+type merginatorImpl struct {
+	rf *resource.Factory
+}
+
+// NewMerginator returns a new implementation of resmap.Merginator.
+func NewMerginator(rf *resource.Factory) resmap.Merginator {
+	return &merginatorImpl{rf: rf}
+}
+
+var _ resmap.Merginator = (*merginatorImpl)(nil)
+
+// Merge merges the incoming resources into a new resmap.ResMap.
+// Returns an error on conflict.
+func (m *merginatorImpl) Merge(
+	patches []*resource.Resource) (resmap.ResMap, error) {
+	rc := resmap.New()
+	for ix, patch := range patches {
+		id := patch.OrgId()
+		existing := rc.GetMatchingResourcesByOriginalId(id.Equals)
+		if len(existing) == 0 {
+			rc.Append(patch)
+			continue
+		}
+		if len(existing) > 1 {
+			return nil, fmt.Errorf("self conflict in patches")
+		}
+
+		versionedObj, err := scheme.Scheme.New(toSchemaGvk(id.Gvk))
+		if err != nil && !runtime.IsNotRegisteredError(err) {
+			return nil, err
+		}
+		var cd conflictDetector
+		if err != nil {
+			cd = newJMPConflictDetector(m.rf)
+		} else {
+			cd, err = newSMPConflictDetector(versionedObj, m.rf)
+			if err != nil {
+				return nil, err
+			}
+		}
+
+		conflict, err := cd.hasConflict(existing[0], patch)
+		if err != nil {
+			return nil, err
+		}
+		if conflict {
+			conflictingPatch, err := cd.findConflict(ix, patches)
+			if err != nil {
+				return nil, err
+			}
+			return nil, fmt.Errorf(
+				"conflict between %#v and %#v",
+				conflictingPatch.Map(), patch.Map())
+		}
+		merged, err := cd.mergePatches(existing[0], patch)
+		if err != nil {
+			return nil, err
+		}
+		rc.Replace(merged)
+	}
+	return rc, nil
+}
+
+// toSchemaGvk converts to a schema.GroupVersionKind.
+func toSchemaGvk(x resid.Gvk) schema.GroupVersionKind {
+	return schema.GroupVersionKind{
+		Group:   x.Group,
+		Version: x.Version,
+		Kind:    x.Kind,
+	}
+}
+
+func hasDeleteDirectiveMarker(patch map[string]interface{}) bool {
+	if v, ok := patch["$patch"]; ok && v == "delete" {
+		return true
+	}
+	for _, v := range patch {
+		switch typedV := v.(type) {
+		case map[string]interface{}:
+			if hasDeleteDirectiveMarker(typedV) {
+				return true
+			}
+		case []interface{}:
+			for _, sv := range typedV {
+				typedE, ok := sv.(map[string]interface{})
+				if !ok {
+					break
+				}
+				if hasDeleteDirectiveMarker(typedE) {
+					return true
+				}
+			}
+		}
+	}
+	return false
+}

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/execplugin/execplugin_test.go

@@ -13,10 +13,12 @@ import (
 	. "sigs.k8s.io/kustomize/api/internal/plugins/execplugin"
 	pLdr "sigs.k8s.io/kustomize/api/internal/plugins/loader"
 	"sigs.k8s.io/kustomize/api/internal/plugins/utils"
+	"sigs.k8s.io/kustomize/api/k8sdeps/kunstruct"
 	"sigs.k8s.io/kustomize/api/konfig"
 	fLdr "sigs.k8s.io/kustomize/api/loader"
-	"sigs.k8s.io/kustomize/api/provider"
 	"sigs.k8s.io/kustomize/api/resmap"
+	"sigs.k8s.io/kustomize/api/resource"
+	valtest_test "sigs.k8s.io/kustomize/api/testutils/valtest"
 )
 
 func TestExecPluginConfig(t *testing.T) {
@@ -31,9 +33,10 @@ s/$BAR/bar baz/g
 	if err != nil {
 		t.Fatal(err)
 	}
-	pvd := provider.NewDefaultDepProvider()
 	rf := resmap.NewFactory(
-		pvd.GetResourceFactory(), pvd.GetConflictDetectorFactory())
+		resource.NewFactory(
+			kunstruct.NewKunstructuredFactoryImpl()), nil)
+	v := valtest_test.MakeFakeValidator()
 	pluginConfig := rf.RF().FromMap(
 		map[string]interface{}{
 			"apiVersion": "someteam.example.com/v1",
@@ -59,7 +62,7 @@ s/$BAR/bar baz/g
 	if err != nil {
 		t.Fatalf("unexpected err: %v", err)
 	}
-	p.Config(resmap.NewPluginHelpers(ldr, pvd.GetFieldValidator(), rf), yaml)
+	p.Config(resmap.NewPluginHelpers(ldr, v, rf), yaml)
 
 	expected := "someteam.example.com/v1/sedtransformer/SedTransformer"
 	if !strings.HasSuffix(p.Path(), expected) {

api/internal/plugins/loader/loader_test.go

@@ -8,10 +8,11 @@ import (
 
 	"sigs.k8s.io/kustomize/api/filesys"
 	. "sigs.k8s.io/kustomize/api/internal/plugins/loader"
+	"sigs.k8s.io/kustomize/api/k8sdeps/kunstruct"
 	"sigs.k8s.io/kustomize/api/konfig"
 	"sigs.k8s.io/kustomize/api/loader"
-	"sigs.k8s.io/kustomize/api/provider"
 	"sigs.k8s.io/kustomize/api/resmap"
+	"sigs.k8s.io/kustomize/api/resource"
 	kusttest_test "sigs.k8s.io/kustomize/api/testutils/kusttest"
 	valtest_test "sigs.k8s.io/kustomize/api/testutils/valtest"
 	"sigs.k8s.io/kustomize/api/types"
@@ -50,9 +51,8 @@ func TestLoader(t *testing.T) {
 		BuildGoPlugin("builtin", "", "SecretGenerator").
 		BuildGoPlugin("someteam.example.com", "v1", "SomeServiceGenerator")
 	defer th.Reset()
-	p := provider.NewDefaultDepProvider()
-	rmF := resmap.NewFactory(
-		p.GetResourceFactory(), p.GetConflictDetectorFactory())
+	rmF := resmap.NewFactory(resource.NewFactory(
+		kunstruct.NewKunstructuredFactoryImpl()), nil)
 	fLdr, err := loader.NewLoader(
 		loader.RestrictionRootOnly,
 		filesys.Separator, filesys.MakeFsInMemory())

api/internal/plugins/utils/utils_test.go

@@ -9,10 +9,9 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/stretchr/testify/assert"
 	"sigs.k8s.io/kustomize/api/filesys"
+	"sigs.k8s.io/kustomize/api/k8sdeps/kunstruct"
 	"sigs.k8s.io/kustomize/api/konfig"
-	"sigs.k8s.io/kustomize/api/provider"
 	"sigs.k8s.io/kustomize/api/resmap"
 	"sigs.k8s.io/kustomize/api/resource"
 	"sigs.k8s.io/kustomize/api/types"
@@ -65,7 +64,7 @@ func strptr(s string) *string {
 }
 
 func TestUpdateResourceOptions(t *testing.T) {
-	rf := provider.NewDefaultDepProvider().GetResourceFactory()
+	rf := resource.NewFactory(kunstruct.NewKunstructuredFactoryImpl())
 	in := resmap.New()
 	expected := resmap.New()
 	cases := []struct {
@@ -88,12 +87,28 @@ func TestUpdateResourceOptions(t *testing.T) {
 		expected.Append(makeConfigMapOptions(rf, name, c.behavior, !c.needsHash))
 	}
 	actual, err := UpdateResourceOptions(in)
-	assert.NoError(t, err)
-	assert.NoError(t, expected.ErrorIfNotEqualLists(actual))
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err.Error())
+	}
+	for i, a := range expected.Resources() {
+		b := actual.GetByIndex(i)
+		if b == nil {
+			t.Fatalf("resource %d missing from processed map", i)
+		}
+		if !a.Equals(b) {
+			t.Errorf("expected %v got %v", a, b)
+		}
+		if a.NeedHashSuffix() != b.NeedHashSuffix() {
+			t.Errorf("")
+		}
+		if a.Behavior() != b.Behavior() {
+			t.Errorf("expected %v got %v", a.Behavior(), b.Behavior())
+		}
+	}
 }
 
 func TestUpdateResourceOptionsWithInvalidHashAnnotationValues(t *testing.T) {
-	rf := provider.NewDefaultDepProvider().GetResourceFactory()
+	rf := resource.NewFactory(kunstruct.NewKunstructuredFactoryImpl())
 	cases := []string{
 		"",
 		"FaLsE",

api/internal/target/kusttarget.go

@@ -235,18 +235,7 @@ func (kt *KustTarget) runGenerators(
 
 func (kt *KustTarget) configureExternalGenerators() ([]resmap.Generator, error) {
 	ra := accumulator.MakeEmptyAccumulator()
-	var generatorPaths []string
-	for _, p := range kt.kustomization.Generators {
-		// handle inline generators
-		rm, err := kt.rFactory.NewResMapFromBytes([]byte(p))
-		if err != nil {
-			// not an inline config
-			generatorPaths = append(generatorPaths, p)
-			continue
-		}
-		ra.AppendAll(rm)
-	}
-	ra, err := kt.accumulateResources(ra, generatorPaths)
+	ra, err := kt.accumulateResources(ra, kt.kustomization.Generators)
 	if err != nil {
 		return nil, err
 	}
@@ -271,18 +260,7 @@ func (kt *KustTarget) runTransformers(ra *accumulator.ResAccumulator) error {
 
 func (kt *KustTarget) configureExternalTransformers(transformers []string) ([]resmap.Transformer, error) {
 	ra := accumulator.MakeEmptyAccumulator()
-	var transformerPaths []string
-	for _, p := range transformers {
-		// handle inline transformers
-		rm, err := kt.rFactory.NewResMapFromBytes([]byte(p))
-		if err != nil {
-			// not an inline config
-			transformerPaths = append(transformerPaths, p)
-			continue
-		}
-		ra.AppendAll(rm)
-	}
-	ra, err := kt.accumulateResources(ra, transformerPaths)
+	ra, err := kt.accumulateResources(ra, transformers)
 
 	if err != nil {
 		return nil, err

api/internal/target/kusttarget_configplugin.go

@@ -183,7 +183,8 @@ var transformerConfigurators = map[builtinhelpers.BuiltinPluginType]func(
 			return
 		}
 		var c struct {
-			Paths []types.PatchStrategicMerge `json:"paths,omitempty" yaml:"paths,omitempty"`
+			Paths   []types.PatchStrategicMerge `json:"paths,omitempty" yaml:"paths,omitempty"`
+			Patches string                      `json:"patches,omitempty" yaml:"patches,omitempty"`
 		}
 		c.Paths = kt.kustomization.PatchesStrategicMerge
 		p := f()

api/internal/target/kusttarget_test.go

@@ -8,10 +8,9 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"sigs.k8s.io/kustomize/api/ifc"
-	"sigs.k8s.io/kustomize/api/provider"
+	"sigs.k8s.io/kustomize/api/k8sdeps/kunstruct"
 	"sigs.k8s.io/kustomize/api/resmap"
 	"sigs.k8s.io/kustomize/api/resource"
 	kusttest_test "sigs.k8s.io/kustomize/api/testutils/kusttest"
@@ -77,7 +76,8 @@ commonLabels:
 	}
 
 	kt := makeKustTargetWithRf(
-		t, th.GetFSys(), "/", provider.NewDefaultDepProvider())
+		t, th.GetFSys(), "/",
+		resource.NewFactory(kunstruct.NewKunstructuredFactoryImpl()))
 	for tn, tc := range testCases {
 		t.Run(tn, func(t *testing.T) {
 			th.WriteK("/", tc.content)
@@ -148,8 +148,7 @@ metadata:
     {"op": "add", "path": "/spec/replica", "value": "3"}
 ]`)
 
-	pvd := provider.NewDefaultDepProvider()
-	resFactory := pvd.GetResourceFactory()
+	resFactory := resource.NewFactory(kunstruct.NewKunstructuredFactoryImpl())
 
 	resources := []*resource.Resource{
 		resFactory.FromMapWithName("dply1", map[string]interface{}{
@@ -244,14 +243,19 @@ metadata:
 			t.Fatalf("unexpected error %v", err)
 		}
 	}
-	expYaml, err := expected.AsYaml()
-	assert.NoError(t, err)
 
-	kt := makeKustTargetWithRf(t, th.GetFSys(), "/whatever", pvd)
-	assert.NoError(t, kt.Load())
+	kt := makeKustTargetWithRf(
+		t, th.GetFSys(), "/whatever", resFactory)
+	err := kt.Load()
+	if err != nil {
+		t.Fatalf("unexpected Resources error %v", err)
+	}
 	actual, err := kt.MakeCustomizedResMap()
-	assert.NoError(t, err)
-	actYaml, err := actual.AsYaml()
-	assert.NoError(t, err)
-	assert.Equal(t, expYaml, actYaml)
+	if err != nil {
+		t.Fatalf("unexpected Resources error %v", err)
+	}
+
+	if err = expected.ErrorIfNotEqualLists(actual); err != nil {
+		t.Fatalf("unexpected inequality: %v", err)
+	}
 }

api/internal/target/maker_test.go

@@ -7,12 +7,14 @@ import (
 	"testing"
 
 	"sigs.k8s.io/kustomize/api/filesys"
+	"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"
 	"sigs.k8s.io/kustomize/api/konfig"
 	fLdr "sigs.k8s.io/kustomize/api/loader"
-	"sigs.k8s.io/kustomize/api/provider"
 	"sigs.k8s.io/kustomize/api/resmap"
+	"sigs.k8s.io/kustomize/api/resource"
 	valtest_test "sigs.k8s.io/kustomize/api/testutils/valtest"
 )
 
@@ -20,7 +22,9 @@ func makeAndLoadKustTarget(
 	t *testing.T,
 	fSys filesys.FileSystem,
 	root string) *target.KustTarget {
-	kt := makeKustTargetWithRf(t, fSys, root, provider.NewDefaultDepProvider())
+	kt := makeKustTargetWithRf(
+		t, fSys, root,
+		resource.NewFactory(kunstruct.NewKunstructuredFactoryImpl()))
 	if err := kt.Load(); err != nil {
 		t.Fatalf("Unexpected load error %v", err)
 	}
@@ -31,13 +35,13 @@ func makeKustTargetWithRf(
 	t *testing.T,
 	fSys filesys.FileSystem,
 	root string,
-	pvd *provider.DepProvider) *target.KustTarget {
+	resourceFactory *resource.Factory) *target.KustTarget {
 	ldr, err := fLdr.NewLoader(fLdr.RestrictionRootOnly, root, fSys)
 	if err != nil {
 		t.Fatal(err)
 	}
 	rf := resmap.NewFactory(
-		pvd.GetResourceFactory(), pvd.GetConflictDetectorFactory())
+		resourceFactory, merge.NewMerginator(resourceFactory))
 	pc := konfig.DisabledPluginConfig()
 	return target.NewKustTarget(
 		ldr,

api/internal/utils/errtimeout.go

@@ -1,36 +0,0 @@
-// Copyright 2020 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package utils
-
-import (
-	"fmt"
-	"time"
-
-	"github.com/pkg/errors"
-)
-
-type errTimeOut struct {
-	duration time.Duration
-	cmd      string
-}
-
-func NewErrTimeOut(d time.Duration, c string) errTimeOut {
-	return errTimeOut{duration: d, cmd: c}
-}
-
-func (e errTimeOut) Error() string {
-	return fmt.Sprintf("hit %s timeout running '%s'", e.duration, e.cmd)
-}
-
-func IsErrTimeout(err error) bool {
-	if err == nil {
-		return false
-	}
-	_, ok := err.(errTimeOut)
-	if ok {
-		return true
-	}
-	_, ok = errors.Cause(err).(errTimeOut)
-	return ok
-}

api/internal/utils/timedcall.go

@@ -1,23 +0,0 @@
-// Copyright 2020 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package utils
-
-import (
-	"time"
-)
-
-// TimedCall runs fn, failing if it doesn't complete in the given duration.
-// The description is used in the timeout error message.
-func TimedCall(description string, d time.Duration, fn func() error) error {
-	done := make(chan error)
-	timer := time.NewTimer(d)
-	defer timer.Stop()
-	go func() { done <- fn() }()
-	select {
-	case err := <-done:
-		return err
-	case <-timer.C:
-		return NewErrTimeOut(d, description)
-	}
-}

api/internal/utils/timedcall_test.go

@@ -1,64 +0,0 @@
-// Copyright 2020 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package utils_test
-
-import (
-	"fmt"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-	. "sigs.k8s.io/kustomize/api/internal/utils"
-)
-
-const (
-	timeToWait = 10 * time.Millisecond
-	tooSlow    = 2 * timeToWait
-)
-
-func errMsg(msg string) string {
-	return fmt.Sprintf("hit %s timeout running '%s'", timeToWait, msg)
-}
-
-func TestTimedCallFastNoError(t *testing.T) {
-	err := TimedCall(
-		"fast no error", timeToWait,
-		func() error { return nil })
-	if !assert.NoError(t, err) {
-		t.Fatal(err)
-	}
-}
-
-func TestTimedCallFastWithError(t *testing.T) {
-	err := TimedCall(
-		"fast with error", timeToWait,
-		func() error { return assert.AnError })
-	if assert.Error(t, err) {
-		assert.EqualError(t, err, assert.AnError.Error())
-	} else {
-		t.Fail()
-	}
-}
-
-func TestTimedCallSlowNoError(t *testing.T) {
-	err := TimedCall(
-		"slow no error", timeToWait,
-		func() error { time.Sleep(tooSlow); return nil })
-	if assert.Error(t, err) {
-		assert.EqualError(t, err, errMsg("slow no error"))
-	} else {
-		t.Fail()
-	}
-}
-
-func TestTimedCallSlowWithError(t *testing.T) {
-	err := TimedCall(
-		"slow with error", timeToWait,
-		func() error { time.Sleep(tooSlow); return assert.AnError })
-	if assert.Error(t, err) {
-		assert.EqualError(t, err, errMsg("slow with error"))
-	} else {
-		t.Fail()
-	}
-}

api/internal/validate/fieldvalidator.go

@@ -10,10 +10,6 @@ import (
 // FieldValidator implements ifc.Validator to check
 // the values of various KRM string fields,
 // e.g. labels, annotations, names, namespaces.
-//
-// TODO: Have this use kyaml/yaml/internal/k8sgen/pkg/labels
-//  which has label and annotation validation code, but is internal
-//  so this impl would need to move to kyaml (a fine idea).
 type FieldValidator struct {
 }
 

api/internal/wrappy/factory.go

@@ -4,105 +4,38 @@
 package wrappy
 
 import (
-	"fmt"
-
-	"sigs.k8s.io/kustomize/api/hasher"
 	"sigs.k8s.io/kustomize/api/ifc"
-	"sigs.k8s.io/kustomize/api/internal/generators"
-	"sigs.k8s.io/kustomize/api/konfig"
 	"sigs.k8s.io/kustomize/api/types"
-	"sigs.k8s.io/kustomize/kyaml/filtersutil"
-	"sigs.k8s.io/kustomize/kyaml/kio"
-	"sigs.k8s.io/kustomize/kyaml/yaml"
 )
 
 // 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.
-//
-// This implementation should be thin, as both WNode and WNodeFactory must be
-// factored away (deleted) along with ifc.Kunstructured in favor of direct use
-// of RNode methods upon completion of
-// https://github.com/kubernetes-sigs/kustomize/issues/2506.
-//
-// See also api/krusty/internal/provider/depprovider.go
 type WNodeFactory struct {
 }
 
 var _ ifc.KunstructuredFactory = (*WNodeFactory)(nil)
 
 func (k *WNodeFactory) SliceFromBytes(bs []byte) ([]ifc.Kunstructured, error) {
-	yamlRNodes, err := kio.FromBytes(bs)
-	if err != nil {
-		return nil, err
-	}
-	var result []ifc.Kunstructured
-	for i := range yamlRNodes {
-		rn := yamlRNodes[i]
-		meta, err := rn.GetValidatedMetadata()
-		if err != nil {
-			return nil, err
-		}
-		if !shouldDropObject(meta) {
-			if foundNil, path := rn.HasNilEntryInList(); foundNil {
-				return nil, fmt.Errorf("empty item at %v in object %v", path, rn)
-			}
-			result = append(result, FromRNode(rn))
-		}
-	}
-	return result, nil
-}
-
-// shouldDropObject returns true if the resource should not be accumulated.
-func shouldDropObject(m yaml.ResourceMeta) bool {
-	_, y := m.ObjectMeta.Annotations[konfig.IgnoredByKustomizeResourceAnnotation]
-	return y
+	panic("TODO(#WNodeFactory): implement SliceFromBytes")
 }
 
 func (k *WNodeFactory) FromMap(m map[string]interface{}) ifc.Kunstructured {
-	rn, err := FromMap(m)
-	if err != nil {
-		// TODO(#WNodeFactory): handle or bubble error"
-		panic(err)
-	}
-	return rn
-}
-
-// kustHash computes a hash of an unstructured object.
-type kustHash struct{}
-
-// Hash returns a hash of the given object
-func (h *kustHash) Hash(m ifc.Kunstructured) (string, error) {
-	node, err := filtersutil.GetRNode(m)
-	if err != nil {
-		return "", err
-	}
-	return hasher.HashRNode(node)
+	panic("TODO(#WNodeFactory): implement FromMap")
 }
 
 func (k *WNodeFactory) Hasher() ifc.KunstructuredHasher {
-	return &kustHash{}
+	panic("TODO(#WNodeFactory): implement Hasher")
 }
 
-// MakeConfigMap makes a wrapped configmap.
 func (k *WNodeFactory) MakeConfigMap(
-	ldr ifc.KvLoader, args *types.ConfigMapArgs) (ifc.Kunstructured, error) {
-	rn, err := generators.MakeConfigMap(ldr, args)
-	if err != nil {
-		return nil, err
-	}
-	return FromRNode(rn), nil
+	kvLdr ifc.KvLoader, args *types.ConfigMapArgs) (ifc.Kunstructured, error) {
+	panic("TODO(#WNodeFactory): implement MakeConfigMap")
 }
 
-// MakeSecret makes a wrapped secret.
 func (k *WNodeFactory) MakeSecret(
-	ldr ifc.KvLoader, args *types.SecretArgs) (ifc.Kunstructured, error) {
-	rn, err := generators.MakeSecret(ldr, args)
-	if err != nil {
-		return nil, err
-	}
-	return FromRNode(rn), nil
+	kvLdr ifc.KvLoader, args *types.SecretArgs) (ifc.Kunstructured, error) {
+	panic("TODO(#WNodeFactory): implement MakeSecret")
 }

api/internal/wrappy/factory_test.go

@@ -1,321 +1,4 @@
 // Copyright 2020 The Kubernetes Authors.
 // SPDX-License-Identifier: Apache-2.0
 
-package wrappy_test
-
-import (
-	"fmt"
-	"reflect"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	. "sigs.k8s.io/kustomize/api/internal/wrappy"
-)
-
-func TestHasher(t *testing.T) {
-	input := `
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: foo
-data:
-  one: ""
-binaryData:
-  two: ""
-`
-	expect := "698h7c7t9m"
-
-	factory := &WNodeFactory{}
-	k, err := factory.SliceFromBytes([]byte(input))
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	hasher := factory.Hasher()
-	result, err := hasher.Hash(k[0])
-	if err != nil {
-		t.Fatal(err)
-	}
-	if result != expect {
-		t.Fatalf("expect %s but got %s", expect, result)
-	}
-}
-
-func TestSliceFromBytes(t *testing.T) {
-	factory := &WNodeFactory{}
-	testConfigMap :=
-		map[string]interface{}{
-			"apiVersion": "v1",
-			"kind":       "ConfigMap",
-			"metadata": map[string]interface{}{
-				"name": "winnie",
-			},
-		}
-	testConfigMapList :=
-		map[string]interface{}{
-			"apiVersion": "v1",
-			"kind":       "ConfigMapList",
-			"items": []interface{}{
-				testConfigMap,
-				testConfigMap,
-			},
-		}
-	testDeploymentSpec := map[string]interface{}{
-		"template": map[string]interface{}{
-			"spec": map[string]interface{}{
-				"hostAliases": []interface{}{
-					map[string]interface{}{
-						"hostnames": []interface{}{
-							"a.example.com",
-						},
-						"ip": "8.8.8.8",
-					},
-				},
-			},
-		},
-	}
-	testDeploymentA := map[string]interface{}{
-		"apiVersion": "apps/v1",
-		"kind":       "Deployment",
-		"metadata": map[string]interface{}{
-			"name": "deployment-a",
-		},
-		"spec": testDeploymentSpec,
-	}
-	testDeploymentB := map[string]interface{}{
-		"apiVersion": "apps/v1",
-		"kind":       "Deployment",
-		"metadata": map[string]interface{}{
-			"name": "deployment-b",
-		},
-		"spec": testDeploymentSpec,
-	}
-	testDeploymentList :=
-		map[string]interface{}{
-			"apiVersion": "v1",
-			"kind":       "DeploymentList",
-			"items": []interface{}{
-				testDeploymentA,
-				testDeploymentB,
-			},
-		}
-
-	type expected struct {
-		out   []map[string]interface{}
-		isErr bool
-	}
-
-	testCases := map[string]struct {
-		input []byte
-		exp   expected
-	}{
-		"garbage": {
-			input: []byte("garbageIn: garbageOut"),
-			exp: expected{
-				isErr: true,
-			},
-		},
-		"noBytes": {
-			input: []byte{},
-			exp: expected{
-				out: []map[string]interface{}{},
-			},
-		},
-		"goodJson": {
-			input: []byte(`
-{"apiVersion":"v1","kind":"ConfigMap","metadata":{"name":"winnie"}}
-`),
-			exp: expected{
-				out: []map[string]interface{}{testConfigMap},
-			},
-		},
-		"goodYaml1": {
-			input: []byte(`
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: winnie
-`),
-			exp: expected{
-				out: []map[string]interface{}{testConfigMap},
-			},
-		},
-		"goodYaml2": {
-			input: []byte(`
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: winnie
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: winnie
-`),
-			exp: expected{
-				out: []map[string]interface{}{testConfigMap, testConfigMap},
-			},
-		},
-		"localConfigYaml": {
-			input: []byte(`
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: winnie-skip
-  annotations:
-    # this annotation causes the Resource to be ignored by kustomize
-    config.kubernetes.io/local-config: ""
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: winnie
-`),
-			exp: expected{
-				out: []map[string]interface{}{testConfigMap},
-			},
-		},
-		"garbageInOneOfTwoObjects": {
-			input: []byte(`
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: winnie
----
-WOOOOOOOOOOOOOOOOOOOOOOOOT:  woot
-`),
-			exp: expected{
-				isErr: true,
-			},
-		},
-		"emptyObjects": {
-			input: []byte(`
----
-#a comment
-
----
-
-`),
-			exp: expected{
-				out: []map[string]interface{}{},
-			},
-		},
-		"Missing .metadata.name in object": {
-			input: []byte(`
-apiVersion: v1
-kind: Namespace
-metadata:
-  annotations:
-    foo: bar
-`),
-			exp: expected{
-				isErr: true,
-			},
-		},
-		"nil value in list": {
-			input: []byte(`
-apiVersion: builtin
-kind: ConfigMapGenerator
-metadata:
-  name: kube100-site
-	labels:
-	  app: web
-testList:
-- testA
--
-`),
-			exp: expected{
-				isErr: true,
-			},
-		},
-		"List": {
-			input: []byte(`
-apiVersion: v1
-kind: List
-items:
-- apiVersion: v1
-  kind: ConfigMap
-  metadata:
-    name: winnie
-- apiVersion: v1
-  kind: ConfigMap
-  metadata:
-    name: winnie
-`),
-			exp: expected{
-				out: []map[string]interface{}{
-					testConfigMap,
-					testConfigMap},
-			},
-		},
-		"ConfigMapList": {
-			input: []byte(`
-apiVersion: v1
-kind: ConfigMapList
-items:
-- apiVersion: v1
-  kind: ConfigMap
-  metadata:
-    name: winnie
-- apiVersion: v1
-  kind: ConfigMap
-  metadata:
-    name: winnie
-`),
-			exp: expected{
-				out: []map[string]interface{}{testConfigMapList},
-			},
-		},
-		"listWithAnchors": {
-			input: []byte(`
-apiVersion: v1
-kind: DeploymentList
-items:
-- apiVersion: apps/v1
-  kind: Deployment
-  metadata:
-    name: deployment-a
-  spec: &hostAliases
-    template:
-      spec:
-        hostAliases:
-        - hostnames:
-          - a.example.com
-          ip: 8.8.8.8
-- apiVersion: apps/v1
-  kind: Deployment
-  metadata:
-    name: deployment-b
-  spec:
-    <<: *hostAliases
-`),
-			exp: expected{
-				out: []map[string]interface{}{testDeploymentList},
-			},
-		},
-	}
-
-	for n := range testCases {
-		tc := testCases[n]
-		t.Run(n, func(t *testing.T) {
-			rs, err := factory.SliceFromBytes(tc.input)
-			if err != nil {
-				assert.True(t, tc.exp.isErr)
-				return
-			}
-			assert.False(t, tc.exp.isErr)
-			assert.Equal(t, len(tc.exp.out), len(rs))
-			for i := range rs {
-				assert.Equal(
-					t, fmt.Sprintf("%v", tc.exp.out[i]), fmt.Sprintf("%v", rs[i].Map()))
-				if n != "listWithAnchors" {
-					// https://github.com/kubernetes-sigs/kustomize/issues/3271
-					if !reflect.DeepEqual(tc.exp.out[i], rs[i].Map()) {
-						t.Fatalf("%s:\nexpected: %v\n  actual: %v",
-							n, tc.exp.out[i], rs[i].Map())
-					}
-				}
-			}
-		})
-	}
-}
+package wrappy

api/internal/wrappy/wnode.go

@@ -31,14 +31,6 @@ func NewWNode() *WNode {
 	return FromRNode(yaml.NewRNode(nil))
 }
 
-func FromMap(m map[string]interface{}) (*WNode, error) {
-	n, err := yaml.FromMap(m)
-	if err != nil {
-		return nil, err
-	}
-	return FromRNode(n), nil
-}
-
 func FromRNode(node *yaml.RNode) *WNode {
 	return &WNode{node: node}
 }
@@ -91,8 +83,8 @@ func (wn *WNode) GetFieldValue(path string) (interface{}, error) {
 	// Return value as slice for SequenceNode kind
 	if yn.Kind == yaml.SequenceNode {
 		var result []interface{}
-		if err := yn.Decode(&result); err != nil {
-			return nil, err
+		for _, node := range yn.Content {
+			result = append(result, node.Value)
 		}
 		return result, nil
 	}
@@ -108,16 +100,6 @@ func (wn *WNode) GetGvk() resid.Gvk {
 	return resid.Gvk{Group: g, Version: v, Kind: meta.Kind}
 }
 
-// GetDataMap implements ifc.Kunstructured.
-func (wn *WNode) GetDataMap() map[string]string {
-	return wn.node.GetDataMap()
-}
-
-// SetDataMap implements ifc.Kunstructured.
-func (wn *WNode) SetDataMap(m map[string]string) {
-	wn.node.SetDataMap(m)
-}
-
 // GetKind implements ifc.Kunstructured.
 func (wn *WNode) GetKind() string {
 	return wn.demandMetaData("GetKind").Kind
@@ -173,49 +155,47 @@ func (wn *WNode) MarshalJSON() ([]byte, error) {
 }
 
 // MatchesAnnotationSelector implements ifc.Kunstructured.
-func (wn *WNode) MatchesAnnotationSelector(selector string) (bool, error) {
-	return wn.node.MatchesAnnotationSelector(selector)
+func (wn *WNode) MatchesAnnotationSelector(string) (bool, error) {
+	panic("TODO(#WNode) MatchesAnnotationSelector; implement or drop from API")
 }
 
 // MatchesLabelSelector implements ifc.Kunstructured.
-func (wn *WNode) MatchesLabelSelector(selector string) (bool, error) {
-	return wn.node.MatchesLabelSelector(selector)
+func (wn *WNode) MatchesLabelSelector(string) (bool, error) {
+	panic("TODO(#WNode) MatchesLabelSelector; implement or drop from API")
 }
 
 // SetAnnotations implements ifc.Kunstructured.
 func (wn *WNode) SetAnnotations(annotations map[string]string) {
-	if err := wn.node.SetAnnotations(annotations); err != nil {
-		log.Fatal(err) // interface doesn't allow error.
-	}
+	wn.setField(yaml.NewMapRNode(&annotations), yaml.MetadataField, yaml.AnnotationsField)
 }
 
 // SetGvk implements ifc.Kunstructured.
 func (wn *WNode) SetGvk(gvk resid.Gvk) {
-	wn.setMapField(yaml.NewScalarRNode(gvk.Kind), yaml.KindField)
-	wn.setMapField(yaml.NewScalarRNode(gvk.ApiVersion()), yaml.APIVersionField)
+	wn.setField(yaml.NewScalarRNode(gvk.Kind), yaml.KindField)
+	wn.setField(yaml.NewScalarRNode(fmt.Sprintf("%s/%s", gvk.Group, gvk.Version)), yaml.APIVersionField)
 }
 
 // SetLabels implements ifc.Kunstructured.
 func (wn *WNode) SetLabels(labels map[string]string) {
-	if err := wn.node.SetLabels(labels); err != nil {
-		log.Fatal(err) // interface doesn't allow error.
-	}
+	wn.setField(yaml.NewMapRNode(&labels), yaml.MetadataField, yaml.LabelsField)
 }
 
 // SetName implements ifc.Kunstructured.
 func (wn *WNode) SetName(name string) {
-	wn.setMapField(yaml.NewScalarRNode(name), yaml.MetadataField, yaml.NameField)
+	wn.setField(yaml.NewScalarRNode(name), yaml.MetadataField, yaml.NameField)
 }
 
 // SetNamespace implements ifc.Kunstructured.
 func (wn *WNode) SetNamespace(ns string) {
-	if err := wn.node.SetNamespace(ns); err != nil {
-		log.Fatal(err) // interface doesn't allow error.
-	}
+	wn.setField(yaml.NewScalarRNode(ns), yaml.MetadataField, yaml.NamespaceField)
 }
 
-func (wn *WNode) setMapField(value *yaml.RNode, path ...string) {
-	if err := wn.node.SetMapField(value, path...); err != nil {
+func (wn *WNode) setField(value *yaml.RNode, path ...string) {
+	err := wn.node.PipeE(
+		yaml.LookupCreate(yaml.MappingNode, path[0:len(path)-1]...),
+		yaml.SetField(path[len(path)-1], value),
+	)
+	if err != nil {
 		// Log and die since interface doesn't allow error.
 		log.Fatalf("failed to set field %v: %v", path, err)
 	}

api/internal/wrappy/wnode_test.go

@@ -8,8 +8,9 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
-	"gopkg.in/yaml.v3"
 	"sigs.k8s.io/kustomize/api/resid"
+
+	"gopkg.in/yaml.v3"
 	kyaml "sigs.k8s.io/kustomize/kyaml/yaml"
 )
 
@@ -377,39 +378,6 @@ func TestGetFieldValueReturnsSlice(t *testing.T) {
 	}
 }
 
-func TestGetFieldValueReturnsSliceOfMappings(t *testing.T) {
-	bytes, err := yaml.Marshal(makeBigMap())
-	if err != nil {
-		t.Fatalf("unexpected yaml.Marshal err: %v", err)
-	}
-	rNode, err := kyaml.Parse(string(bytes))
-	if err != nil {
-		t.Fatalf("unexpected yaml.Marshal err: %v", err)
-	}
-	wn := FromRNode(rNode)
-	expected := []interface{}{
-		map[string]interface{}{
-			"field1": "idx0foo",
-			"field2": "idx0bar",
-		},
-		map[string]interface{}{
-			"field1": "idx1foo",
-			"field2": "idx1bar",
-		},
-		map[string]interface{}{
-			"field1": "idx2foo",
-			"field2": "idx2bar",
-		},
-	}
-	actual, err := wn.GetFieldValue("those")
-	if err != nil {
-		t.Fatalf("error getting slice: %v", err)
-	}
-	if diff := cmp.Diff(expected, actual); diff != "" {
-		t.Fatalf("actual slice does not deep equal expected slice:\n%v", diff)
-	}
-}
-
 func TestGetFieldValueReturnsString(t *testing.T) {
 	wn := NewWNode()
 	if err := wn.UnmarshalJSON([]byte(deploymentBiggerJson)); err != nil {

api/k8sdeps/kunstruct/factory.go

@@ -14,7 +14,6 @@ import (
 	"k8s.io/apimachinery/pkg/util/yaml"
 	"sigs.k8s.io/kustomize/api/ifc"
 	"sigs.k8s.io/kustomize/api/internal/k8sdeps/configmapandsecret"
-	"sigs.k8s.io/kustomize/api/konfig"
 	"sigs.k8s.io/kustomize/api/types"
 )
 
@@ -117,6 +116,10 @@ func (kf *KunstructuredFactoryImpl) validate(u unstructured.Unstructured) error
 	return nil
 }
 
+// nonKustomizableResourceAnnotation if set on a Resource will cause Kustomize to
+// ignore the Resource rather than Kustomize it.
+const ignoredByKustomizeResourceAnnotation = "config.kubernetes.io/local-config"
+
 // skipResource returns true if the Resource should not be accumulated
 func (kf *KunstructuredFactoryImpl) skipResource(u unstructured.Unstructured) bool {
 	an := u.GetAnnotations()
@@ -125,7 +128,7 @@ func (kf *KunstructuredFactoryImpl) skipResource(u unstructured.Unstructured) bo
 		return false
 	}
 	// check if the Resource has opt-ed out of kustomize
-	_, found := an[konfig.IgnoredByKustomizeResourceAnnotation]
+	_, found := an[ignoredByKustomizeResourceAnnotation]
 	return found
 }
 

api/k8sdeps/kunstruct/unstructadapter.go

@@ -7,7 +7,6 @@ package kunstruct
 import (
 	"encoding/json"
 	"fmt"
-	"log"
 
 	jsonpatch "github.com/evanphx/json-patch"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -250,29 +249,6 @@ func (fs *UnstructAdapter) GetStringMap(path string) (map[string]string, error)
 	return nil, NoFieldError{Field: path}
 }
 
-func (fs *UnstructAdapter) GetDataMap() map[string]string {
-	m, err := fs.GetStringMap("data")
-	if err != nil {
-		return map[string]string{}
-	}
-	return m
-}
-
-func (fs *UnstructAdapter) SetDataMap(m map[string]string) {
-	if m == nil {
-		unstructured.RemoveNestedField(fs.Object, "data")
-		return
-	}
-	s := make(map[string]interface{}, len(m))
-	for i, v := range m {
-		s[i] = v
-	}
-	err := unstructured.SetNestedMap(fs.Object, s, "data")
-	if err != nil {
-		log.Fatal(err)
-	}
-}
-
 // GetMap returns value at the given fieldpath.
 func (fs *UnstructAdapter) GetMap(path string) (map[string]interface{}, error) {
 	content, fields, found, err := fs.selectSubtree(path)

api/k8sdeps/kunstruct/unstructadapter_test.go

@@ -6,8 +6,6 @@ package kunstruct
 import (
 	"reflect"
 	"testing"
-
-	"github.com/stretchr/testify/assert"
 )
 
 var kunstructured = NewKunstructuredFactoryImpl().FromMap(map[string]interface{}{
@@ -559,139 +557,3 @@ func compareValues(t *testing.T, name string, pathToField string, expectedValue
 		t.Logf("%T value at `%s`", typedV, pathToField)
 	}
 }
-
-func TestKunstGetDataMap(t *testing.T) {
-	emptyMap := map[string]string{}
-	testCases := map[string]struct {
-		theMap   map[string]interface{}
-		expected map[string]string
-	}{
-		"actuallyNil": {
-			theMap:   nil,
-			expected: emptyMap,
-		},
-		"empty": {
-			theMap:   map[string]interface{}{},
-			expected: emptyMap,
-		},
-		"mostlyEmpty": {
-			theMap: map[string]interface{}{
-				"hey": "there",
-			},
-			expected: emptyMap,
-		},
-		"noNameConfigMap": {
-			theMap: map[string]interface{}{
-				"apiVersion": "v1",
-				"kind":       "ConfigMap",
-			},
-			expected: emptyMap,
-		},
-		"configMap": {
-			theMap: map[string]interface{}{
-				"apiVersion": "v1",
-				"kind":       "ConfigMap",
-				"metadata": map[string]interface{}{
-					"name": "winnie",
-				},
-				"data": map[string]interface{}{
-					"wine":   "cabernet",
-					"truck":  "ford",
-					"rocket": "falcon9",
-					"planet": "mars",
-					"city":   "brownsville",
-				},
-			},
-			// order irrelevant, because assert.Equals is smart about maps.
-			expected: map[string]string{
-				"city":   "brownsville",
-				"wine":   "cabernet",
-				"planet": "mars",
-				"rocket": "falcon9",
-				"truck":  "ford",
-			},
-		},
-	}
-
-	for n := range testCases {
-		tc := testCases[n]
-		t.Run(n, func(t *testing.T) {
-			kunstr := NewKunstructuredFactoryImpl().FromMap(tc.theMap)
-			m := kunstr.GetDataMap()
-			if !assert.Equal(t, tc.expected, m) {
-				t.FailNow()
-			}
-		})
-	}
-}
-
-func TestKunstSetDataMap(t *testing.T) {
-	testCases := map[string]struct {
-		theMap   map[string]interface{}
-		input    map[string]string
-		expected map[string]string
-	}{
-		"empty": {
-			theMap: map[string]interface{}{},
-			input: map[string]string{
-				"wine":  "cabernet",
-				"truck": "ford",
-			},
-			expected: map[string]string{
-				"wine":  "cabernet",
-				"truck": "ford",
-			},
-		},
-		"replace": {
-			theMap: map[string]interface{}{
-				"foo": 3,
-				"data": map[string]string{
-					"rocket": "falcon9",
-					"planet": "mars",
-				},
-			},
-			input: map[string]string{
-				"wine":  "cabernet",
-				"truck": "ford",
-			},
-			expected: map[string]string{
-				"wine":  "cabernet",
-				"truck": "ford",
-			},
-		},
-		"clear1": {
-			theMap: map[string]interface{}{
-				"foo": 3,
-				"data": map[string]string{
-					"rocket": "falcon9",
-					"planet": "mars",
-				},
-			},
-			input:    map[string]string{},
-			expected: map[string]string{},
-		},
-		"clear2": {
-			theMap: map[string]interface{}{
-				"foo": 3,
-				"data": map[string]string{
-					"rocket": "falcon9",
-					"planet": "mars",
-				},
-			},
-			input:    nil,
-			expected: map[string]string{},
-		},
-	}
-
-	for n := range testCases {
-		tc := testCases[n]
-		t.Run(n, func(t *testing.T) {
-			kunstr := NewKunstructuredFactoryImpl().FromMap(tc.theMap)
-			kunstr.SetDataMap(tc.input)
-			m := kunstr.GetDataMap()
-			if !assert.Equal(t, tc.expected, m) {
-				t.FailNow()
-			}
-		})
-	}
-}

api/konfig/builtinpluginconsts/commonlabels.go

@@ -51,11 +51,6 @@ commonLabels:
   group: apps
   kind: Deployment
 
-- path: spec/template/spec/topologySpreadConstraints/labelSelector/matchLabels
-  create: false
-  group: apps
-  kind: Deployment
-
 - path: spec/selector/matchLabels
   create: true
   kind: ReplicaSet
@@ -102,11 +97,6 @@ commonLabels:
   group: apps
   kind: StatefulSet
 
-- path: spec/template/spec/topologySpreadConstraints/labelSelector/matchLabels
-  create: false
-  group: apps
-  kind: StatefulSet
-
 - path: spec/volumeClaimTemplates[]/metadata/labels
   create: true
   group: apps

api/konfig/builtinpluginconsts/namereference.go

@@ -121,10 +121,6 @@ nameReference:
     kind: CronJob
   - path: spec/configSource/configMap
     kind: Node
-  - path: rules/resourceNames
-    kind: Role
-  - path: rules/resourceNames
-    kind: ClusterRole
 
 - kind: Secret
   version: v1
@@ -262,8 +258,6 @@ nameReference:
     kind: Service
     group: serving.knative.dev
     version: v1
-  - path: spec/azureFile/secretName
-    kind: PersistentVolume
 
 - kind: Service
   version: v1

api/konfig/general.go

@@ -19,32 +19,7 @@ func DefaultKustomizationFileName() string {
 	return RecognizedKustomizationFileNames()[0]
 }
 
-// IfApiMachineryElseKyaml returns true if executing the apimachinery code
-// path, else we're executing the kyaml code paths.
-func IfApiMachineryElseKyaml(s1, s2 string) string {
-	if !FlagEnableKyamlDefaultValue {
-		return s1
-	}
-	return s2
-}
-
 const (
-	// FlagEnableKyamlDefaultValue is the default value for the --enable_kyaml
-	// flag.  This value is also used in unit tests.  See provider.DepProvider.
-	//
-	// TODO(#3304): eliminate branching on this constant.
-	// Details: https://github.com/kubernetes-sigs/kustomize/issues/3304
-	//
-	// All tests should pass for either true or false values
-	// of this constant, without having to check its value.
-	// In the cases where there's a different outcome, either decide
-	// that the difference is acceptable, or make the difference go away.
-	//
-	// Historically, tests passed for enable_kyaml == false, i.e. using
-	// apimachinery libs.  This doesn't mean the code was better, it just
-	// means regression tests preserved those outcomes.
-	FlagEnableKyamlDefaultValue = false
-
 	// An environment variable to consult for kustomization
 	// configuration data.  See:
 	// https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
@@ -56,9 +31,6 @@ const (
 	// A program name, for use in help, finding the XDG_CONFIG_DIR, etc.
 	ProgramName = "kustomize"
 
-	// If a resource has this annotation, kustomize will drop it.
-	IgnoredByKustomizeResourceAnnotation = "config.kubernetes.io/local-config"
-
 	// Label key that indicates the resources are built from Kustomize
 	ManagedbyLabelKey = "app.kubernetes.io/managed-by"
 

api/konfig/plugins.go

@@ -9,7 +9,6 @@ import (
 	"runtime"
 
 	"sigs.k8s.io/kustomize/api/filesys"
-	"sigs.k8s.io/kustomize/api/internal/plugins/builtinhelpers"
 	"sigs.k8s.io/kustomize/api/types"
 )
 
@@ -158,15 +157,3 @@ func pwdEnv() string {
 	}
 	return "PWD"
 }
-
-// GetBuiltinPluginNames returns a list of builtin plugin names
-func GetBuiltinPluginNames() []string {
-	var ret []string
-	for k := range builtinhelpers.GeneratorFactories {
-		ret = append(ret, k.String())
-	}
-	for k := range builtinhelpers.TransformerFactories {
-		ret = append(ret, k.String())
-	}
-	return ret
-}

api/krusty/component_test.go

@@ -39,8 +39,8 @@ resources:
 configMapGenerator:
 - name: my-configmap
   literals:	
-  - testValue=purple
-  - otherValue=green
+  - testValue=1
+  - otherValue=10
 `)
 	th.WriteF("/app/base/deploy.yaml", `
 apiVersion: v1
@@ -64,8 +64,8 @@ configMapGenerator:
 - name: my-configmap
   behavior: merge
   literals:	
-  - testValue=blue
-  - compValue=red
+  - testValue=2
+  - compValue=5
 `)
 	th.WriteF("/app/comp/stub.yaml", `
 apiVersion: v1
@@ -125,12 +125,14 @@ spec:
 ---
 apiVersion: v1
 data:
-  compValue: red
-  otherValue: green
-  testValue: blue
+  compValue: "5"
+  otherValue: "10"
+  testValue: "2"
 kind: ConfigMap
 metadata:
-  name: comp-my-configmap-97647ckcmg
+  annotations: {}
+  labels: {}
+  name: comp-my-configmap-kc6k2kmkh9
 ---
 apiVersion: v1
 kind: Deployment
@@ -154,7 +156,7 @@ configMapGenerator:
 - name: my-configmap
   behavior: merge
   literals:	
-  - otherValue=orange
+  - otherValue=9
 `),
 				writeK("/app/prod", `
 resources:
@@ -177,12 +179,14 @@ spec:
 ---
 apiVersion: v1
 data:
-  compValue: red
-  otherValue: orange
-  testValue: blue
+  compValue: "5"
+  otherValue: "9"
+  testValue: "2"
 kind: ConfigMap
 metadata:
-  name: comp-my-configmap-g486mb229k
+  annotations: {}
+  labels: {}
+  name: comp-my-configmap-55249mf5kb
 ---
 apiVersion: v1
 kind: Deployment
@@ -208,7 +212,7 @@ configMapGenerator:
 - name: my-configmap
   behavior: merge
   literals:
-  - otherValue=orange
+  - otherValue=9
 `),
 				writeK("/app/prod", `
 resources:
@@ -230,12 +234,14 @@ spec:
 ---
 apiVersion: v1
 data:
-  compValue: red
-  otherValue: orange
-  testValue: blue
+  compValue: "5"
+  otherValue: "9"
+  testValue: "2"
 kind: ConfigMap
 metadata:
-  name: comp-my-configmap-g486mb229k
+  annotations: {}
+  labels: {}
+  name: comp-my-configmap-55249mf5kb
 ---
 apiVersion: v1
 kind: Deployment
@@ -273,11 +279,11 @@ spec:
 ---
 apiVersion: v1
 data:
-  otherValue: green
-  testValue: purple
+  otherValue: "10"
+  testValue: "1"
 kind: ConfigMap
 metadata:
-  name: my-configmap-9cd648hm8f
+  name: my-configmap-2g9c94mhb8
 ---
 apiVersion: v1
 kind: Deployment
@@ -288,12 +294,14 @@ spec:
 ---
 apiVersion: v1
 data:
-  compValue: red
-  otherValue: green
-  testValue: blue
+  compValue: "5"
+  otherValue: "10"
+  testValue: "2"
 kind: ConfigMap
 metadata:
-  name: comp-my-configmap-97647ckcmg
+  annotations: {}
+  labels: {}
+  name: comp-my-configmap-kc6k2kmkh9
 ---
 apiVersion: v1
 kind: Deployment
@@ -319,8 +327,8 @@ configMapGenerator:
 - name: my-configmap
   behavior: merge
   literals:	
-  - compValue=red
-  - testValue=blue
+  - compValue=5
+  - testValue=2
 `),
 			},
 			runPath: "/app/direct-component",
@@ -334,12 +342,14 @@ spec:
 ---
 apiVersion: v1
 data:
-  compValue: red
-  otherValue: green
-  testValue: blue
+  compValue: "5"
+  otherValue: "10"
+  testValue: "2"
 kind: ConfigMap
 metadata:
-  name: my-configmap-97647ckcmg
+  annotations: {}
+  labels: {}
+  name: my-configmap-kc6k2kmkh9
 `,
 		},
 		"missing-optional-component-api-version": {
@@ -350,7 +360,7 @@ configMapGenerator:
 - name: my-configmap
   behavior: merge
   literals:	
-  - otherValue=orange
+  - otherValue=9
 `),
 			},
 			runPath: "/app/prod",
@@ -364,11 +374,13 @@ spec:
 ---
 apiVersion: v1
 data:
-  otherValue: orange
-  testValue: purple
+  otherValue: "9"
+  testValue: "1"
 kind: ConfigMap
 metadata:
-  name: my-configmap-6hhdg8gkdg
+  annotations: {}
+  labels: {}
+  name: my-configmap-5g7gh5mgt5
 ---
 apiVersion: v1
 kind: Deployment
@@ -411,11 +423,11 @@ spec:
 ---
 apiVersion: v1
 data:
-  otherValue: green
-  testValue: purple
+  otherValue: "10"
+  testValue: "1"
 kind: ConfigMap
 metadata:
-  name: my-configmap-a-b-9cd648hm8f
+  name: my-configmap-a-b-2g9c94mhb8
 ---
 apiVersion: v1
 kind: Deployment
@@ -426,11 +438,11 @@ spec:
 ---
 apiVersion: v1
 data:
-  otherValue: green
-  testValue: purple
+  otherValue: "10"
+  testValue: "1"
 kind: ConfigMap
 metadata:
-  name: my-configmap-b-9cd648hm8f
+  name: my-configmap-b-2g9c94mhb8
 `,
 		},
 
@@ -562,7 +574,7 @@ configMapGenerator:
 - name: my-configmap
   behavior: merge
   literals:	
-  - otherValue=orange
+  - otherValue=9
 `),
 			},
 			runPath:       "/app/prod",

api/krusty/configmaps_test.go

@@ -4,100 +4,11 @@
 package krusty_test
 
 import (
-	"fmt"
 	"testing"
 
 	kusttest_test "sigs.k8s.io/kustomize/api/testutils/kusttest"
 )
 
-// Numbers and booleans are quoted
-func TestGeneratorIntVsStringNoMerge(t *testing.T) {
-	th := kusttest_test.MakeHarness(t)
-	th.WriteK(".", `
-resources:
-- service.yaml
-configMapGenerator:
-- name: bob
-  literals:
-  - fruit=Indian Gooseberry
-  - year=2020
-  - crisis=true
-`)
-	th.WriteF("service.yaml", `
-apiVersion: v1
-kind: Service
-metadata:
-  annotations:
-    port: 8080
-    happy: true
-    color: green
-  name: demo
-spec:
-  clusterIP: None
-`)
-	m := th.Run(".", th.MakeDefaultOptions())
-	th.AssertActualEqualsExpected(
-		m, `
-apiVersion: v1
-kind: Service
-metadata:
-  annotations:
-    color: green
-    happy: true
-    port: 8080
-  name: demo
-spec:
-  clusterIP: None
----
-apiVersion: v1
-data:
-  crisis: "true"
-  fruit: Indian Gooseberry
-  year: "2020"
-kind: ConfigMap
-metadata:
-  name: bob-79t79mt227
-`)
-}
-
-// Observation: Numbers no longer quoted
-func TestGeneratorIntVsStringWithMerge(t *testing.T) {
-	th := kusttest_test.MakeHarness(t)
-	th.WriteK("base", `
-configMapGenerator:
-- name: bob
-  literals:
-  - fruit=Indian Gooseberry
-  - year=2020
-  - crisis=true
-`)
-	th.WriteK("overlay", `
-resources:
-- ../base
-configMapGenerator:
-- name: bob
-  behavior: merge
-  literals:
-  - month=12
-`)
-	opts := th.MakeDefaultOptions()
-	m := th.Run("overlay", opts)
-	expFmt := `apiVersion: v1
-data:
-  crisis: %s
-  fruit: Indian Gooseberry
-  month: %s
-  year: %s
-kind: ConfigMap
-metadata:
-  name: bob-%s
-`
-	th.AssertActualEqualsExpected(
-		m, opts.IfApiMachineryElseKyaml(
-			fmt.Sprintf(expFmt, `"true"`, `"12"`, `"2020"`, `bk46gm59c6`),
-			fmt.Sprintf(expFmt, `true`, `12`, `2020`, `bkmtk2t2fb`)))
-}
-
 // Generate a Secret and a ConfigMap from the same data
 // to compare the result.
 func TestGeneratorBasics(t *testing.T) {
@@ -148,9 +59,10 @@ electromagnetic
 strong nuclear
 weak nuclear
 `)
-	opts := th.MakeDefaultOptions()
-	m := th.Run("/app", opts)
-	expFmt := `apiVersion: v1
+
+	m := th.Run("/app", th.MakeDefaultOptions())
+	th.AssertActualEqualsExpected(m, `
+apiVersion: v1
 data:
   MOUNTAIN: everest
   OCEAN: pacific
@@ -183,26 +95,15 @@ apiVersion: v1
 data:
   MOUNTAIN: ZXZlcmVzdA==
   OCEAN: cGFjaWZpYw==
-  forces.txt: %s
+  forces.txt: CmdyYXZpdGF0aW9uYWwKZWxlY3Ryb21hZ25ldGljCnN0cm9uZyBudWNsZWFyCndlYWsgbnVjbGVhcgo=
   fruit: YXBwbGU=
-  passphrase: %s
+  passphrase: CkxpZmUgaXMgc2hvcnQuCkJ1dCB0aGUgeWVhcnMgYXJlIGxvbmcuCk5vdCB3aGlsZSB0aGUgZXZpbCBkYXlzIGNvbWUgbm90Lgo=
   vegetable: YnJvY2NvbGk=
 kind: Secret
 metadata:
-  name: blah-bob-%s
+  name: blah-bob-ftht6hfgmb
 type: Opaque
-`
-	th.AssertActualEqualsExpected(
-		m, opts.IfApiMachineryElseKyaml(
-			fmt.Sprintf(expFmt,
-				`CmdyYXZpdGF0aW9uYWwKZWxlY3Ryb21hZ25ldGljCnN0cm9uZyBudWNsZWFyCndlYWsgbnVjbGVhcgo=`,
-				`CkxpZmUgaXMgc2hvcnQuCkJ1dCB0aGUgeWVhcnMgYXJlIGxvbmcuCk5vdCB3aGlsZSB0aGUgZXZpbCBkYXlzIGNvbWUgbm90Lgo=`,
-				`ftht6hfgmb`),
-			fmt.Sprintf(expFmt, `|
-    CmdyYXZpdGF0aW9uYWwKZWxlY3Ryb21hZ25ldGljCnN0cm9uZyBudWNsZWFyCndlYWsgbn
-    VjbGVhcgo=`, `|
-    CkxpZmUgaXMgc2hvcnQuCkJ1dCB0aGUgeWVhcnMgYXJlIGxvbmcuCk5vdCB3aGlsZSB0aG
-    UgZXZpbCBkYXlzIGNvbWUgbm90Lgo=`, `9t25t44gg4`)))
+`)
 }
 
 // TODO: These should be errors instead.
@@ -258,68 +159,6 @@ metadata:
 `)
 }
 
-func TestIssue3393(t *testing.T) {
-	th := kusttest_test.MakeHarness(t)
-	th.WriteK(".", `
-resources:
-- cm.yaml
-configMapGenerator:
-  - name: project
-    behavior: merge
-    literals:
-    - ANOTHER_ENV_VARIABLE="bar"
-`)
-	th.WriteF("cm.yaml", `
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: project
-data:
-  A_FIRST_ENV_VARIABLE: "foo"
-`)
-	m := th.Run(".", th.MakeDefaultOptions())
-	th.AssertActualEqualsExpected(m, `
-apiVersion: v1
-data:
-  A_FIRST_ENV_VARIABLE: foo
-  ANOTHER_ENV_VARIABLE: bar
-kind: ConfigMap
-metadata:
-  name: project
-`)
-}
-
-func TestGeneratorSimpleOverlay(t *testing.T) {
-	th := kusttest_test.MakeHarness(t)
-	th.WriteK("base", `
-namePrefix: p-
-configMapGenerator:
-- name: cm
-  behavior: create
-  literals:
-  - fruit=apple
-`)
-	th.WriteK("overlay", `
-resources:
-- ../base
-configMapGenerator:
-- name: cm
-  behavior: merge
-  literals:
-  - veggie=broccoli
-`)
-	m := th.Run("overlay", th.MakeDefaultOptions())
-	th.AssertActualEqualsExpected(m, `
-apiVersion: v1
-data:
-  fruit: apple
-  veggie: broccoli
-kind: ConfigMap
-metadata:
-  name: p-cm-877mt5hc89
-`)
-}
-
 func TestGeneratorOverlays(t *testing.T) {
 	th := kusttest_test.MakeHarness(t)
 	th.WriteK("/app/base1", `
@@ -376,6 +215,8 @@ data:
   from: overlay
 kind: ConfigMap
 metadata:
+  annotations: {}
+  labels: {}
   name: p1-com1-8tc62428t2
 ---
 apiVersion: v1
@@ -383,6 +224,8 @@ data:
   from: overlay
 kind: ConfigMap
 metadata:
+  annotations: {}
+  labels: {}
   name: p2-com2-87mcggf7d7
 `)
 }
@@ -429,6 +272,8 @@ data:
   foo: bar
 kind: ConfigMap
 metadata:
+  annotations: {}
+  labels: {}
   name: o1-cm-ft9mmdc8c6
 ---
 apiVersion: v1
@@ -437,6 +282,8 @@ data:
   foo: bar
 kind: ConfigMap
 metadata:
+  annotations: {}
+  labels: {}
   name: cm-o2-5k95kd76ft
 `)
 }

api/krusty/crd_test.go

@@ -32,7 +32,7 @@ spec:
   action: fly
 `)
 	th.WriteF("/app/base/mykind.yaml", `
-apiVersion: jingfang.example.com/v1
+apiVersion: jingfang.example.com/v1beta1
 kind: MyKind
 metadata:
   name: mykind
@@ -236,7 +236,7 @@ kind: Secret
 metadata:
   name: x-crdsecret
 ---
-apiVersion: jingfang.example.com/v1
+apiVersion: jingfang.example.com/v1beta1
 kind: MyKind
 metadata:
   name: x-mykind
@@ -285,7 +285,7 @@ kind: Secret
 metadata:
   name: prod-x-crdsecret
 ---
-apiVersion: jingfang.example.com/v1
+apiVersion: jingfang.example.com/v1beta1
 kind: MyKind
 metadata:
   name: prod-x-mykind

api/krusty/fnplugin_test.go

@@ -1,7 +1,6 @@
 package krusty_test
 
 import (
-	"fmt"
 	"os/exec"
 	"testing"
 
@@ -129,9 +128,8 @@ stringData:
     bootcmd:
     - mkdir /mnt/vda
 `)
-	opts := th.MakeOptionsPluginsEnabled()
-	m := th.Run("/app", opts)
-	expFmt := `
+	m := th.Run("/app", th.MakeOptionsPluginsEnabled())
+	th.AssertActualEqualsExpected(m, `
 apiVersion: v1
 kind: Secret
 metadata:
@@ -154,7 +152,7 @@ metadata:
     name: demo
   name: demo-budget
 spec:
-  minAvailable: 67%%
+  minAvailable: 67%
   selector:
     matchLabels:
       app: cockroachdb
@@ -187,7 +185,9 @@ metadata:
   annotations:
     config.kubernetes.io/path: config/demo_service.yaml
     prometheus.io/path: _status/vars
-%s
+    prometheus.io/port: "8080"
+    prometheus.io/scrape: "true"
+    service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
   labels:
     app: cockroachdb
     name: demo
@@ -244,7 +244,7 @@ spec:
         - /bin/bash
         - -ecx
         - |
-          # The use of qualified ` + "`hostname -f`" + ` is crucial:
+          # The use of qualified `+"`hostname -f`"+` is crucial:
           # Other nodes aren't able to look up the unqualified hostname.
           CRARGS=("start" "--logtostderr" "--insecure" "--host" "$(hostname -f)" "--http-host" "0.0.0.0")
           # We only want to initialize a new cluster (by omitting the join flag)
@@ -302,14 +302,7 @@ spec:
       resources:
         requests:
           storage: 1Gi
-`
-	th.AssertActualEqualsExpected(m, opts.IfApiMachineryElseKyaml(
-		fmt.Sprintf(expFmt, `    prometheus.io/port: "8080"
-    prometheus.io/scrape: "true"
-    service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"`),
-		fmt.Sprintf(expFmt, `    prometheus.io/port: 8080
-    prometheus.io/scrape: true
-    service.alpha.kubernetes.io/tolerate-unready-endpoints: true`)))
+`)
 }
 
 func TestFnContainerTransformer(t *testing.T) {

api/krusty/gvknpatch_test.go

@@ -1,622 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package krusty_test
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	kusttest_test "sigs.k8s.io/kustomize/api/testutils/kusttest"
-)
-
-// Regression test for https://github.com/kubernetes-sigs/kustomize/issues/3280
-// GVKN shouldn't change with default options
-func TestKeepOriginalGVKN(t *testing.T) {
-	th := kusttest_test.MakeHarness(t)
-
-	th.WriteF("apps/deployment.yaml", `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: old-name
-spec:
-  template:
-    spec:
-      containers:
-        - name: nginx
-          image: nginx
-`)
-
-	th.WriteF("apps/patch.yaml", `
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
-  name: new-name
-`)
-
-	th.WriteK("apps", `
-resources:
-- deployment.yaml
-
-patches:
-- path: patch.yaml
-  target:
-    kind: Deployment
-`)
-
-	m := th.Run("apps", th.MakeDefaultOptions())
-	th.AssertActualEqualsExpected(m, `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: old-name
-spec:
-  template:
-    spec:
-      containers:
-      - image: nginx
-        name: nginx
-`)
-}
-
-// https://github.com/kubernetes-sigs/kustomize/issues/3280
-// These tests document behavior that will change
-func TestChangeName(t *testing.T) {
-	th := kusttest_test.MakeHarness(t)
-
-	th.WriteF("apps/deployment.yaml", `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: old-name
-spec:
-  template:
-    spec:
-      containers:
-        - name: nginx
-          image: nginx
-`)
-
-	th.WriteF("apps/patch.yaml", `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: new-name
-`)
-
-	th.WriteK("apps", `
-resources:
-- deployment.yaml
-
-patches:
-- path: patch.yaml
-  target:
-    kind: Deployment
-`)
-
-	options := th.MakeDefaultOptions()
-	options.AllowResourceIdChanges = true
-
-	// name should become `new-name`
-	m := th.Run("apps", options)
-	th.AssertActualEqualsExpected(m, `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: old-name
-spec:
-  template:
-    spec:
-      containers:
-      - image: nginx
-        name: nginx
-`)
-}
-
-func TestChangeKind(t *testing.T) {
-	th := kusttest_test.MakeHarness(t)
-
-	th.WriteF("apps/deployment.yaml", `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: old-name
-spec:
-  template:
-    spec:
-      containers:
-        - name: nginx
-          image: nginx
-`)
-
-	th.WriteF("apps/patch.yaml", `
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
-  name: old-name
-`)
-
-	th.WriteK("apps", `
-resources:
-- deployment.yaml
-
-patches:
-- path: patch.yaml
-  target:
-    kind: Deployment
-`)
-
-	options := th.MakeDefaultOptions()
-	options.AllowResourceIdChanges = true
-
-	// kind should become `StatefulSet`
-	m := th.Run("apps", options)
-	th.AssertActualEqualsExpected(m, `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: old-name
-spec:
-  template:
-    spec:
-      containers:
-      - image: nginx
-        name: nginx
-`)
-}
-
-func TestChangeNameAndKind(t *testing.T) {
-	th := kusttest_test.MakeHarness(t)
-
-	th.WriteF("apps/deployment.yaml", `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: old-name
-spec:
-  template:
-    spec:
-      containers:
-        - name: nginx
-          image: nginx
-`)
-
-	th.WriteF("apps/patch.yaml", `
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
-  name: new-name
-`)
-
-	th.WriteK("apps", `
-resources:
-- deployment.yaml
-
-patches:
-- path: patch.yaml
-  target:
-    kind: Deployment
-`)
-
-	options := th.MakeDefaultOptions()
-	options.AllowResourceIdChanges = true
-
-	// kind should become `StatefulSet`
-	// name should become `new-name`
-	m := th.Run("apps", options)
-	th.AssertActualEqualsExpected(m, `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: old-name
-spec:
-  template:
-    spec:
-      containers:
-      - image: nginx
-        name: nginx
-`)
-}
-
-// https://github.com/kubernetes-sigs/kustomize/issues/3280
-// Should be able to refer to a resource with either its
-// original GVKN or its current one
-func TestPatchOriginalName(t *testing.T) {
-	th := kusttest_test.MakeHarness(t)
-
-	th.WriteF("base/deployment.yaml", `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: old-name
-spec:
-  template:
-    spec:
-      containers:
-        - name: nginx
-          image: nginx
-`)
-	th.WriteF("base/patch.yaml", `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: new-name
-`)
-	th.WriteK("base", `
-resources:
-- deployment.yaml
-
-patches:
-- path: patch.yaml
-  target:
-    kind: Deployment
-`)
-
-	th.WriteK("overlay", `
-resources:
-- ../base
-patchesStrategicMerge:
-- depPatch.yaml
-`)
-	th.WriteF("overlay/depPatch.yaml", `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: old-name
-spec:
-  replicas: 999
-`)
-
-	options := th.MakeDefaultOptions()
-	options.AllowResourceIdChanges = true
-
-	// name should become `new-name`
-	m := th.Run("overlay", options)
-	th.AssertActualEqualsExpected(m, `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: old-name
-spec:
-  replicas: 999
-  template:
-    spec:
-      containers:
-      - image: nginx
-        name: nginx
-`)
-}
-
-func TestPatchNewName(t *testing.T) {
-	th := kusttest_test.MakeHarness(t)
-
-	th.WriteF("base/deployment.yaml", `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: old-name
-spec:
-  template:
-    spec:
-      containers:
-        - name: nginx
-          image: nginx
-`)
-	th.WriteF("base/patch.yaml", `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: new-name
-`)
-	th.WriteK("base", `
-resources:
-- deployment.yaml
-
-patches:
-- path: patch.yaml
-  target:
-    kind: Deployment
-`)
-
-	th.WriteK("overlay", `
-resources:
-- ../base
-patchesStrategicMerge:
-- depPatch.yaml
-`)
-	th.WriteF("overlay/depPatch.yaml", `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: new-name
-spec:
-  replicas: 999
-`)
-
-	options := th.MakeDefaultOptions()
-	options.AllowResourceIdChanges = true
-
-	// depPatch cannot find target with the name `new-name`
-	// because base/patch.yaml can't yet edit the name
-	assert.Error(t, th.RunWithErr("overlay", options))
-}
-
-func TestPatchOriginalNameAndKind(t *testing.T) {
-	th := kusttest_test.MakeHarness(t)
-
-	th.WriteF("base/deployment.yaml", `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: old-name
-spec:
-  template:
-    spec:
-      containers:
-        - name: nginx
-          image: nginx
-`)
-	th.WriteF("base/patch.yaml", `
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
-  name: new-name
-`)
-	th.WriteK("base", `
-resources:
-- deployment.yaml
-
-patches:
-- path: patch.yaml
-  target:
-    kind: Deployment
-`)
-
-	th.WriteK("overlay", `
-resources:
-- ../base
-patchesStrategicMerge:
-- depPatch.yaml
-`)
-	th.WriteF("overlay/depPatch.yaml", `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: old-name
-spec:
-  replicas: 999
-`)
-
-	options := th.MakeDefaultOptions()
-	options.AllowResourceIdChanges = true
-
-	// kind should become `StatefulSet`
-	// name should become `new-name`
-	m := th.Run("overlay", options)
-	th.AssertActualEqualsExpected(m, `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: old-name
-spec:
-  replicas: 999
-  template:
-    spec:
-      containers:
-      - image: nginx
-        name: nginx
-`)
-}
-
-func TestPatchNewNameAndKind(t *testing.T) {
-	th := kusttest_test.MakeHarness(t)
-
-	th.WriteF("base/deployment.yaml", `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: old-name
-spec:
-  template:
-    spec:
-      containers:
-        - name: nginx
-          image: nginx
-`)
-	th.WriteF("base/patch.yaml", `
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
-  name: new-name
-`)
-	th.WriteK("base", `
-resources:
-- deployment.yaml
-
-patches:
-- path: patch.yaml
-  target:
-    kind: Deployment
-`)
-
-	th.WriteK("overlay", `
-resources:
-- ../base
-patchesStrategicMerge:
-- depPatch.yaml
-`)
-	th.WriteF("overlay/depPatch.yaml", `
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
-  name: new-name
-spec:
-  replicas: 999
-`)
-
-	options := th.MakeDefaultOptions()
-	options.AllowResourceIdChanges = true
-
-	// depPatch cannot find target with kind `StatefulSet` and name `new-name`
-	// because base/patch.yaml can't yet edit the kind or name
-	assert.Error(t, th.RunWithErr("overlay", options))
-}
-
-// Use original name, but new kind
-// Should fail, even after #3280 is done, because this ID is invalid
-func TestPatchOriginalNameAndNewKind(t *testing.T) {
-	th := kusttest_test.MakeHarness(t)
-
-	th.WriteF("base/deployment.yaml", `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: old-name
-spec:
-  template:
-    spec:
-      containers:
-        - name: nginx
-          image: nginx
-`)
-	th.WriteF("base/patch.yaml", `
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
-  name: new-name
-`)
-	th.WriteK("base", `
-resources:
-- deployment.yaml
-
-patches:
-- path: patch.yaml
-  target:
-    kind: Deployment
-`)
-
-	th.WriteK("overlay", `
-resources:
-- ../base
-patchesStrategicMerge:
-- depPatch.yaml
-`)
-	th.WriteF("overlay/depPatch.yaml", `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: new-name
-spec:
-  replicas: 999
-`)
-
-	options := th.MakeDefaultOptions()
-	options.AllowResourceIdChanges = true
-
-	// depPatch cannot find target with kind `Deployment` and name `new-name`
-	// because the resource never had this GVKN
-	assert.Error(t, th.RunWithErr("overlay", options))
-}
-
-// Here is a structure of a kustomization of two components, component1
-// and component2, that both use a shared deployment definition, which
-// component2 adjusts by changing the kind via a patch. This test case
-// checks that it does not have a conflicting definition.
-// Currently documents broken behavior.
-//
-//                   root
-//              /            \
-//  component1/overlay  component2/overlay
-//             |              |
-//    component1/base    component2/base
-//              \            /
-//                   base
-//
-// This is the directory layout:
-//
-// ├── component1
-// │   ├── base
-// │   │   └── kustomization.yaml
-// │   └── overlay
-// │       └── kustomization.yaml
-// ├── component2
-// │   ├── base
-// │   │   └── kustomization.yaml
-// │   └── overlay
-// │       └── kustomization.yaml
-// ├── shared
-// │   ├── kustomization.yaml
-// │   └── deployment.yaml
-// ├── kustomization.yaml
-
-func TestBaseReuseNameAndKindConflict(t *testing.T) {
-	th := kusttest_test.MakeHarness(t)
-
-	th.WriteK("/app/shared", `
-resources:
-  - deployment.yaml
-`)
-	th.WriteF("/app/shared/deployment.yaml", `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: my-deploy
-spec:
-  template:
-    spec:
-      containers:
-        - name: nginx
-          image: nginx
-`)
-
-	th.WriteK("/app/component1/base", `
-resources:
-  - ../../shared
-`)
-	th.WriteK("/app/component1/overlay", `
-resources:
-  - ../base
-
-namePrefix: overlay-
-`)
-
-	th.WriteK("/app/component2/base", `
-resources:
-  - ../../shared
-
-patches:
-- path: patch.yaml
-  target:
-    kind: Deployment
-    name: my-deploy
-`)
-	th.WriteF("/app/component2/base/patch.yaml", `
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
-  name: my-stateful-set
-`)
-	th.WriteK("/app/component2/overlay", `
-resources:
-  - ../base
-
-namePrefix: overlay-
-`)
-
-	th.WriteK("/app", `
-resources:
-  - component1/overlay
-  - component2/overlay
-`)
-
-	options := th.MakeDefaultOptions()
-	options.AllowResourceIdChanges = true
-
-	// Error occurs when app/component2/base tries to load the shared resources
-	// because the kind is not (yet) allowed to change yet
-	// so it loads a second Deployment with the name my-deploy
-	// instead of a StatefulSet as specified by the patch.
-	// Will be fixed by #3280.
-	assert.Error(t, th.RunWithErr("overlay", options))
-}

api/krusty/inlinetransformer_test.go

@@ -1,79 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package krusty_test
-
-import (
-	"testing"
-
-	kusttest_test "sigs.k8s.io/kustomize/api/testutils/kusttest"
-)
-
-func TestInlineTransformer(t *testing.T) {
-	th := kusttest_test.MakeEnhancedHarness(t)
-	defer th.Reset()
-
-	th.WriteF("/app/resource.yaml", `
-apiVersion: apps/v1
-kind: ConfigMap
-metadata:
-  name: whatever
-data: {}
-`)
-	th.WriteK("/app", `
-resources:
-- resource.yaml
-transformers:
-- |-
-  apiVersion: builtin
-  kind: NamespaceTransformer
-  metadata:
-    name: not-important-to-example
-    namespace: test
-  fieldSpecs:
-  - path: metadata/namespace
-    create: true
-`)
-
-	expected := `
-apiVersion: apps/v1
-data: {}
-kind: ConfigMap
-metadata:
-  name: whatever
-  namespace: test
-`
-
-	m := th.Run("/app", th.MakeDefaultOptions())
-	th.AssertActualEqualsExpected(m, expected)
-}
-
-func TestInlineGenerator(t *testing.T) {
-	th := kusttest_test.MakeEnhancedHarness(t)
-	defer th.Reset()
-
-	th.WriteK("/app", `
-generators:
-- |-
-  apiVersion: builtin
-  kind: ConfigMapGenerator
-  metadata:
-    name: mymap
-  literals:
-  - FRUIT=apple
-  - VEGETABLE=carrot
-`)
-
-	expected := `
-apiVersion: v1
-data:
-  FRUIT: apple
-  VEGETABLE: carrot
-kind: ConfigMap
-metadata:
-  name: mymap-kfd8tf729k
-`
-
-	m := th.Run("/app", th.MakeDefaultOptions())
-	th.AssertActualEqualsExpected(m, expected)
-}

api/krusty/internal/provider/depprovider.go

@@ -5,13 +5,13 @@ package provider
 
 import (
 	"sigs.k8s.io/kustomize/api/ifc"
-	"sigs.k8s.io/kustomize/api/internal/conflict"
-	k8sconflict "sigs.k8s.io/kustomize/api/internal/k8sdeps/conflict"
+	"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/konfig"
+	"sigs.k8s.io/kustomize/api/resmap"
 	"sigs.k8s.io/kustomize/api/resource"
 )
 
@@ -95,27 +95,17 @@ import (
 //            would really reduce the work
 //            (e.g. drop Vars, drop ReplacementTranformer).
 //
-//   - resource.ConflictDetector
+//   - resmap.Merginator
 //
-//       1) api/internal/k8sdeps/conflict.conflictDetectorJson
-//          api/internal/k8sdeps/conflict.conflictDetectorSm
+//       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/conflict.smPatchMergeOnlyDetector
+//       2) api/internal/merge.Merginator
 //
-//           At time of writing, this doesn't report conflicts,
-//           but it does know how to merge patches. Conflict
-//           reporting isn't vital to kustomize function.  It's
-//           rare that a person would configure one transformer
-//           with many patches, much less so many that it became
-//           hard to spot conflicts.  In the case of an undetected
-//           conflict, the last patch applied wins, likely what
-//           the user wants anyway.  Regardless, the effect of this
-//           is plainly visible and usable in the output, even if
-//           a conflict happened but wasn't reported as an error.
+//            At time of writing, this is unimplemented.
 //
 //   - ifc.Validator
 //
@@ -126,7 +116,6 @@ import (
 //
 //       2) api/internal/validate.FieldValidator
 //
-//            See TODO inside the validator for status.
 //            At time of writing, this is a do-nothing
 //            validator as it's not critical to kustomize function.
 //
@@ -149,20 +138,18 @@ import (
 // If you're reading this, plan not done.
 //
 type DepProvider struct {
-	kFactory                 ifc.KunstructuredFactory
-	resourceFactory          *resource.Factory
-	conflictDectectorFactory resource.ConflictDetectorFactory
-	fieldValidator           ifc.Validator
+	resourceFactory *resource.Factory
+	merginator      resmap.Merginator
+	fieldValidator  ifc.Validator
 }
 
 func makeK8sdepBasedInstances() *DepProvider {
 	kf := kunstruct.NewKunstructuredFactoryImpl()
 	rf := resource.NewFactory(kf)
 	return &DepProvider{
-		kFactory:                 kf,
-		resourceFactory:          rf,
-		conflictDectectorFactory: k8sconflict.NewFactory(rf),
-		fieldValidator:           validator.NewKustValidator(),
+		resourceFactory: rf,
+		merginator:      merge.NewMerginator(rf),
+		fieldValidator:  validator.NewKustValidator(),
 	}
 }
 
@@ -170,10 +157,9 @@ func makeKyamlBasedInstances() *DepProvider {
 	kf := &wrappy.WNodeFactory{}
 	rf := resource.NewFactory(kf)
 	return &DepProvider{
-		kFactory:                 kf,
-		resourceFactory:          rf,
-		conflictDectectorFactory: conflict.NewFactory(),
-		fieldValidator:           validate.NewFieldValidator(),
+		resourceFactory: rf,
+		merginator:      kmerge.NewMerginator(rf),
+		fieldValidator:  validate.NewFieldValidator(),
 	}
 }
 
@@ -184,20 +170,12 @@ func NewDepProvider(useKyaml bool) *DepProvider {
 	return makeK8sdepBasedInstances()
 }
 
-func NewDefaultDepProvider() *DepProvider {
-	return NewDepProvider(konfig.FlagEnableKyamlDefaultValue)
-}
-
-func (dp *DepProvider) GetKunstructuredFactory() ifc.KunstructuredFactory {
-	return dp.kFactory
-}
-
 func (dp *DepProvider) GetResourceFactory() *resource.Factory {
 	return dp.resourceFactory
 }
 
-func (dp *DepProvider) GetConflictDetectorFactory() resource.ConflictDetectorFactory {
-	return dp.conflictDectectorFactory
+func (dp *DepProvider) GetMerginator() resmap.Merginator {
+	return dp.merginator
 }
 
 func (dp *DepProvider) GetFieldValidator() ifc.Validator {

api/krusty/kustomizer.go

@@ -11,9 +11,9 @@ import (
 	pLdr "sigs.k8s.io/kustomize/api/internal/plugins/loader"
 	"sigs.k8s.io/kustomize/api/internal/target"
 	"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/provider"
 	"sigs.k8s.io/kustomize/api/resmap"
 	"sigs.k8s.io/kustomize/api/types"
 )
@@ -53,7 +53,7 @@ func MakeKustomizer(fSys filesys.FileSystem, o *Options) *Kustomizer {
 func (b *Kustomizer) Run(path string) (resmap.ResMap, error) {
 	resmapFactory := resmap.NewFactory(
 		b.depProvider.GetResourceFactory(),
-		b.depProvider.GetConflictDetectorFactory())
+		b.depProvider.GetMerginator())
 	lr := fLdr.RestrictionNone
 	if b.options.LoadRestrictions == types.LoadRestrictionsRootOnly {
 		lr = fLdr.RestrictionRootOnly
@@ -85,7 +85,7 @@ func (b *Kustomizer) Run(path string) (resmap.ResMap, error) {
 		t := builtins.LabelTransformerPlugin{
 			Labels: map[string]string{
 				konfig.ManagedbyLabelKey: fmt.Sprintf(
-					"kustomize-%s", provenance.GetProvenance().Semver())},
+					"kustomize-%s", provenance.GetProvenance().Version)},
 			FieldSpecs: []types.FieldSpec{{
 				Path:               "metadata/labels",
 				CreateIfNotPresent: true,

api/krusty/multiplepatch_test.go

@@ -4,333 +4,12 @@
 package krusty_test
 
 import (
-	"fmt"
 	"strings"
 	"testing"
 
 	kusttest_test "sigs.k8s.io/kustomize/api/testutils/kusttest"
 )
 
-func TestRemoveEmptyDirWithNullFieldInSmp(t *testing.T) {
-	th := kusttest_test.MakeHarness(t)
-	th.WriteK(".", `
-resources:
-- deployment.yaml
-patchesStrategicMerge:
-- patch.yaml
-`)
-	th.WriteF("deployment.yaml", `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: nginx
-spec:
-  template:
-    spec:
-      volumes:
-      - name: fancyDisk
-        emptyDir: {}
-`)
-	th.WriteF("patch.yaml", `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: nginx
-spec:
-  template:
-    spec:
-      volumes:
-      - name: fancyDisk
-        emptyDir: null
-`)
-	m := th.Run(".", th.MakeDefaultOptions())
-	th.AssertActualEqualsExpected(m, `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: nginx
-spec:
-  template:
-    spec:
-      volumes:
-      - name: fancyDisk
-`)
-}
-
-func TestRemoveEmptyDirAddPersistentDisk(t *testing.T) {
-	th := kusttest_test.MakeHarness(t)
-	th.WriteK(".", `
-resources:
-- deployment.yaml
-patchesStrategicMerge:
-- patch.yaml
-`)
-	th.WriteF("deployment.yaml", `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: nginx
-spec:
-  template:
-    spec:
-      volumes:
-      - name: fancyDisk
-        emptyDir: {}
-`)
-	th.WriteF("patch.yaml", `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: nginx
-spec:
-  template:
-    spec:
-      volumes:
-      - name: fancyDisk
-        emptyDir: null
-        gcePersistentDisk:
-          pdName: fancyDisk
-`)
-	m := th.Run(".", th.MakeDefaultOptions())
-	th.AssertActualEqualsExpected(m, `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: nginx
-spec:
-  template:
-    spec:
-      volumes:
-      - gcePersistentDisk:
-          pdName: fancyDisk
-        name: fancyDisk
-`)
-}
-
-func TestVolumeRemoveEmptyDirInOverlay(t *testing.T) {
-	th := kusttest_test.MakeHarness(t)
-	th.WriteK("base", `
-resources:
-- deployment.yaml
-configMapGenerator:
-- name: baseCm
-  literals:
-  - foo=bar
-`)
-	th.WriteF("base/deployment.yaml", `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: nginx
-spec:
-  template:
-    spec:
-      containers:
-      - name: nginx
-        image: nginx
-        volumeMounts:
-        - name: fancyDisk
-          mountPath: /tmp/ps
-      volumes:
-      - name: fancyDisk
-        emptyDir: {}
-      - configMap:
-          name: baseCm
-        name: baseCm
-`)
-	m := th.Run("base", th.MakeDefaultOptions())
-	th.AssertActualEqualsExpected(m, `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: nginx
-spec:
-  template:
-    spec:
-      containers:
-      - image: nginx
-        name: nginx
-        volumeMounts:
-        - mountPath: /tmp/ps
-          name: fancyDisk
-      volumes:
-      - emptyDir: {}
-        name: fancyDisk
-      - configMap:
-          name: baseCm-798k5k7g9f
-        name: baseCm
----
-apiVersion: v1
-data:
-  foo: bar
-kind: ConfigMap
-metadata:
-  name: baseCm-798k5k7g9f
-`)
-
-	th.WriteK("overlay", `
-patchesStrategicMerge:
-- patch.yaml
-resources:
-- ../base
-configMapGenerator:
-- name: overlayCm
-  literals:
-  - hello=world
-`)
-	th.WriteF("overlay/patch.yaml", `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: nginx
-spec:
-  template:
-    spec:
-      volumes:
-      - name: fancyDisk
-        emptyDir: null
-        gcePersistentDisk:
-          pdName: fancyDisk
-      - configMap:
-          name: overlayCm
-        name: overlayCm
-`)
-	m = th.Run("overlay", th.MakeDefaultOptions())
-	th.AssertActualEqualsExpected(m, `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: nginx
-spec:
-  template:
-    spec:
-      containers:
-      - image: nginx
-        name: nginx
-        volumeMounts:
-        - mountPath: /tmp/ps
-          name: fancyDisk
-      volumes:
-      - gcePersistentDisk:
-          pdName: fancyDisk
-        name: fancyDisk
-      - configMap:
-          name: overlayCm-dc6fm46dhm
-        name: overlayCm
-      - configMap:
-          name: baseCm-798k5k7g9f
-        name: baseCm
----
-apiVersion: v1
-data:
-  foo: bar
-kind: ConfigMap
-metadata:
-  name: baseCm-798k5k7g9f
----
-apiVersion: v1
-data:
-  hello: world
-kind: ConfigMap
-metadata:
-  name: overlayCm-dc6fm46dhm
-`)
-}
-
-func TestRemoveEmptyDirWithPatchesAtSameLevel(t *testing.T) {
-	th := kusttest_test.MakeHarness(t)
-	th.WriteK("base", `
-resources:
-- deployment.yaml
-`)
-	th.WriteF("base/deployment.yaml", `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: nginx
-spec:
-  template:
-    spec:
-      containers:
-      - name: nginx
-        image: nginx
-      - name: sidecar
-        image: sidecar:latest
-      volumes:
-      - name: nginx-persistent-storage
-        emptyDir: {}
-`)
-	th.WriteK("overlay", `
-patchesStrategicMerge:
-- deployment-patch1.yaml
-- deployment-patch2.yaml
-resources:
-- ../base
-`)
-	th.WriteF("overlay/deployment-patch1.yaml", `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: nginx
-spec:
-  template:
-    spec:
-      volumes:
-      - name: nginx-persistent-storage
-        emptyDir: null
-        gcePersistentDisk:
-          pdName: nginx-persistent-storage
-`)
-	th.WriteF("overlay/deployment-patch2.yaml", `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: nginx
-spec:
-  template:
-    spec:
-      containers:
-      - image: nginx
-        name: nginx
-        env:
-        - name: ANOTHERENV
-          value: FOO
-      volumes:
-      - name: nginx-persistent-storage
-`)
-	opts := th.MakeDefaultOptions()
-	m := th.Run("overlay", opts)
-	expFmt := `apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: nginx
-spec:
-  template:
-    spec:
-      containers:
-      - env:
-        - name: ANOTHERENV
-          value: FOO
-        image: nginx
-        name: nginx
-      - image: sidecar:latest
-        name: sidecar
-      volumes:%s
-        name: nginx-persistent-storage
-`
-	// TODO(#3394)
-	th.AssertActualEqualsExpected(
-		m, opts.IfApiMachineryElseKyaml(
-			fmt.Sprintf(expFmt, `
-      - gcePersistentDisk:
-          pdName: nginx-persistent-storage`),
-			fmt.Sprintf(expFmt, `
-      - emptyDir: {}
-        gcePersistentDisk:
-          pdName: nginx-persistent-storage`),
-		))
-}
-
 func TestSimpleMultiplePatches(t *testing.T) {
 	th := kusttest_test.MakeHarness(t)
 	th.WriteK("base", `
@@ -362,6 +41,8 @@ spec:
       - name: sidecar
         image: sidecar:latest
       volumes:
+      - name: nginx-persistent-storage
+        emptyDir: {}
       - configMap:
           name: configmap-in-base
         name: configmap-in-base
@@ -405,6 +86,7 @@ spec:
           value: ENVVALUE
       volumes:
       - name: nginx-persistent-storage
+        emptyDir: null
         gcePersistentDisk:
           pdName: nginx-persistent-storage
       - configMap:
@@ -424,6 +106,8 @@ spec:
         env:
         - name: ANOTHERENV
           value: FOO
+      volumes:
+      - name: nginx-persistent-storage
 `)
 	m := th.Run("overlay", th.MakeDefaultOptions())
 	th.AssertActualEqualsExpected(m, `
@@ -504,7 +188,7 @@ metadata:
 `)
 }
 
-func makeCommonFilesForMultiplePatchTests(th kusttest_test.Harness) {
+func makeCommonFileForMultiplePatchTest(th kusttest_test.Harness) {
 	th.WriteK("/app/base", `
 namePrefix: team-foo-
 commonLabels:
@@ -543,6 +227,8 @@ spec:
       - name: sidecar
         image: sidecar:latest
       volumes:
+      - name: nginx-persistent-storage
+        emptyDir: {}
       - configMap:
           name: configmap-in-base
         name: configmap-in-base
@@ -578,7 +264,7 @@ configMapGenerator:
 
 func TestMultiplePatchesNoConflict(t *testing.T) {
 	th := kusttest_test.MakeHarness(t)
-	makeCommonFilesForMultiplePatchTests(th)
+	makeCommonFileForMultiplePatchTest(th)
 	th.WriteF("/app/overlay/staging/deployment-patch1.yaml", `
 apiVersion: apps/v1
 kind: Deployment
@@ -595,6 +281,7 @@ spec:
           value: ENVVALUE
       volumes:
       - name: nginx-persistent-storage
+        emptyDir: null
         gcePersistentDisk:
           pdName: nginx-persistent-storage
       - configMap:
@@ -614,6 +301,8 @@ spec:
         env:
         - name: ANOTHERENV
           value: FOO
+      volumes:
+      - name: nginx-persistent-storage
 `)
 	m := th.Run("/app/overlay/staging", th.MakeDefaultOptions())
 	th.AssertActualEqualsExpected(m, `
@@ -716,7 +405,7 @@ metadata:
 
 func TestMultiplePatchesWithConflict(t *testing.T) {
 	th := kusttest_test.MakeHarness(t)
-	makeCommonFilesForMultiplePatchTests(th)
+	makeCommonFileForMultiplePatchTest(th)
 	th.WriteF("/app/overlay/staging/deployment-patch1.yaml", `
 apiVersion: apps/v1
 kind: Deployment
@@ -732,6 +421,7 @@ spec:
           value: TRUE
       volumes:
       - name: nginx-persistent-storage
+        emptyDir: null
         gcePersistentDisk:
           pdName: nginx-persistent-storage
       - configMap:
@@ -752,114 +442,13 @@ spec:
         - name: ENABLE_FEATURE_FOO
           value: FALSE
 `)
-	opts := th.MakeDefaultOptions()
-	if opts.UseKyaml {
-		// kyaml doesn't try to detect conflicts in patches
-		// (so ENABLE_FEATURE_FOO FALSE wins).
-		m := th.Run("/app/overlay/staging", opts)
-		th.AssertActualEqualsExpected(m, `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  annotations:
-    note: This is a test annotation
-  labels:
-    app: mynginx
-    env: staging
-    org: example.com
-    team: foo
-  name: staging-team-foo-nginx
-spec:
-  selector:
-    matchLabels:
-      app: mynginx
-      env: staging
-      org: example.com
-      team: foo
-  template:
-    metadata:
-      annotations:
-        note: This is a test annotation
-      labels:
-        app: mynginx
-        env: staging
-        org: example.com
-        team: foo
-    spec:
-      containers:
-      - env:
-        - name: ENABLE_FEATURE_FOO
-          value: false
-        image: nginx
-        name: nginx
-        volumeMounts:
-        - mountPath: /tmp/ps
-          name: nginx-persistent-storage
-      - image: sidecar:latest
-        name: sidecar
-      volumes:
-      - gcePersistentDisk:
-          pdName: nginx-persistent-storage
-        name: nginx-persistent-storage
-      - configMap:
-          name: staging-configmap-in-overlay-dc6fm46dhm
-        name: configmap-in-overlay
-      - configMap:
-          name: staging-team-foo-configmap-in-base-798k5k7g9f
-        name: configmap-in-base
----
-apiVersion: v1
-kind: Service
-metadata:
-  annotations:
-    note: This is a test annotation
-  labels:
-    app: mynginx
-    env: staging
-    org: example.com
-    team: foo
-  name: staging-team-foo-nginx
-spec:
-  ports:
-  - port: 80
-  selector:
-    app: mynginx
-    env: staging
-    org: example.com
-    team: foo
----
-apiVersion: v1
-data:
-  foo: bar
-kind: ConfigMap
-metadata:
-  annotations:
-    note: This is a test annotation
-  labels:
-    app: mynginx
-    env: staging
-    org: example.com
-    team: foo
-  name: staging-team-foo-configmap-in-base-798k5k7g9f
----
-apiVersion: v1
-data:
-  hello: world
-kind: ConfigMap
-metadata:
-  labels:
-    env: staging
-  name: staging-configmap-in-overlay-dc6fm46dhm
-`)
-	} else {
-		err := th.RunWithErr("/app/overlay/staging", opts)
-		if err == nil {
-			t.Fatalf("expected conflict")
-		}
-		if !strings.Contains(
-			err.Error(), "conflict between ") {
-			t.Fatalf("Unexpected err: %v", err)
-		}
+	err := th.RunWithErr("/app/overlay/staging", th.MakeDefaultOptions())
+	if err == nil {
+		t.Fatalf("expected conflict")
+	}
+	if !strings.Contains(
+		err.Error(), "conflict between ") {
+		t.Fatalf("Unexpected err: %v", err)
 	}
 }
 
@@ -908,7 +497,8 @@ spec:
 	for _, c := range cases {
 		t.Run(c.name, func(t *testing.T) {
 			th := kusttest_test.MakeHarness(t)
-			makeCommonFilesForMultiplePatchTests(th)
+
+			makeCommonFileForMultiplePatchTest(th)
 			th.WriteF("/app/overlay/staging/deployment-patch1.yaml", c.patch1)
 			th.WriteF("/app/overlay/staging/deployment-patch2.yaml", c.patch2)
 			m := th.Run("/app/overlay/staging", th.MakeDefaultOptions())
@@ -950,6 +540,8 @@ spec:
         - mountPath: /tmp/ps
           name: nginx-persistent-storage
       volumes:
+      - emptyDir: {}
+        name: nginx-persistent-storage
       - configMap:
           name: staging-team-foo-configmap-in-base-798k5k7g9f
         name: configmap-in-base
@@ -1003,7 +595,7 @@ metadata:
 
 func TestMultiplePatchesBothWithPatchDeleteDirective(t *testing.T) {
 	th := kusttest_test.MakeHarness(t)
-	makeCommonFilesForMultiplePatchTests(th)
+	makeCommonFileForMultiplePatchTest(th)
 	th.WriteF("/app/overlay/staging/deployment-patch1.yaml", `
 apiVersion: apps/v1
 kind: Deployment
@@ -1028,98 +620,12 @@ spec:
       - $patch: delete
         name: nginx
 `)
-	opt := th.MakeDefaultOptions()
-	if opt.UseKyaml {
-		// kyaml doesn't fail on conflicts in patches; both containers
-		// (nginx and sidecar) are deleted per this patching instruction.
-		m := th.Run("/app/overlay/staging", opt)
-		th.AssertActualEqualsExpected(m, `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  annotations:
-    note: This is a test annotation
-  labels:
-    app: mynginx
-    env: staging
-    org: example.com
-    team: foo
-  name: staging-team-foo-nginx
-spec:
-  selector:
-    matchLabels:
-      app: mynginx
-      env: staging
-      org: example.com
-      team: foo
-  template:
-    metadata:
-      annotations:
-        note: This is a test annotation
-      labels:
-        app: mynginx
-        env: staging
-        org: example.com
-        team: foo
-    spec:
-      containers: []
-      volumes:
-      - configMap:
-          name: staging-team-foo-configmap-in-base-798k5k7g9f
-        name: configmap-in-base
----
-apiVersion: v1
-kind: Service
-metadata:
-  annotations:
-    note: This is a test annotation
-  labels:
-    app: mynginx
-    env: staging
-    org: example.com
-    team: foo
-  name: staging-team-foo-nginx
-spec:
-  ports:
-  - port: 80
-  selector:
-    app: mynginx
-    env: staging
-    org: example.com
-    team: foo
----
-apiVersion: v1
-data:
-  foo: bar
-kind: ConfigMap
-metadata:
-  annotations:
-    note: This is a test annotation
-  labels:
-    app: mynginx
-    env: staging
-    org: example.com
-    team: foo
-  name: staging-team-foo-configmap-in-base-798k5k7g9f
----
-apiVersion: v1
-data:
-  hello: world
-kind: ConfigMap
-metadata:
-  labels:
-    env: staging
-  name: staging-configmap-in-overlay-dc6fm46dhm
-`)
-	} else {
-		// No kyaml means error on a patch conflict.
-		err := th.RunWithErr("/app/overlay/staging", opt)
-		if err == nil {
-			t.Fatalf("Expected error")
-		}
-		if !strings.Contains(
-			err.Error(), "both containing ") {
-			t.Fatalf("Unexpected err: %v", err)
-		}
+	err := th.RunWithErr("/app/overlay/staging", th.MakeDefaultOptions())
+	if err == nil {
+		t.Fatalf("Expected error")
+	}
+	if !strings.Contains(
+		err.Error(), "both containing ") {
+		t.Fatalf("Unexpected err: %v", err)
 	}
 }

api/krusty/nameprefixsuffixpatch_test.go

@@ -38,7 +38,7 @@ configMapGenerator:
   literals:
   - MYSQL_USER=default
   - MYSQL_DATABASE=default
-  - HOST=everest
+  - PORT=3306
 `)
 
 	th.WriteK(".", `
@@ -82,13 +82,15 @@ patches:
 	th.AssertActualEqualsExpected(m, `
 apiVersion: v1
 data:
-  HOST: everest
   MYSQL_DATABASE: db
   MYSQL_PASSWORD: correct horse battery staple
   MYSQL_USER: my-user
+  PORT: "3306"
 kind: ConfigMap
 metadata:
-  name: mysql-t7tt4cdbmf
+  annotations: {}
+  labels: {}
+  name: mysql-9792mdchtg
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -102,10 +104,10 @@ spec:
         - valueFrom:
             configMapKeyRef:
               key: MYSQL_DATABASE
-              name: mysql-t7tt4cdbmf
+              name: mysql-9792mdchtg
         envFrom:
         - configMapRef:
-            name: mysql-t7tt4cdbmf
+            name: mysql-9792mdchtg
         name: handler
 `)
 }

api/krusty/namespacedgenerators_test.go

@@ -80,7 +80,7 @@ namespace: base
 configMapGenerator:
 - name: testCase
   literals:
-    - base=apple
+    - base=true
 `)
 	th.WriteK("/app/overlay", `
 resources:
@@ -92,17 +92,19 @@ configMapGenerator:
   - name: testCase
     behavior: merge
     literals:
-      - overlay=peach
+      - overlay=true
 `)
 	m := th.Run("/app/overlay", th.MakeDefaultOptions())
 	th.AssertActualEqualsExpected(m, `
 apiVersion: v1
 data:
-  base: apple
-  overlay: peach
+  base: "true"
+  overlay: "true"
 kind: ConfigMap
 metadata:
-  name: testCase-gmfch8gkbt
+  annotations: {}
+  labels: {}
+  name: testCase-bcbmmg48hd
   namespace: overlay
 `)
 }

api/krusty/namespaces_test.go

@@ -307,7 +307,7 @@ metadata:
 `)
 }
 
-// This series of constants is used to prove the need of
+// This serie of constants is used to prove the need of
 // the namespace field in the objref field of the var declaration.
 // The following tests demonstrate that it creates umbiguous variable
 // declaration if two entities of the kind with the same name
@@ -472,12 +472,10 @@ spec:
 // not specified
 func TestVariablesAmbiguous(t *testing.T) {
 	th := kusttest_test.MakeHarness(t)
-	th.WriteK(".", namespaceNeedInVarMyApp)
-	th.WriteF("elasticsearch-dev-service.yaml",
-		namespaceNeedInVarDevResources)
-	th.WriteF("elasticsearch-test-service.yaml",
-		namespaceNeedInVarTestResources)
-	err := th.RunWithErr(".", th.MakeDefaultOptions())
+	th.WriteK("/namespaceNeedInVar/myapp", namespaceNeedInVarMyApp)
+	th.WriteF("/namespaceNeedInVar/myapp/elasticsearch-dev-service.yaml", namespaceNeedInVarDevResources)
+	th.WriteF("/namespaceNeedInVar/myapp/elasticsearch-test-service.yaml", namespaceNeedInVarTestResources)
+	err := th.RunWithErr("/namespaceNeedInVar/myapp", th.MakeDefaultOptions())
 	if err == nil {
 		t.Fatalf("expected error")
 	}
@@ -531,20 +529,16 @@ vars:
 // and resources into multiple kustomization context/folders instead of one.
 func TestVariablesAmbiguousWorkaround(t *testing.T) {
 	th := kusttest_test.MakeHarness(t)
-	opts := th.MakeDefaultOptions()
-	if opts.UseKyaml {
-		t.Skip("TODO(#3396)")
-	}
-	th.WriteK("dev", namespaceNeedInVarDevFolder)
-	th.WriteF("dev/elasticsearch-dev-service.yaml", namespaceNeedInVarDevResources)
-	th.WriteK("test", namespaceNeedInVarTestFolder)
-	th.WriteF("test/elasticsearch-test-service.yaml", namespaceNeedInVarTestResources)
-	th.WriteK("workaround", `
+	th.WriteK("/namespaceNeedInVar/dev", namespaceNeedInVarDevFolder)
+	th.WriteF("/namespaceNeedInVar/dev/elasticsearch-dev-service.yaml", namespaceNeedInVarDevResources)
+	th.WriteK("/namespaceNeedInVar/test", namespaceNeedInVarTestFolder)
+	th.WriteF("/namespaceNeedInVar/test/elasticsearch-test-service.yaml", namespaceNeedInVarTestResources)
+	th.WriteK("/namespaceNeedInVar/workaround", `
 resources:
 - ../dev
 - ../test
 `)
-	m := th.Run("workaround", opts)
+	m := th.Run("/namespaceNeedInVar/workaround", th.MakeDefaultOptions())
 	th.AssertActualEqualsExpected(m, namespaceNeedInVarExpectedOutput)
 }
 
@@ -591,13 +585,9 @@ vars:
 // to the variable declarations allows to disambiguate the variables.
 func TestVariablesDisambiguatedWithNamespace(t *testing.T) {
 	th := kusttest_test.MakeHarness(t)
-	opts := th.MakeDefaultOptions()
-	if opts.UseKyaml {
-		t.Skip("TODO(#3396)")
-	}
-	th.WriteK(".", namespaceNeedInVarMyAppWithNamespace)
-	th.WriteF("elasticsearch-dev-service.yaml", namespaceNeedInVarDevResources)
-	th.WriteF("elasticsearch-test-service.yaml", namespaceNeedInVarTestResources)
-	m := th.Run(".", th.MakeDefaultOptions())
+	th.WriteK("/namespaceNeedInVar/myapp", namespaceNeedInVarMyAppWithNamespace)
+	th.WriteF("/namespaceNeedInVar/myapp/elasticsearch-dev-service.yaml", namespaceNeedInVarDevResources)
+	th.WriteF("/namespaceNeedInVar/myapp/elasticsearch-test-service.yaml", namespaceNeedInVarTestResources)
+	m := th.Run("/namespaceNeedInVar/myapp", th.MakeDefaultOptions())
 	th.AssertActualEqualsExpected(m, namespaceNeedInVarExpectedOutput)
 }

api/krusty/nameupdateinroleref_test.go

@@ -34,7 +34,7 @@ subjects:
 - kind: ServiceAccount
   name: default
   namespace: foo
----
+--- 
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:

api/krusty/options.go

@@ -36,28 +36,16 @@ type Options struct {
 	// When true, use kyaml/ packages to manipulate KRM yaml.
 	// When false, use k8sdeps/ instead (uses k8s.io/api* packages).
 	UseKyaml bool
-
-	// When true, allow name and kind changing via a patch
-	// When false, patch name/kind don't overwrite target name/kind
-	AllowResourceIdChanges bool
 }
 
 // MakeDefaultOptions returns a default instance of Options.
 func MakeDefaultOptions() *Options {
 	return &Options{
-		DoLegacyResourceSort:   false,
-		AddManagedbyLabel:      false,
-		LoadRestrictions:       types.LoadRestrictionsRootOnly,
-		DoPrune:                false,
-		PluginConfig:           konfig.DisabledPluginConfig(),
-		UseKyaml:               konfig.FlagEnableKyamlDefaultValue,
-		AllowResourceIdChanges: false,
+		DoLegacyResourceSort: false,
+		AddManagedbyLabel:    false,
+		LoadRestrictions:     types.LoadRestrictionsRootOnly,
+		DoPrune:              false,
+		PluginConfig:         konfig.DisabledPluginConfig(),
+		UseKyaml:             false,
 	}
 }
-
-func (o Options) IfApiMachineryElseKyaml(s1, s2 string) string {
-	if !o.UseKyaml {
-		return s1
-	}
-	return s2
-}

api/krusty/remoteload_test.go

@@ -1,40 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package krusty_test
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"sigs.k8s.io/kustomize/api/filesys"
-	"sigs.k8s.io/kustomize/api/internal/utils"
-	"sigs.k8s.io/kustomize/api/krusty"
-)
-
-func TestRemoteLoad(t *testing.T) {
-	fSys := filesys.MakeFsOnDisk()
-	b := krusty.MakeKustomizer(fSys, krusty.MakeDefaultOptions())
-	m, err := b.Run(
-		"github.com/kubernetes-sigs/kustomize/examples/multibases/dev/?ref=v1.0.6")
-	if utils.IsErrTimeout(err) {
-		// Don't fail on timeouts.
-		t.SkipNow()
-	}
-	if !assert.NoError(t, err) {
-		t.FailNow()
-	}
-	yml, err := m.AsYaml()
-	assert.NoError(t, err)
-	assert.Equal(t, `apiVersion: v1
-kind: Pod
-metadata:
-  labels:
-    app: myapp
-  name: dev-myapp-pod
-spec:
-  containers:
-  - image: nginx:1.7.9
-    name: nginx
-`, string(yml))
-}

api/krusty/simple_test.go

@@ -1,47 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package krusty_test
-
-import (
-	"testing"
-
-	kusttest_test "sigs.k8s.io/kustomize/api/testutils/kusttest"
-)
-
-func TestSimple1(t *testing.T) {
-	th := kusttest_test.MakeHarness(t)
-	th.WriteF("/dep.yaml", `
-apiVersion: v1
-kind: Deployment
-metadata:
-  name: clown
-spec:
-  numReplicas: 1
-`)
-	th.WriteF("/patch.yaml", `
-apiVersion: v1
-kind: Deployment
-metadata:
-  name: clown
-spec:
-  numReplicas: 999
-`)
-
-	th.WriteK("/", `
-resources:
-- dep.yaml
-patchesStrategicMerge:
-- patch.yaml
-`)
-	m := th.Run("/", th.MakeDefaultOptions())
-
-	th.AssertActualEqualsExpected(m, `
-apiVersion: v1
-kind: Deployment
-metadata:
-  name: clown
-spec:
-  numReplicas: 999
-`)
-}

api/krusty/transformerplugin_test.go

@@ -74,7 +74,7 @@ kind: ConfigMap
 metadata:
   name: configmap-a
   annotations:
-    fruit: peach
+    kustomize.k8s.io/Generated: "false"
 data:
   foo: $FOO
 `)
@@ -87,7 +87,7 @@ data:
 kind: ConfigMap
 metadata:
   annotations:
-    fruit: peach
+    kustomize.k8s.io/Generated: "false"
   name: configmap-a
 ---
 apiVersion: v1

api/krusty/variableref_test.go

@@ -362,10 +362,6 @@ resources:
 
 func TestVarRefBig(t *testing.T) {
 	th := kusttest_test.MakeHarness(t)
-	opts := th.MakeDefaultOptions()
-	if opts.UseKyaml {
-		t.Skip("TODO(#3396)")
-	}
 	th.WriteK("/app/base", `
 namePrefix: base-
 resources:
@@ -682,7 +678,7 @@ namePrefix: dev-
 resources:
 - ../../base
 `)
-	m := th.Run("/app/overlay/staging", opts)
+	m := th.Run("/app/overlay/staging", th.MakeDefaultOptions())
 	th.AssertActualEqualsExpected(m, `
 apiVersion: v1
 kind: ServiceAccount

api/loader/getter.go

@@ -7,13 +7,11 @@ import (
 	"context"
 	"log"
 	"os"
-	"time"
 
 	"github.com/yujunz/go-getter"
 	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/api/ifc"
 	"sigs.k8s.io/kustomize/api/internal/git"
-	"sigs.k8s.io/kustomize/api/internal/utils"
 )
 
 type remoteTargetSpec struct {
@@ -30,12 +28,7 @@ type remoteTargetSpec struct {
 // Getter is a function that can gets resource
 type remoteTargetGetter func(rs *remoteTargetSpec) error
 
-func newLoaderAtGetter(
-	raw string,
-	fSys filesys.FileSystem,
-	referrer *fileLoader,
-	cloner git.Cloner,
-	getter remoteTargetGetter) (ifc.Loader, error) {
+func newLoaderAtGetter(raw string, fSys filesys.FileSystem, referrer *fileLoader, cloner git.Cloner, getter remoteTargetGetter) (ifc.Loader, error) {
 	rs := &remoteTargetSpec{
 		Raw: raw,
 	}
@@ -87,13 +80,12 @@ func getRemoteTarget(rs *remoteTargetSpec) error {
 		Mode: getter.ClientModeAny,
 		Detectors: []getter.Detector{
 			new(getter.GitHubDetector),
-			new(getter.GitLabDetector),
 			new(getter.GitDetector),
 			new(getter.BitBucketDetector),
 		},
 		Options: opts,
 	}
-	return utils.TimedCall("go-getter client.Get", 21*time.Second, client.Get)
+	return client.Get()
 }
 
 func getNothing(rs *remoteTargetSpec) error {

api/loader/loader.go

@@ -21,22 +21,24 @@ import (
 func NewLoader(
 	lr LoadRestrictorFunc,
 	target string, fSys filesys.FileSystem) (ifc.Loader, error) {
-	ldr, errGet := newLoaderAtGetter(
-		target, fSys, nil, git.ClonerUsingGitExec, getRemoteTarget)
+
+	ldr, errGet := newLoaderAtGetter(target, fSys, nil, git.ClonerUsingGitExec, getRemoteTarget)
 	if errGet == nil {
 		return ldr, nil
 	}
+
 	repoSpec, errGit := git.NewRepoSpecFromUrl(target)
 	if errGit == nil {
 		// The target qualifies as a remote git target.
 		return newLoaderAtGitClone(
 			repoSpec, fSys, nil, git.ClonerUsingGitExec, getRemoteTarget)
 	}
+
 	root, errDir := demandDirectoryRoot(fSys, target)
 	if errDir == nil {
-		return newLoaderAtConfirmedDir(
-			lr, root, fSys, nil, git.ClonerUsingGitExec, getRemoteTarget), nil
+		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)

api/provenance/provenance.go

@@ -6,7 +6,6 @@ package provenance
 import (
 	"fmt"
 	"runtime"
-	"strings"
 )
 
 var (
@@ -58,11 +57,3 @@ func (v Provenance) Short() string {
 			BuildDate: v.BuildDate,
 		})
 }
-
-// Semver returns the semantic version of kustomize.
-// kustomize version is set in format "kustomize/vX.X.X" in every release.
-// X.X.X is a semver. If the version string is not in this format,
-// return the original version string
-func (v Provenance) Semver() string {
-	return strings.TrimPrefix(v.Version, "kustomize/")
-}

api/resid/gvk.go

@@ -80,14 +80,6 @@ func (x Gvk) String() string {
 	return strings.Join([]string{g, v, k}, fieldSep)
 }
 
-// ApiVersion returns the combination of Group and Version
-func (x Gvk) ApiVersion() string {
-	if x.Group == "" {
-		return x.Version
-	}
-	return x.Group + "/" + x.Version
-}
-
 // StringWoEmptyField returns a string representation of the GVK. Non-exist
 // fields will be omitted.
 func (x Gvk) StringWoEmptyField() string {

api/resid/gvk_test.go

@@ -1,5 +1,18 @@
-// Copyright 2018 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
+/*
+Copyright 2018 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
 
 package resid
 
@@ -99,31 +112,17 @@ var stringTests = []struct {
 
 func TestString(t *testing.T) {
 	for _, hey := range stringTests {
-		assert.Equal(t, hey.s, hey.x.String())
-	}
-}
-
-func TestApiVersion(t *testing.T) {
-	for _, hey := range []struct {
-		x   Gvk
-		exp string
-	}{
-		{Gvk{}, ""},
-		{Gvk{Kind: "k"}, ""},
-		{Gvk{Version: "v"}, "v"},
-		{Gvk{Version: "v", Kind: "k"}, "v"},
-		{Gvk{Group: "g"}, "g/"},
-		{Gvk{Group: "g", Kind: "k"}, "g/"},
-		{Gvk{Group: "g", Version: "v"}, "g/v"},
-		{Gvk{Group: "g", Version: "v", Kind: "k"}, "g/v"},
-	} {
-		assert.Equal(t, hey.exp, hey.x.ApiVersion())
+		if hey.x.String() != hey.s {
+			t.Fatalf("bad string for %v '%s'", hey.x, hey.s)
+		}
 	}
 }
 
 func TestStringWoEmptyField(t *testing.T) {
 	for _, hey := range stringTests {
-		assert.Equal(t, hey.r, hey.x.StringWoEmptyField())
+		if hey.x.StringWoEmptyField() != hey.r {
+			t.Fatalf("bad string %s for %v '%s'", hey.x.StringWoEmptyField(), hey.x, hey.r)
+		}
 	}
 }
 
@@ -142,8 +141,12 @@ func TestParseGroupVersion(t *testing.T) {
 	}
 	for _, tc := range tests {
 		g, v := ParseGroupVersion(tc.input)
-		assert.Equal(t, tc.g, g, tc.input)
-		assert.Equal(t, tc.v, v, 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)
+		}
 	}
 }
 
@@ -249,7 +252,9 @@ func TestSelectByGVK(t *testing.T) {
 
 	for _, tc := range testCases {
 		filtered := tc.in.IsSelected(tc.filter)
-		assert.Equal(t, tc.expected, filtered, tc.description)
+		if filtered != tc.expected {
+			t.Fatalf("unexpected filter result for test case: %v", tc.description)
+		}
 	}
 }
 

api/resmap/factory.go

@@ -9,21 +9,26 @@ import (
 	"sigs.k8s.io/kustomize/api/internal/kusterr"
 	"sigs.k8s.io/kustomize/api/resource"
 	"sigs.k8s.io/kustomize/api/types"
-	"sigs.k8s.io/kustomize/kyaml/yaml"
 )
 
+// 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
-	// Makes ConflictDetectors.
-	cdf resource.ConflictDetectorFactory
+	// Makes ResMaps via merging.
+	pm Merginator
 }
 
 // NewFactory returns a new resmap.Factory.
-func NewFactory(
-	rf *resource.Factory, cdf resource.ConflictDetectorFactory) *Factory {
-	return &Factory{resF: rf, cdf: cdf}
+func NewFactory(rf *resource.Factory, pm Merginator) *Factory {
+	return &Factory{resF: rf, pm: pm}
 }
 
 // RF returns a resource.Factory.
@@ -126,11 +131,10 @@ func (rmF *Factory) FromSecretArgs(
 	return rmF.FromResource(res), nil
 }
 
-// ConflatePatches creates a new ResMap containing a merger of the
-// incoming patches.
+// Merge creates a new ResMap by merging incoming resources.
 // Error if conflict found.
-func (rmF *Factory) ConflatePatches(patches []*resource.Resource) (ResMap, error) {
-	return (&merginator{cdf: rmF.cdf}).ConflatePatches(patches)
+func (rmF *Factory) Merge(patches []*resource.Resource) (ResMap, error) {
+	return rmF.pm.Merge(patches)
 }
 
 func newResMapFromResourceSlice(
@@ -144,20 +148,3 @@ func newResMapFromResourceSlice(
 	}
 	return result, nil
 }
-
-// NewResMapFromRNodeSlice returns a ResMap from a slice of RNodes
-func (rmF *Factory) NewResMapFromRNodeSlice(rnodes []*yaml.RNode) (ResMap, error) {
-	var resources []*resource.Resource
-	for _, rnode := range rnodes {
-		s, err := rnode.String()
-		if err != nil {
-			return nil, err
-		}
-		r, err := rmF.resF.SliceFromBytes([]byte(s))
-		if err != nil {
-			return nil, err
-		}
-		resources = append(resources, r...)
-	}
-	return newResMapFromResourceSlice(resources)
-}

api/resmap/factory_test.go

@@ -5,20 +5,18 @@ package resmap_test
 
 import (
 	"encoding/base64"
+	"reflect"
 	"testing"
 
-	"github.com/stretchr/testify/assert"
 	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/api/ifc"
-	"sigs.k8s.io/kustomize/api/konfig"
 	"sigs.k8s.io/kustomize/api/kv"
 	"sigs.k8s.io/kustomize/api/loader"
+	"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"
 	valtest_test "sigs.k8s.io/kustomize/api/testutils/valtest"
 	"sigs.k8s.io/kustomize/api/types"
-	"sigs.k8s.io/kustomize/kyaml/yaml"
 )
 
 func TestFromFile(t *testing.T) {
@@ -61,21 +59,29 @@ metadata:
 				"name":      "dply2",
 				"namespace": "test",
 			}}).ResMap()
-	expYaml, err := expected.AsYaml()
-	assert.NoError(t, err)
 
 	fSys := filesys.MakeFsInMemory()
-	assert.NoError(t, fSys.WriteFile("deployment.yaml", []byte(resourceStr)))
+	err := fSys.WriteFile("deployment.yaml", []byte(resourceStr))
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	ldr, err := loader.NewLoader(
 		loader.RestrictionRootOnly, filesys.Separator, fSys)
-	assert.NoError(t, err)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	m, err := rmF.FromFile(ldr, "deployment.yaml")
-	assert.NoError(t, err)
-	mYaml, err := m.AsYaml()
-	assert.NoError(t, err)
-	assert.Equal(t, expYaml, mYaml)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if m.Size() != 3 {
+		t.Fatalf("result should contain 3, but got %d", m.Size())
+	}
+	if err := expected.ErrorIfNotEqualLists(m); err != nil {
+		t.Fatalf("actual doesn't match expected: %v", err)
+	}
 }
 
 func TestFromBytes(t *testing.T) {
@@ -102,15 +108,17 @@ metadata:
 			"metadata": map[string]interface{}{
 				"name": "cm2",
 			}}).ResMap()
-	expYaml, err := expected.AsYaml()
-	assert.NoError(t, err)
 	m, err := rmF.NewResMapFromBytes(encoded)
-	assert.NoError(t, err)
-	mYaml, err := m.AsYaml()
-	assert.NoError(t, err)
-	assert.Equal(t, expYaml, mYaml)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	if !reflect.DeepEqual(m, expected) {
+		t.Fatalf("%#v doesn't match expected %#v", m, expected)
+	}
 }
 
+var cmap = resid.Gvk{Version: "v1", Kind: "ConfigMap"}
+
 func TestNewFromConfigMaps(t *testing.T) {
 	type testCase struct {
 		description string
@@ -220,12 +228,12 @@ BAR=baz
 			}
 		}
 		r, err := rmF.NewResMapFromConfigMapArgs(kvLdr, tc.input)
-		assert.NoError(t, err, tc.description)
-		rYaml, err := r.AsYaml()
-		assert.NoError(t, err, tc.description)
-		expYaml, err := tc.expected.AsYaml()
-		assert.NoError(t, err, tc.description)
-		assert.Equal(t, expYaml, rYaml)
+		if err != nil {
+			t.Fatalf("unexpected error: %v", err)
+		}
+		if err = tc.expected.ErrorIfNotEqualLists(r); err != nil {
+			t.Fatalf("testcase: %q, err: %v", tc.description, err)
+		}
 	}
 }
 
@@ -254,8 +262,6 @@ func TestNewResMapFromSecretArgs(t *testing.T) {
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}
-	actYaml, err := actual.AsYaml()
-	assert.NoError(t, err)
 
 	expected := resmaptest_test.NewRmBuilder(t, rf).Add(
 		map[string]interface{}{
@@ -270,149 +276,7 @@ func TestNewResMapFromSecretArgs(t *testing.T) {
 				"DB_PASSWORD": base64.StdEncoding.EncodeToString([]byte("somepw")),
 			},
 		}).ResMap()
-	expYaml, err := expected.AsYaml()
-	assert.NoError(t, err)
-
-	assert.Equal(t, string(expYaml), string(actYaml))
-}
-
-func TestFromRNodeSlice(t *testing.T) {
-	type testcase struct {
-		input    string
-		expected ResMap
-	}
-	testcases := map[string]testcase{
-		"no resource": {
-			input:    "---",
-			expected: resmaptest_test.NewRmBuilder(t, rf).ResMap(),
-		},
-		"single resource": {
-			input: `apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: namespace-reader
-rules:
-- apiGroups:
-  - ""
-  resources:
-  - namespaces
-  verbs:
-  - get
-  - watch
-  - list
-      `,
-			expected: resmaptest_test.NewRmBuilder(t, rf).Add(
-				map[string]interface{}{
-					"apiVersion": "rbac.authorization.k8s.io/v1",
-					"kind":       "ClusterRole",
-					"metadata": map[string]interface{}{
-						"name": "namespace-reader",
-					},
-					"rules": []interface{}{
-						map[string]interface{}{
-							"apiGroups": []interface{}{
-								"",
-							},
-							"resources": []interface{}{
-								"namespaces",
-							},
-							"verbs": []interface{}{
-								"get",
-								"watch",
-								"list",
-							},
-						},
-					},
-				}).ResMap(),
-		},
-		"local config": {
-			// local config should be ignored
-			input: `apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: my-config
-  annotations:
-    config.kubernetes.io/local-config: 'true'
-`,
-			expected: resmaptest_test.NewRmBuilder(t, rf).ResMap(),
-		},
-	}
-	for name, tc := range testcases {
-		rnodes := []*yaml.RNode{
-			yaml.MustParse(tc.input),
-		}
-		rm, err := rmF.NewResMapFromRNodeSlice(rnodes)
-		if err != nil {
-			t.Fatalf("unexpected error in test case [%s]: %v", name, err)
-		}
-		if err = tc.expected.ErrorIfNotEqualLists(rm); err != nil {
-			t.Fatalf("error in test case [%s]: %s", name, err)
-		}
+	if err = expected.ErrorIfNotEqualLists(actual); err != nil {
+		t.Fatalf("error: %s", err)
 	}
 }
-
-func TestConflatePatches_Empty(t *testing.T) {
-	rm, err := rmF.ConflatePatches([]*resource.Resource{})
-	assert.NoError(t, err)
-	assert.Equal(t, 0, rm.Size())
-}
-
-func TestConflatePatches(t *testing.T) {
-	var (
-		err    error
-		yml    []byte
-		r1, r2 *resource.Resource
-	)
-	r1, err = rf.FromBytes([]byte(`apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: my-foo
-spec:
-  bar:
-    B:
-    C: Z
-`))
-	assert.NoError(t, err)
-
-	r2, err = rf.FromBytes([]byte(`apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: my-foo
-spec:
-  bar:
-    C: Z
-    D: W
-  baz:
-    hello: world
-`))
-	assert.NoError(t, err)
-
-	rm, err := rmF.ConflatePatches([]*resource.Resource{r1, r2})
-	assert.NoError(t, err)
-
-	yml, err = rm.AsYaml()
-	assert.NoError(t, err)
-
-	assert.Equal(t, konfig.IfApiMachineryElseKyaml(`apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: my-foo
-spec:
-  bar:
-    B: null
-    C: Z
-    D: W
-  baz:
-    hello: world
-`, `apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: my-foo
-spec:
-  bar:
-    C: Z
-    D: W
-  baz:
-    hello: world
-`), string(yml))
-}

api/resmap/merginator.go

@@ -1,118 +0,0 @@
-// Copyright 2020 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package resmap
-
-import (
-	"fmt"
-
-	"sigs.k8s.io/kustomize/api/resource"
-)
-
-// merginator coordinates merging the resources in incoming to the result.
-type merginator struct {
-	incoming []*resource.Resource
-	cdf      resource.ConflictDetectorFactory
-	result   ResMap
-}
-
-func (m *merginator) ConflatePatches(in []*resource.Resource) (ResMap, error) {
-	m.result = New()
-	m.incoming = in
-	for index := range m.incoming {
-		alreadyInResult, err := m.appendIfNoMatch(index)
-		if err != nil {
-			return nil, err
-		}
-		if alreadyInResult != nil {
-			// The resource at index has the same resId as a previously
-			// considered resource.
-			//
-			// If they conflict with each other (e.g. they both want to change
-			// the image name in a Deployment, but to different values),
-			// return an error.
-			//
-			// If they don't conflict, then merge them into a single resource,
-			// since they both target the same item, and we want cumulative
-			// behavior. E.g. say both patches modify a map.  Without a merge,
-			// the last patch wins, replacing the entire map.
-			err = m.mergeWithExisting(index, alreadyInResult)
-			if err != nil {
-				return nil, err
-			}
-		}
-	}
-	return m.result, nil
-}
-
-func (m *merginator) appendIfNoMatch(index int) (*resource.Resource, error) {
-	candidate := m.incoming[index]
-	matchedResources := m.result.GetMatchingResourcesByOriginalId(
-		candidate.OrgId().Equals)
-	if len(matchedResources) == 0 {
-		m.result.Append(candidate)
-		return nil, nil
-	}
-	if len(matchedResources) > 1 {
-		return nil, fmt.Errorf("multiple resources targeted by patch")
-	}
-	return matchedResources[0], nil
-}
-
-func (m *merginator) mergeWithExisting(
-	index int, alreadyInResult *resource.Resource) error {
-	candidate := m.incoming[index]
-	cd, err := m.cdf.New(candidate.OrgId().Gvk)
-	if err != nil {
-		return err
-	}
-	hasConflict, err := cd.HasConflict(candidate, alreadyInResult)
-	if err != nil {
-		return err
-	}
-	if hasConflict {
-		return m.makeError(cd, index)
-	}
-	merged, err := cd.MergePatches(alreadyInResult, candidate)
-	if err != nil {
-		return err
-	}
-	_, err = m.result.Replace(merged)
-	return err
-}
-
-// Make an error message describing the conflict.
-func (m *merginator) makeError(cd resource.ConflictDetector, index int) error {
-	conflict, err := m.findConflict(cd, index)
-	if err != nil {
-		return err
-	}
-	if conflict == nil {
-		return fmt.Errorf("expected conflict for %s", m.incoming[index].OrgId())
-	}
-	return fmt.Errorf(
-		"conflict between %#v at index %d and %#v",
-		m.incoming[index].Map(), index, conflict.Map())
-}
-
-// findConflict looks for a conflict in a resource slice.
-// It returns the first conflict between the resource at index
-// and some other resource.  Two resources can only conflict if
-// they have the same original ResId.
-func (m *merginator) findConflict(
-	cd resource.ConflictDetector, index int) (*resource.Resource, error) {
-	targetId := m.incoming[index].OrgId()
-	for i, p := range m.incoming {
-		if i == index || !targetId.Equals(p.OrgId()) {
-			continue
-		}
-		conflict, err := cd.HasConflict(p, m.incoming[index])
-		if err != nil {
-			return nil, err
-		}
-		if conflict {
-			return p, nil
-		}
-	}
-	return nil, nil
-}

api/resmap/resmap.go

@@ -10,7 +10,6 @@ import (
 	"sigs.k8s.io/kustomize/api/resid"
 	"sigs.k8s.io/kustomize/api/resource"
 	"sigs.k8s.io/kustomize/api/types"
-	"sigs.k8s.io/kustomize/kyaml/yaml"
 )
 
 // A Transformer modifies an instance of ResMap.
@@ -236,13 +235,4 @@ type ResMap interface {
 	// Select returns a list of resources that
 	// are selected by a Selector
 	Select(types.Selector) ([]*resource.Resource, error)
-
-	// ToRNodeSlice converts the resources in the resmp
-	// to a list of RNodes
-	ToRNodeSlice() ([]*yaml.RNode, error)
-
-	// ApplySmPatch applies a strategic-merge patch to the
-	// selected set of resources.
-	ApplySmPatch(
-		selectedSet *resource.IdSet, patch *resource.Resource) error
 }

api/resmap/reswrangler.go

@@ -6,13 +6,11 @@ package resmap
 import (
 	"bytes"
 	"fmt"
-	"strings"
 
 	"github.com/pkg/errors"
 	"sigs.k8s.io/kustomize/api/resid"
 	"sigs.k8s.io/kustomize/api/resource"
 	"sigs.k8s.io/kustomize/api/types"
-	kyaml_yaml "sigs.k8s.io/kustomize/kyaml/yaml"
 	"sigs.k8s.io/yaml"
 )
 
@@ -340,8 +338,10 @@ func (m *resWrangler) ErrorIfNotEqualLists(other ResMap) error {
 	}
 	for i, r1 := range m.rList {
 		r2 := m2.rList[i]
-		if err := r1.ErrIfNotEquals(r2); err != nil {
-			return err
+		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
@@ -456,7 +456,8 @@ func (m *resWrangler) AbsorbAll(other ResMap) error {
 	return nil
 }
 
-func (m *resWrangler) appendReplaceOrMerge(res *resource.Resource) error {
+func (m *resWrangler) appendReplaceOrMerge(
+	res *resource.Resource) error {
 	id := res.CurId()
 	matches := m.GetMatchingResourcesByOriginalId(id.Equals)
 	if len(matches) == 0 {
@@ -470,7 +471,10 @@ func (m *resWrangler) appendReplaceOrMerge(res *resource.Resource) error {
 				"id %#v does not exist; cannot merge or replace", id)
 		default:
 			// presumably types.BehaviorCreate
-			return m.Append(res)
+			err := m.Append(res)
+			if err != nil {
+				return err
+			}
 		}
 	case 1:
 		old := matches[0]
@@ -483,10 +487,9 @@ func (m *resWrangler) appendReplaceOrMerge(res *resource.Resource) error {
 		}
 		switch res.Behavior() {
 		case types.BehaviorReplace:
-			res.CopyMergeMetaDataFieldsFrom(old)
+			res.Replace(old)
 		case types.BehaviorMerge:
-			res.CopyMergeMetaDataFieldsFrom(old)
-			res.MergeDataMapFrom(old)
+			res.Merge(old)
 		default:
 			return fmt.Errorf(
 				"id %#v exists; behavior must be merge or replace", id)
@@ -496,14 +499,14 @@ func (m *resWrangler) appendReplaceOrMerge(res *resource.Resource) error {
 			return err
 		}
 		if i != index {
-			return fmt.Errorf("unexpected target index in replacement")
+			return fmt.Errorf("unexpected index in replacement")
 		}
-		return nil
 	default:
 		return fmt.Errorf(
 			"found multiple objects %v that could accept merge of %v",
 			matches, id)
 	}
+	return nil
 }
 
 // Select returns a list of resources that
@@ -558,64 +561,3 @@ func (m *resWrangler) Select(s types.Selector) ([]*resource.Resource, error) {
 	}
 	return result, nil
 }
-
-// ToRNodeSlice converts the resources in the resmp
-// to a list of RNodes
-func (m *resWrangler) ToRNodeSlice() ([]*kyaml_yaml.RNode, error) {
-	var rnodes []*kyaml_yaml.RNode
-	for _, r := range m.Resources() {
-		s, err := r.AsYAML()
-		if err != nil {
-			return nil, err
-		}
-		rnode, err := kyaml_yaml.Parse(string(s))
-		if err != nil {
-			return nil, err
-		}
-		rnodes = append(rnodes, rnode)
-	}
-	return rnodes, nil
-}
-
-func (m *resWrangler) ApplySmPatch(
-	selectedSet *resource.IdSet, patch *resource.Resource) error {
-	newRm := New()
-	for _, res := range m.Resources() {
-		if !selectedSet.Contains(res.CurId()) {
-			newRm.Append(res)
-			continue
-		}
-		patchCopy := patch.DeepCopy()
-		patchCopy.SetName(res.GetName())
-		patchCopy.SetNamespace(res.GetNamespace())
-		patchCopy.SetGvk(res.GetGvk())
-		err := res.ApplySmPatch(patchCopy)
-		if err != nil {
-			// Check for an error string from UnmarshalJSON that's indicative
-			// of an object that's missing basic KRM fields, and thus may have been
-			// entirely deleted (an acceptable outcome).  This error handling should
-			// be deleted along with use of ResMap and apimachinery functions like
-			// UnmarshalJSON.
-			if !strings.Contains(err.Error(), "Object 'Kind' is missing") {
-				// Some unknown error, let it through.
-				return err
-			}
-			if !res.IsEmpty() {
-				return errors.Wrapf(
-					err, "with unexpectedly non-empty object map of size %d",
-					len(res.Map()))
-			}
-			// Fall through to handle deleted object.
-		}
-		if !res.IsEmpty() {
-			// IsEmpty means all fields have been removed from the object.
-			// This can happen if a patch required deletion of the
-			// entire resource (not just a part of it).  This means
-			// the overall resmap must shrink by one.
-			newRm.Append(res)
-		}
-	}
-	m.Clear()
-	m.AppendAll(newRm)
-	return nil
-}

api/resmap/reswrangler_test.go

@@ -4,14 +4,12 @@
 package resmap_test
 
 import (
-	"bytes"
 	"fmt"
 	"reflect"
 	"strings"
 	"testing"
 
-	"github.com/stretchr/testify/assert"
-	"sigs.k8s.io/kustomize/api/provider"
+	"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"
@@ -19,9 +17,9 @@ import (
 	"sigs.k8s.io/kustomize/api/types"
 )
 
-var depProvider = provider.NewDefaultDepProvider()
-var rf = depProvider.GetResourceFactory()
-var rmF = NewFactory(rf, depProvider.GetConflictDetectorFactory())
+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)
@@ -192,8 +190,6 @@ metadata:
 }
 
 func TestGetMatchingResourcesByCurrentId(t *testing.T) {
-	cmap := resid.Gvk{Version: "v1", Kind: "ConfigMap"}
-
 	r1 := rf.FromMap(
 		map[string]interface{}{
 			"apiVersion": "v1",
@@ -690,530 +686,49 @@ func makeMap2(b types.GenerationBehavior) ResMap {
 }
 
 func TestAbsorbAll(t *testing.T) {
-	metadata := map[string]interface{}{
-		"name": "cmap",
-	}
 	expected := rmF.FromResource(rf.FromMapAndOption(
 		map[string]interface{}{
 			"apiVersion": "apps/v1",
 			"kind":       "ConfigMap",
-			"metadata":   metadata,
+			"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{
+		}, &types.GeneratorArgs{
 			Behavior: "create",
 		}))
 	w := makeMap1()
-	assert.NoError(t, w.AbsorbAll(makeMap2(types.BehaviorMerge)))
-	assert.NoError(t, expected.ErrorIfNotEqualLists(w))
+	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()
-	assert.NoError(t, w.AbsorbAll(nil))
-	assert.NoError(t, w.ErrorIfNotEqualLists(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)
-	assert.NoError(t, w.AbsorbAll(w2))
-	assert.NoError(t, w2.ErrorIfNotEqualLists(w))
+	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)
-	assert.Error(t, err)
-	assert.True(
-		t, strings.Contains(err.Error(), "behavior must be merge or replace"))
-}
-
-func TestToRNodeSlice(t *testing.T) {
-	input := `apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: namespace-reader
-rules:
-- apiGroups:
-  - ""
-  resources:
-  - namespaces
-  verbs:
-  - get
-  - watch
-  - list
-`
-	rm, err := rmF.NewResMapFromBytes([]byte(input))
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	rnodes, err := rm.ToRNodeSlice()
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	b := bytes.NewBufferString("")
-	for i, n := range rnodes {
-		if i != 0 {
-			b.WriteString("---\n")
-		}
-		s, err := n.String()
-		if err != nil {
-			t.Fatalf("unexpected error: %v", err)
-		}
-		b.WriteString(s)
-	}
-
-	if !reflect.DeepEqual(input, b.String()) {
-		t.Fatalf("actual doesn't match expected.\nActual:\n%s\n===\nExpected:\n%s\n",
-			b.String(), input)
+	if err == nil {
+		t.Fatalf("expected error with unspecified behavior")
 	}
 }
-
-func TestApplySmPatch_General(t *testing.T) {
-	const (
-		myDeployment      = "Deployment"
-		myCRD             = "myCRD"
-		expectedResultSMP = `apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: deploy1
-spec:
-  template:
-    metadata:
-      labels:
-        old-label: old-value
-        some-label: some-value
-    spec:
-      containers:
-      - env:
-        - name: SOMEENV
-          value: SOMEVALUE
-        image: nginx
-        name: nginx
-`
-	)
-	tests := map[string]struct {
-		base          []string
-		patches       []string
-		expected      []string
-		errorExpected bool
-		errorMsg      string
-	}{
-		"clown": {
-			base: []string{`apiVersion: v1
-kind: Deployment
-metadata:
-  name: clown
-spec:
-  numReplicas: 1
-`,
-			},
-			patches: []string{`apiVersion: v1
-kind: Deployment
-metadata:
-  name: clown
-spec:
-  numReplicas: 999
-`,
-			},
-			errorExpected: false,
-			expected: []string{
-				`apiVersion: v1
-kind: Deployment
-metadata:
-  name: clown
-spec:
-  numReplicas: 999
-`,
-			},
-		},
-		"confusion": {
-			base: []string{`apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: my-foo
-spec:
-  bar:
-    A: X
-    B: Y
-`,
-			},
-			patches: []string{`apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: my-foo
-spec:
-  bar:
-    B:
-    C: Z
-`, `apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: my-foo
-spec:
-  bar:
-    C: Z
-    D: W
-  baz:
-    hello: world
-`,
-			},
-			errorExpected: false,
-			expected: []string{
-				`apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: my-foo
-spec:
-  bar:
-    A: X
-    C: Z
-    D: W
-  baz:
-    hello: world
-`,
-			},
-		},
-		"withschema-ns1-ns2-one": {
-			base: []string{
-				addNamespace("ns1", baseResource(myDeployment)),
-				addNamespace("ns2", baseResource(myDeployment)),
-			},
-			patches: []string{
-				addNamespace("ns1", addLabelAndEnvPatch(myDeployment)),
-				addNamespace("ns2", addLabelAndEnvPatch(myDeployment)),
-			},
-			errorExpected: false,
-			expected: []string{
-				addNamespace("ns1", expectedResultSMP),
-				addNamespace("ns2", expectedResultSMP),
-			},
-		},
-		"withschema-ns1-ns2-two": {
-			base: []string{
-				addNamespace("ns1", baseResource(myDeployment)),
-			},
-			patches: []string{
-				addNamespace("ns2", changeImagePatch(myDeployment)),
-			},
-			expected: []string{
-				addNamespace("ns1", baseResource(myDeployment)),
-			},
-		},
-		"withschema-ns1-ns2-three": {
-			base: []string{
-				addNamespace("ns1", baseResource(myDeployment)),
-			},
-			patches: []string{
-				addNamespace("ns1", changeImagePatch(myDeployment)),
-			},
-			expected: []string{
-				`apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: deploy1
-  namespace: ns1
-spec:
-  template:
-    metadata:
-      labels:
-        old-label: old-value
-    spec:
-      containers:
-      - image: nginx:1.7.9
-        name: nginx
-`,
-			},
-		},
-		"withschema-nil-ns2": {
-			base: []string{
-				baseResource(myDeployment),
-			},
-			patches: []string{
-				addNamespace("ns2", changeImagePatch(myDeployment)),
-			},
-			expected: []string{
-				baseResource(myDeployment),
-			},
-		},
-		"withschema-ns1-nil": {
-			base: []string{
-				addNamespace("ns1", baseResource(myDeployment)),
-			},
-			patches: []string{
-				changeImagePatch(myDeployment),
-			},
-			expected: []string{
-				addNamespace("ns1", baseResource(myDeployment)),
-			},
-		},
-		"noschema-ns1-ns2-one": {
-			base: []string{
-				addNamespace("ns1", baseResource(myCRD)),
-				addNamespace("ns2", baseResource(myCRD)),
-			},
-			patches: []string{
-				addNamespace("ns1", addLabelAndEnvPatch(myCRD)),
-				addNamespace("ns2", addLabelAndEnvPatch(myCRD)),
-			},
-			errorExpected: false,
-			expected: []string{
-				addNamespace("ns1", expectedResultJMP("")),
-				addNamespace("ns2", expectedResultJMP("")),
-			},
-		},
-		"noschema-ns1-ns2-two": {
-			base:     []string{addNamespace("ns1", baseResource(myCRD))},
-			patches:  []string{addNamespace("ns2", changeImagePatch(myCRD))},
-			expected: []string{addNamespace("ns1", baseResource(myCRD))},
-		},
-		"noschema-nil-ns2": {
-			base:     []string{baseResource(myCRD)},
-			patches:  []string{addNamespace("ns2", changeImagePatch(myCRD))},
-			expected: []string{baseResource(myCRD)},
-		},
-		"noschema-ns1-nil": {
-			base:     []string{addNamespace("ns1", baseResource(myCRD))},
-			patches:  []string{changeImagePatch(myCRD)},
-			expected: []string{addNamespace("ns1", baseResource(myCRD))},
-		},
-	}
-	for n := range tests {
-		tc := tests[n]
-		t.Run(n, func(t *testing.T) {
-			m, err := rmF.NewResMapFromBytes([]byte(strings.Join(tc.base, "\n---\n")))
-			assert.NoError(t, err)
-			foundError := false
-			for _, patch := range tc.patches {
-				rp, err := rf.FromBytes([]byte(patch))
-				assert.NoError(t, err)
-				idSet := resource.MakeIdSet([]*resource.Resource{rp})
-				if err = m.ApplySmPatch(idSet, rp); err != nil {
-					foundError = true
-					break
-				}
-			}
-			if foundError {
-				assert.True(t, tc.errorExpected)
-				// compare error message?
-				return
-			}
-			assert.False(t, tc.errorExpected)
-			yml, err := m.AsYaml()
-			assert.NoError(t, err)
-			assert.Equal(t, strings.Join(tc.expected, "---\n"), string(yml))
-		})
-	}
-}
-
-// simple utility function to add an namespace in a resource
-// used as base, patch or expected result. Simply looks
-// for specs: in order to add namespace: xxxx before this line
-func addNamespace(namespace string, base string) string {
-	res := strings.Replace(base,
-		"\nspec:\n",
-		"\n  namespace: "+namespace+"\nspec:\n",
-		1)
-	return res
-}
-
-func TestApplySmPatch_Deletion(t *testing.T) {
-	target := `
-apiVersion: apps/v1
-metadata:
-  name: myDeploy
-kind: Deployment
-spec:
-  replica: 2
-  template:
-    metadata:
-      labels:
-        old-label: old-value
-    spec:
-      containers:
-      - name: nginx
-        image: nginx
-`
-	tests := map[string]struct {
-		patch        string
-		expected     string
-		finalMapSize int
-	}{
-		"delete1": {
-			patch: `apiVersion: apps/v1
-metadata:
-  name: myDeploy
-kind: Deployment
-spec:
-  replica: 2
-  template:
-    $patch: delete
-    metadata:
-      labels:
-        old-label: old-value
-    spec:
-      containers:
-      - name: nginx
-        image: nginx
-`,
-			expected: `apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: myDeploy
-spec:
-  replica: 2
-`,
-			finalMapSize: 1,
-		},
-		"delete2": {
-			patch: `apiVersion: apps/v1
-metadata:
-  name: myDeploy
-kind: Deployment
-spec:
-  $patch: delete
-  replica: 2
-  template:
-    metadata:
-      labels:
-        old-label: old-value
-    spec:
-      containers:
-      - name: nginx
-        image: nginx
-`,
-			expected: `apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: myDeploy
-`,
-			finalMapSize: 1,
-		},
-		"delete3": {
-			patch: `apiVersion: apps/v1
-metadata:
-  name: myDeploy
-kind: Deployment
-$patch: delete
-`,
-			expected:     "",
-			finalMapSize: 0,
-		},
-	}
-	for name, test := range tests {
-		m, err := rmF.NewResMapFromBytes([]byte(target))
-		assert.NoError(t, err, name)
-		idSet := resource.MakeIdSet(m.Resources())
-		assert.Equal(t, 1, idSet.Size(), name)
-		p, err := rf.FromBytes([]byte(test.patch))
-		assert.NoError(t, err, name)
-		assert.NoError(t, m.ApplySmPatch(idSet, p), name)
-		assert.Equal(t, test.finalMapSize, m.Size(), name)
-		yml, err := m.AsYaml()
-		assert.NoError(t, err, name)
-		assert.Equal(t, test.expected, string(yml), name)
-	}
-}
-
-// baseResource produces a base object which used to test
-// patch transformation
-// Also the structure is matching the Deployment syntax
-// the kind can be replaced to allow testing using CRD
-// without access to the schema
-func baseResource(kind string) string {
-	return fmt.Sprintf(`apiVersion: apps/v1
-kind: %s
-metadata:
-  name: deploy1
-spec:
-  template:
-    metadata:
-      labels:
-        old-label: old-value
-    spec:
-      containers:
-      - image: nginx
-        name: nginx
-`, kind)
-}
-
-// addContainerAndEnvPatch produces a patch object which adds
-// an entry in the env slice of the first/nginx container
-// as well as adding a label in the metadata
-// Note that for SMP/WithSchema merge, the name:nginx entry
-// is mandatory
-func addLabelAndEnvPatch(kind string) string {
-	return fmt.Sprintf(`apiVersion: apps/v1
-kind: %s
-metadata:
-  name: deploy1
-spec:
-  template:
-    metadata:
-      labels:
-        some-label: some-value
-    spec:
-      containers:
-       - name: nginx
-         env:
-         - name: SOMEENV
-           value: SOMEVALUE`, kind)
-}
-
-// changeImagePatch produces a patch object which replaces
-// the value of the image field in the first/nginx container
-// Note that for SMP/WithSchema merge, the name:nginx entry
-// is mandatory
-func changeImagePatch(kind string) string {
-	return fmt.Sprintf(`apiVersion: apps/v1
-kind: %s
-metadata:
-  name: deploy1
-spec:
-  template:
-    spec:
-      containers:
-      - name: nginx
-        image: "nginx:1.7.9"`, kind)
-}
-
-// utility method building the expected output of a JMP.
-// imagename parameter allows to build a result consistent
-// with the JMP behavior which basically overrides the
-// entire "containers" list.
-func expectedResultJMP(imagename string) string {
-	if imagename == "" {
-		return `apiVersion: apps/v1
-kind: myCRD
-metadata:
-  name: deploy1
-spec:
-  template:
-    metadata:
-      labels:
-        old-label: old-value
-        some-label: some-value
-    spec:
-      containers:
-      - env:
-        - name: SOMEENV
-          value: SOMEVALUE
-        name: nginx
-`
-	}
-	return fmt.Sprintf(`apiVersion: apps/v1
-kind: myCRD
-metadata:
-  name: deploy1
-spec:
-  template:
-    metadata:
-      labels:
-        old-label: old-value
-        some-label: some-value
-    spec:
-      containers:
-      - image: %s
-        name: nginx
-`, imagename)
-}

api/resmap/selector_test.go

@@ -6,7 +6,6 @@ package resmap_test
 import (
 	"testing"
 
-	"github.com/stretchr/testify/assert"
 	"sigs.k8s.io/kustomize/api/resid"
 	. "sigs.k8s.io/kustomize/api/resmap"
 	"sigs.k8s.io/kustomize/api/types"
@@ -49,36 +48,38 @@ metadata:
   name: x-name1
   namespace: x-default
 `))
-	assert.NoError(t, err)
+	if err != nil {
+		t.Fatalf("unexpected error %v", err)
+	}
 	return result
 }
 
 func TestFindPatchTargets(t *testing.T) {
 	rm := setupRMForPatchTargets(t)
-	testcases := map[string]struct {
+	testcases := []struct {
 		target types.Selector
 		count  int
 	}{
-		"select_01": {
+		{
 			target: types.Selector{
 				Name: "name.*",
 			},
 			count: 3,
 		},
-		"select_02": {
+		{
 			target: types.Selector{
 				Name:               "name.*",
 				AnnotationSelector: "foo=bar",
 			},
 			count: 2,
 		},
-		"select_03": {
+		{
 			target: types.Selector{
 				LabelSelector: "app=name1",
 			},
 			count: 1,
 		},
-		"select_04": {
+		{
 			target: types.Selector{
 				Gvk: resid.Gvk{
 					Kind: "Kind1",
@@ -87,31 +88,31 @@ func TestFindPatchTargets(t *testing.T) {
 			},
 			count: 2,
 		},
-		"select_05": {
+		{
 			target: types.Selector{
 				Name: "NotMatched",
 			},
 			count: 0,
 		},
-		"select_06": {
+		{
 			target: types.Selector{
 				Name: "",
 			},
 			count: 4,
 		},
-		"select_07": {
+		{
 			target: types.Selector{
 				Namespace: "default",
 			},
 			count: 2,
 		},
-		"select_08": {
+		{
 			target: types.Selector{
 				Namespace: "",
 			},
 			count: 4,
 		},
-		"select_09": {
+		{
 			target: types.Selector{
 				Namespace: "default",
 				Name:      "name.*",
@@ -121,65 +122,69 @@ func TestFindPatchTargets(t *testing.T) {
 			},
 			count: 1,
 		},
-		"select_10": {
+		{
 			target: types.Selector{
 				Name: "^name.*",
 			},
 			count: 3,
 		},
-		"select_11": {
+		{
 			target: types.Selector{
 				Name: "name.*$",
 			},
 			count: 3,
 		},
-		"select_12": {
+		{
 			target: types.Selector{
 				Name: "^name.*$",
 			},
 			count: 3,
 		},
-		"select_13": {
+		{
 			target: types.Selector{
 				Namespace: "^def.*",
 			},
 			count: 2,
 		},
-		"select_14": {
+		{
 			target: types.Selector{
 				Namespace: "def.*$",
 			},
 			count: 2,
 		},
-		"select_15": {
+		{
 			target: types.Selector{
 				Namespace: "^def.*$",
 			},
 			count: 2,
 		},
-		"select_16": {
+		{
 			target: types.Selector{
 				Namespace: "default",
 			},
 			count: 2,
 		},
-		"select_17": {
+		{
 			target: types.Selector{
 				Namespace: "NotMatched",
 			},
 			count: 0,
 		},
-		"select_18": {
+		{
 			target: types.Selector{
 				Namespace: "ns1",
 			},
 			count: 1,
 		},
 	}
-	for n, testcase := range testcases {
+	for _, testcase := range testcases {
 		actual, err := rm.Select(testcase.target)
-		assert.NoError(t, err)
-		assert.Equalf(
-			t, testcase.count, len(actual), "test=%s target=%v", n, testcase.target)
+		if err != nil {
+			t.Errorf("unexpected error %v", err)
+		}
+		if len(actual) != testcase.count {
+			t.Errorf("expected %d objects, but got %d:\n%v", testcase.count, len(actual), actual)
+		}
 	}
+
 }

api/resource/conflictdetector.go

@@ -1,20 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package resource
-
-import "sigs.k8s.io/kustomize/api/resid"
-
-// ConflictDetector detects conflicts between resources.
-type ConflictDetector interface {
-	// HasConflict returns true if the given resources have a conflict.
-	HasConflict(patch1, patch2 *Resource) (bool, error)
-	// Merge two resources into one.
-	MergePatches(patch1, patch2 *Resource) (*Resource, error)
-}
-
-// ConflictDetectorFactory makes instances of ConflictDetector that know
-// how to handle the given Group, Version, Kind tuple.
-type ConflictDetectorFactory interface {
-	New(gvk resid.Gvk) (ConflictDetector, error)
-}

api/resource/doc.go

@@ -1,5 +0,0 @@
-// Copyright 2020 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-// Package resource implements representations of k8s API resources.
-package resource

api/resource/factory.go

@@ -94,7 +94,7 @@ func (rf *Factory) SliceFromPatches(
 	return result, nil
 }
 
-// FromBytes unmarshalls bytes into one Resource.
+// FromBytes unmarshals bytes into one Resource.
 func (rf *Factory) FromBytes(in []byte) (*Resource, error) {
 	result, err := rf.SliceFromBytes(in)
 	if err != nil {

api/resource/factory_test.go

@@ -4,12 +4,9 @@
 package resource_test
 
 import (
-	"fmt"
+	"reflect"
 	"testing"
 
-	"sigs.k8s.io/kustomize/api/konfig"
-
-	"github.com/stretchr/testify/assert"
 	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/api/loader"
 	. "sigs.k8s.io/kustomize/api/resource"
@@ -343,15 +340,7 @@ kind: List
 			name:        "listWithAnchorReference",
 			input:       []types.PatchStrategicMerge{patchList2},
 			expectedOut: []*Resource{testDeploymentA, testDeploymentB},
-			// See https://github.com/kubernetes-sigs/kustomize/issues/3271
-			// This test should not have an error, but does when kyaml is used.
-			// The error using kyaml is:
-			//   json: unsupported type: map[interface {}]interface {}
-			// probably arising from too many conversions between
-			// yaml, json, Resource, RNode, Unstructured etc.
-			// These conversions can be removed after closing
-			// https://github.com/kubernetes-sigs/kustomize/issues/2506
-			expectedErr: konfig.FlagEnableKyamlDefaultValue,
+			expectedErr: false,
 		},
 		{
 			name:        "listWithNoEntries",
@@ -360,7 +349,7 @@ kind: List
 			expectedErr: false,
 		},
 		{
-			name:        "listWithNoItems",
+			name:        "listWithNo'items:'",
 			input:       []types.PatchStrategicMerge{patchList4},
 			expectedOut: []*Resource{},
 			expectedErr: false,
@@ -368,19 +357,21 @@ kind: List
 	}
 	for _, test := range tests {
 		rs, err := factory.SliceFromPatches(ldr, test.input)
-		if err != nil {
-			assert.True(t, test.expectedErr,
-				fmt.Sprintf("in test %s, got unexpected error: %v", test.name, err))
-			continue
+		if test.expectedErr && err == nil {
+			t.Fatalf("%v: should return error", test.name)
+		}
+		if !test.expectedErr && err != nil {
+			t.Fatalf("%v: unexpected error: %s", test.name, err)
+		}
+		if len(rs) != len(test.expectedOut) {
+			t.Fatalf("%s: length mismatch %d != %d",
+				test.name, len(rs), len(test.expectedOut))
 		}
-		assert.False(t, test.expectedErr, "expected no error in "+test.name)
-		assert.Equal(t, len(test.expectedOut), len(rs))
 		for i := range rs {
-			expYaml, err := test.expectedOut[i].AsYAML()
-			assert.NoError(t, err)
-			actYaml, err := rs[i].AsYAML()
-			assert.NoError(t, err)
-			assert.Equal(t, expYaml, actYaml)
+			if !reflect.DeepEqual(test.expectedOut[i], rs[i]) {
+				t.Fatalf("%s: Got: %v\nexpected:%v",
+					test.name, test.expectedOut[i], rs[i])
+			}
 		}
 	}
 }

api/resource/idset.go

@@ -1,30 +0,0 @@
-// Copyright 2020 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package resource
-
-import "sigs.k8s.io/kustomize/api/resid"
-
-type IdSet struct {
-	ids map[resid.ResId]bool
-}
-
-func MakeIdSet(slice []*Resource) *IdSet {
-	set := make(map[resid.ResId]bool)
-	for _, r := range slice {
-		id := r.CurId()
-		if _, ok := set[id]; !ok {
-			set[id] = true
-		}
-	}
-	return &IdSet{ids: set}
-}
-
-func (s IdSet) Contains(id resid.ResId) bool {
-	_, ok := s.ids[id]
-	return ok
-}
-
-func (s IdSet) Size() int {
-	return len(s.ids)
-}

api/resource/idset_test.go

@@ -1,32 +0,0 @@
-// Copyright 2020 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package resource_test
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	. "sigs.k8s.io/kustomize/api/resource"
-)
-
-func TestIdSet_Empty(t *testing.T) {
-	s := MakeIdSet([]*Resource{})
-	assert.Equal(t, 0, s.Size())
-	assert.False(t, s.Contains(testDeployment.CurId()))
-	assert.False(t, s.Contains(testConfigMap.CurId()))
-}
-
-func TestIdSet_One(t *testing.T) {
-	s := MakeIdSet([]*Resource{testDeployment})
-	assert.Equal(t, 1, s.Size())
-	assert.True(t, s.Contains(testDeployment.CurId()))
-	assert.False(t, s.Contains(testConfigMap.CurId()))
-}
-
-func TestIdSet_Two(t *testing.T) {
-	s := MakeIdSet([]*Resource{testDeployment, testConfigMap})
-	assert.Equal(t, 2, s.Size())
-	assert.True(t, s.Contains(testDeployment.CurId()))
-	assert.True(t, s.Contains(testConfigMap.CurId()))
-}

api/resource/resource.go

@@ -1,18 +1,16 @@
 // Copyright 2019 The Kubernetes Authors.
 // SPDX-License-Identifier: Apache-2.0
 
+// Package resource implements representations of k8s API resources.
 package resource
 
 import (
-	"fmt"
 	"reflect"
 	"strings"
 
-	"sigs.k8s.io/kustomize/api/filters/patchstrategicmerge"
 	"sigs.k8s.io/kustomize/api/ifc"
 	"sigs.k8s.io/kustomize/api/resid"
 	"sigs.k8s.io/kustomize/api/types"
-	"sigs.k8s.io/kustomize/kyaml/filtersutil"
 	"sigs.k8s.io/yaml"
 )
 
@@ -46,10 +44,6 @@ func (r *Resource) GetFieldValue(f string) (interface{}, error) {
 	return r.kunStr.GetFieldValue(f)
 }
 
-func (r *Resource) GetDataMap() map[string]string {
-	return r.kunStr.GetDataMap()
-}
-
 func (r *Resource) GetGvk() resid.Gvk {
 	return r.kunStr.GetGvk()
 }
@@ -95,28 +89,14 @@ func (r *Resource) MatchesAnnotationSelector(selector string) (bool, error) {
 }
 
 func (r *Resource) SetAnnotations(m map[string]string) {
-	if len(m) == 0 {
-		// Force field erasure.
-		r.kunStr.SetAnnotations(nil)
-		return
-	}
 	r.kunStr.SetAnnotations(m)
 }
 
-func (r *Resource) SetDataMap(m map[string]string) {
-	r.kunStr.SetDataMap(m)
-}
-
 func (r *Resource) SetGvk(gvk resid.Gvk) {
 	r.kunStr.SetGvk(gvk)
 }
 
 func (r *Resource) SetLabels(m map[string]string) {
-	if len(m) == 0 {
-		// Force field erasure.
-		r.kunStr.SetLabels(nil)
-		return
-	}
 	r.kunStr.SetLabels(m)
 }
 
@@ -157,12 +137,10 @@ func (r *Resource) DeepCopy() *Resource {
 	return rc
 }
 
-// CopyMergeMetaDataFields copies everything but the non-metadata in
-// the ifc.Kunstructured map, merging labels and annotations.
-func (r *Resource) CopyMergeMetaDataFieldsFrom(other *Resource) {
+// Replace performs replace with other resource.
+func (r *Resource) Replace(other *Resource) {
 	r.SetLabels(mergeStringMaps(other.GetLabels(), r.GetLabels()))
-	r.SetAnnotations(
-		mergeStringMaps(other.GetAnnotations(), r.GetAnnotations()))
+	r.SetAnnotations(mergeStringMaps(other.GetAnnotations(), r.GetAnnotations()))
 	r.SetName(other.GetName())
 	r.SetNamespace(other.GetNamespace())
 	r.copyOtherFields(other)
@@ -178,29 +156,9 @@ func (r *Resource) copyOtherFields(other *Resource) {
 	r.nameSuffixes = copyStringSlice(other.nameSuffixes)
 }
 
-func (r *Resource) MergeDataMapFrom(o *Resource) {
-	r.SetDataMap(mergeStringMaps(o.GetDataMap(), r.GetDataMap()))
-}
-
-func (r *Resource) ErrIfNotEquals(o *Resource) error {
-	meYaml, err := r.AsYAML()
-	if err != nil {
-		return err
-	}
-	otherYaml, err := o.AsYAML()
-	if err != nil {
-		return err
-	}
-	if !r.ReferencesEqual(o) {
-		return fmt.Errorf("references unequal")
-	}
-	if string(meYaml) != string(otherYaml) {
-		return fmt.Errorf("---  self:\n"+
-			"%s\n"+
-			"--- other:\n"+
-			"%s\n", meYaml, otherYaml)
-	}
-	return nil
+func (r *Resource) Equals(o *Resource) bool {
+	return r.ReferencesEqual(o) &&
+		reflect.DeepEqual(r.kunStr, o.kunStr)
 }
 
 func (r *Resource) ReferencesEqual(o *Resource) bool {
@@ -222,6 +180,12 @@ func (r *Resource) KunstructEqual(o *Resource) bool {
 	return reflect.DeepEqual(r.kunStr, o.kunStr)
 }
 
+// Merge performs merge with other resource.
+func (r *Resource) Merge(other *Resource) {
+	r.Replace(other)
+	mergeConfigmap(r.Map(), other.Map(), r.Map())
+}
+
 func (r *Resource) copyRefBy() []resid.ResId {
 	if r.refBy == nil {
 		return nil
@@ -415,21 +379,20 @@ func (r *Resource) AppendRefVarName(variable types.Var) {
 	r.refVarNames = append(r.refVarNames, variable.Name)
 }
 
-// ApplySmPatch applies the provided strategic merge patch.
-func (r *Resource) ApplySmPatch(patch *Resource) error {
-	node, err := filtersutil.GetRNode(patch)
-	if err != nil {
-		return err
+// TODO: Add BinaryData once we sync to new k8s.io/api
+func mergeConfigmap(
+	mergedTo map[string]interface{},
+	maps ...map[string]interface{}) {
+	mergedMap := map[string]interface{}{}
+	for _, m := range maps {
+		datamap, ok := m["data"].(map[string]interface{})
+		if ok {
+			for key, value := range datamap {
+				mergedMap[key] = value
+			}
+		}
 	}
-	n, ns := r.GetName(), r.GetNamespace()
-	err = filtersutil.ApplyToJSON(patchstrategicmerge.Filter{
-		Patch: node,
-	}, r)
-	if !r.IsEmpty() {
-		r.SetName(n)
-		r.SetNamespace(ns)
-	}
-	return err
+	mergedTo["data"] = mergedMap
 }
 
 func mergeStringMaps(maps ...map[string]string) map[string]string {

api/resource/resource_test.go

@@ -1,21 +1,33 @@
-// Copyright 2020 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
+/*
+Copyright 2018 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
 
 package resource_test
 
 import (
-	"fmt"
 	"reflect"
 	"testing"
 
-	"github.com/stretchr/testify/assert"
-	"sigs.k8s.io/kustomize/api/provider"
+	"sigs.k8s.io/kustomize/api/k8sdeps/kunstruct"
 	"sigs.k8s.io/kustomize/api/resid"
 	. "sigs.k8s.io/kustomize/api/resource"
 	"sigs.k8s.io/kustomize/api/types"
 )
 
-var factory = provider.NewDefaultDepProvider().GetResourceFactory()
+var factory = NewFactory(
+	kunstruct.NewKunstructuredFactoryImpl())
 
 var testConfigMap = factory.FromMap(
 	map[string]interface{}{
@@ -125,736 +137,3 @@ func TestDeepCopy(t *testing.T) {
 		t.Errorf("expected %v\nbut got%v", r, cr)
 	}
 }
-
-func TestApplySmPatch_1(t *testing.T) {
-	resource, err := factory.FromBytes([]byte(`
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  annotations:
-    baseAnno: This is a base annotation
-  labels:
-    app: mungebot
-    foo: bar
-  name: bingo
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      foo: bar
-  template:
-    metadata:
-      labels:
-        app: mungebot
-    spec:
-      containers:
-      - env:
-        - name: foo
-          value: bar
-        image: nginx
-        name: nginx
-        ports:
-        - containerPort: 80
-`))
-	assert.NoError(t, err)
-	patch, err := factory.FromBytes([]byte(`
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: baseprefix-mungebot
-spec:
-  template:
-    spec:
-      containers:
-      - image: nginx
-        name: nginx
-        ports:
-        - containerPort: 777
-`))
-	assert.NoError(t, err)
-
-	assert.NoError(t, resource.ApplySmPatch(patch))
-	bytes, err := resource.AsYAML()
-	assert.NoError(t, err)
-	assert.Equal(t, `apiVersion: apps/v1
-kind: Deployment
-metadata:
-  annotations:
-    baseAnno: This is a base annotation
-  labels:
-    app: mungebot
-    foo: bar
-  name: bingo
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      foo: bar
-  template:
-    metadata:
-      labels:
-        app: mungebot
-    spec:
-      containers:
-      - env:
-        - name: foo
-          value: bar
-        image: nginx
-        name: nginx
-        ports:
-        - containerPort: 777
-        - containerPort: 80
-`, string(bytes))
-}
-
-func TestApplySmPatch_2(t *testing.T) {
-	resource, err := factory.FromBytes([]byte(`
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: my-foo
-spec:
-  bar:
-    A: X
-    B: Y
-`))
-	assert.NoError(t, err)
-	patch, err := factory.FromBytes([]byte(`
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: my-foo
-spec:
-  bar:
-    B:
-    C: Z
-    D: W
-  baz:
-    hello: world
-`))
-	assert.NoError(t, err)
-	assert.NoError(t, resource.ApplySmPatch(patch))
-	bytes, err := resource.AsYAML()
-	assert.NoError(t, err)
-	assert.Equal(t, `apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: my-foo
-spec:
-  bar:
-    A: X
-    C: Z
-    D: W
-  baz:
-    hello: world
-`, string(bytes))
-}
-
-func TestApplySmPatch_3(t *testing.T) {
-	resource, err := factory.FromBytes([]byte(`
-apiVersion: v1
-kind: Deployment
-metadata:
-  name: clown
-spec:
-  numReplicas: 1
-`))
-	assert.NoError(t, err)
-	patch, err := factory.FromBytes([]byte(`
-apiVersion: v1
-kind: Deployment
-metadata:
-  name: clown
-spec:
-  numReplicas: 999
-`))
-	assert.NoError(t, err)
-	assert.NoError(t, resource.ApplySmPatch(patch))
-	bytes, err := resource.AsYAML()
-	assert.NoError(t, err)
-	assert.Equal(t, `apiVersion: v1
-kind: Deployment
-metadata:
-  name: clown
-spec:
-  numReplicas: 999
-`, string(bytes))
-}
-
-func TestMergeDataMapFrom(t *testing.T) {
-	resource, err := factory.FromBytes([]byte(`
-apiVersion: v1
-kind: BlahBlah
-metadata:
-  name: clown
-data:
-  fruit: pear
-`))
-	if !assert.NoError(t, err) {
-		t.FailNow()
-	}
-	patch, err := factory.FromBytes([]byte(`
-apiVersion: v1
-kind: Whatever
-metadata:
-  name: spaceship
-data:
-  spaceship: enterprise
-`))
-	if !assert.NoError(t, err) {
-		t.FailNow()
-	}
-	resource.MergeDataMapFrom(patch)
-	bytes, err := resource.AsYAML()
-	assert.NoError(t, err)
-	assert.Equal(t, `apiVersion: v1
-data:
-  fruit: pear
-  spaceship: enterprise
-kind: BlahBlah
-metadata:
-  name: clown
-`, string(bytes))
-}
-
-func TestApplySmPatch_SwapOrder(t *testing.T) {
-	s1 := `
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: my-foo
-spec:
-  bar:
-    B:
-    C: Z
-`
-	s2 := `
-apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: my-foo
-spec:
-  bar:
-    C: Z
-    D: W
-  baz:
-    hello: world
-`
-	expected := `apiVersion: example.com/v1
-kind: Foo
-metadata:
-  name: my-foo
-spec:
-  bar:
-    C: Z
-    D: W
-  baz:
-    hello: world
-`
-	r1, err := factory.FromBytes([]byte(s1))
-	assert.NoError(t, err)
-	r2, err := factory.FromBytes([]byte(s2))
-	assert.NoError(t, err)
-	assert.NoError(t, r1.ApplySmPatch(r2))
-	bytes, err := r1.AsYAML()
-	assert.NoError(t, err)
-	assert.Equal(t, expected, string(bytes))
-
-	r1, _ = factory.FromBytes([]byte(s1))
-	r2, _ = factory.FromBytes([]byte(s2))
-	assert.NoError(t, r2.ApplySmPatch(r1))
-	bytes, err = r2.AsYAML()
-	assert.NoError(t, err)
-	assert.Equal(t, expected, string(bytes))
-}
-
-func TestApplySmPatch(t *testing.T) {
-	const (
-		myDeployment = "Deployment"
-		myCRD        = "myCRD"
-	)
-
-	tests := map[string]struct {
-		base          string
-		patch         []string
-		expected      string
-		errorExpected bool
-		errorMsg      string
-	}{
-		"withschema-label-image-container": {
-			base: baseResource(myDeployment),
-			patch: []string{
-				addLabelAndEnvPatch(myDeployment),
-				changeImagePatch(myDeployment, "nginx:latest"),
-				addContainerAndEnvPatch(myDeployment),
-			},
-			errorExpected: false,
-			expected:      expectedResultMultiPatch(myDeployment, false),
-		},
-		"withschema-image-container-label": {
-			base: baseResource(myDeployment),
-			patch: []string{
-				changeImagePatch(myDeployment, "nginx:latest"),
-				addContainerAndEnvPatch(myDeployment),
-				addLabelAndEnvPatch(myDeployment),
-			},
-			errorExpected: false,
-			expected:      expectedResultMultiPatch(myDeployment, true),
-		},
-		"withschema-container-label-image": {
-			base: baseResource(myDeployment),
-			patch: []string{
-				addContainerAndEnvPatch(myDeployment),
-				addLabelAndEnvPatch(myDeployment),
-				changeImagePatch(myDeployment, "nginx:latest"),
-			},
-			errorExpected: false,
-			expected:      expectedResultMultiPatch(myDeployment, true),
-		},
-		"noschema-label-image-container": {
-			base: baseResource(myCRD),
-			patch: []string{
-				addLabelAndEnvPatch(myCRD),
-				changeImagePatch(myCRD, "nginx:latest"),
-				addContainerAndEnvPatch(myCRD),
-			},
-			// Might be better if this complained about patch conflict.
-			// See plugin/builtin/patchstrategicmergetransformer/psmt_test.go
-			expected: `apiVersion: apps/v1
-kind: myCRD
-metadata:
-  name: deploy1
-spec:
-  template:
-    metadata:
-      labels:
-        old-label: old-value
-        some-label: some-value
-    spec:
-      containers:
-      - env:
-        - name: ANOTHERENV
-          value: ANOTHERVALUE
-        name: nginx
-      - image: anotherimage
-        name: anothercontainer
-`,
-		},
-		"noschema-image-container-label": {
-			base: baseResource(myCRD),
-			patch: []string{
-				changeImagePatch(myCRD, "nginx:latest"),
-				addContainerAndEnvPatch(myCRD),
-				addLabelAndEnvPatch(myCRD),
-			},
-			// Might be better if this complained about patch conflict.
-			expected: `apiVersion: apps/v1
-kind: myCRD
-metadata:
-  name: deploy1
-spec:
-  template:
-    metadata:
-      labels:
-        old-label: old-value
-        some-label: some-value
-    spec:
-      containers:
-      - env:
-        - name: SOMEENV
-          value: SOMEVALUE
-        name: nginx
-`,
-		},
-		"noschema-container-label-image": {
-			base: baseResource(myCRD),
-			patch: []string{
-				addContainerAndEnvPatch(myCRD),
-				addLabelAndEnvPatch(myCRD),
-				changeImagePatch(myCRD, "nginx:latest"),
-			},
-			// Might be better if this complained about patch conflict.
-			expected: `apiVersion: apps/v1
-kind: myCRD
-metadata:
-  name: deploy1
-spec:
-  template:
-    metadata:
-      labels:
-        old-label: old-value
-        some-label: some-value
-    spec:
-      containers:
-      - image: nginx:latest
-        name: nginx
-`,
-		},
-
-		"withschema-label-latest-someV-01": {
-			base: baseResource(myDeployment),
-			patch: []string{
-				addLabelAndEnvPatch(myDeployment),
-				changeImagePatch(myDeployment, "nginx:latest"),
-				changeImagePatch(myDeployment, "nginx:1.7.9"),
-			},
-			expected: `apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: deploy1
-spec:
-  template:
-    metadata:
-      labels:
-        old-label: old-value
-        some-label: some-value
-    spec:
-      containers:
-      - env:
-        - name: SOMEENV
-          value: SOMEVALUE
-        image: nginx:1.7.9
-        name: nginx
-`,
-		},
-		"withschema-latest-label-someV-02": {
-			base: baseResource(myDeployment),
-			patch: []string{
-				changeImagePatch(myDeployment, "nginx:latest"),
-				addLabelAndEnvPatch(myDeployment),
-				changeImagePatch(myDeployment, "nginx:1.7.9"),
-			},
-			expected: `apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: deploy1
-spec:
-  template:
-    metadata:
-      labels:
-        old-label: old-value
-        some-label: some-value
-    spec:
-      containers:
-      - env:
-        - name: SOMEENV
-          value: SOMEVALUE
-        image: nginx:1.7.9
-        name: nginx
-`,
-		},
-		"withschema-latest-label-someV-03": {
-			base: baseResource(myDeployment),
-			patch: []string{
-				changeImagePatch(myDeployment, "nginx:1.7.9"),
-				addLabelAndEnvPatch(myDeployment),
-				changeImagePatch(myDeployment, "nginx:latest"),
-			},
-			expected: `apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: deploy1
-spec:
-  template:
-    metadata:
-      labels:
-        old-label: old-value
-        some-label: some-value
-    spec:
-      containers:
-      - env:
-        - name: SOMEENV
-          value: SOMEVALUE
-        image: nginx:latest
-        name: nginx
-`,
-		},
-		"withschema-latest-label-someV-04": {
-			base: baseResource(myDeployment),
-			patch: []string{
-				changeImagePatch(myDeployment, "nginx:1.7.9"),
-				changeImagePatch(myDeployment, "nginx:latest"),
-				addLabelAndEnvPatch(myDeployment),
-				changeImagePatch(myDeployment, "nginx:nginx"),
-			},
-			expected: `apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: deploy1
-spec:
-  template:
-    metadata:
-      labels:
-        old-label: old-value
-        some-label: some-value
-    spec:
-      containers:
-      - env:
-        - name: SOMEENV
-          value: SOMEVALUE
-        image: nginx:nginx
-        name: nginx
-`,
-		},
-		"noschema-latest-label-someV-01": {
-			base: baseResource(myCRD),
-			patch: []string{
-				addLabelAndEnvPatch(myCRD),
-				changeImagePatch(myCRD, "nginx:latest"),
-				changeImagePatch(myCRD, "nginx:1.7.9"),
-			},
-			expected: `apiVersion: apps/v1
-kind: myCRD
-metadata:
-  name: deploy1
-spec:
-  template:
-    metadata:
-      labels:
-        old-label: old-value
-        some-label: some-value
-    spec:
-      containers:
-      - image: nginx:1.7.9
-        name: nginx
-`,
-		},
-		"noschema-latest-label-someV-02": {
-			base: baseResource(myCRD),
-			patch: []string{
-				changeImagePatch(myCRD, "nginx:latest"),
-				addLabelAndEnvPatch(myCRD),
-				changeImagePatch(myCRD, "nginx:1.7.9"),
-			},
-			expected: expectedResultJMP("nginx:1.7.9"),
-		},
-		"noschema-latest-label-someV-03": {
-			base: baseResource(myCRD),
-			patch: []string{
-				changeImagePatch(myCRD, "nginx:1.7.9"),
-				addLabelAndEnvPatch(myCRD),
-				changeImagePatch(myCRD, "nginx:latest"),
-			},
-			expected: `apiVersion: apps/v1
-kind: myCRD
-metadata:
-  name: deploy1
-spec:
-  template:
-    metadata:
-      labels:
-        old-label: old-value
-        some-label: some-value
-    spec:
-      containers:
-      - image: nginx:latest
-        name: nginx
-`,
-		},
-		"noschema-latest-label-someV-04": {
-			base: baseResource(myCRD),
-			patch: []string{
-				changeImagePatch(myCRD, "nginx:1.7.9"),
-				changeImagePatch(myCRD, "nginx:latest"),
-				addLabelAndEnvPatch(myCRD),
-				changeImagePatch(myCRD, "nginx:nginx"),
-			},
-			expected: `apiVersion: apps/v1
-kind: myCRD
-metadata:
-  name: deploy1
-spec:
-  template:
-    metadata:
-      labels:
-        old-label: old-value
-        some-label: some-value
-    spec:
-      containers:
-      - image: nginx:nginx
-        name: nginx
-`,
-		},
-	}
-
-	for name, test := range tests {
-		resource, err := factory.FromBytes([]byte(test.base))
-		assert.NoError(t, err)
-		for _, p := range test.patch {
-			patch, err := factory.FromBytes([]byte(p))
-			assert.NoError(t, err, name)
-			assert.NoError(t, resource.ApplySmPatch(patch), name)
-		}
-		bytes, err := resource.AsYAML()
-		if test.errorExpected {
-			assert.Error(t, err, name)
-		} else {
-			assert.NoError(t, err, name)
-			assert.Equal(t, test.expected, string(bytes), name)
-		}
-	}
-}
-
-// baseResource produces a base object which used to test
-// patch transformation
-// Also the structure is matching the Deployment syntax
-// the kind can be replaced to allow testing using CRD
-// without access to the schema
-func baseResource(kind string) string {
-	res := `
-apiVersion: apps/v1
-kind: %s
-metadata:
-  name: deploy1
-spec:
-  template:
-    metadata:
-      labels:
-        old-label: old-value
-    spec:
-      containers:
-      - name: nginx
-        image: nginx`
-	return fmt.Sprintf(res, kind)
-}
-
-// addContainerAndEnvPatch produces a patch object which adds
-// an entry in the env slice of the first/nginx container
-// as well as adding a label in the metadata
-// Note that for SMP/WithSchema merge, the name:nginx entry
-// is mandatory
-func addLabelAndEnvPatch(kind string) string {
-	return fmt.Sprintf(`
-apiVersion: apps/v1
-kind: %s
-metadata:
-  name: deploy1
-spec:
-  template:
-    metadata:
-      labels:
-        some-label: some-value
-    spec:
-      containers:
-       - name: nginx
-         env:
-         - name: SOMEENV
-           value: SOMEVALUE`, kind)
-}
-
-// addContainerAndEnvPatch produces a patch object which adds
-// an entry in the env slice of the first/nginx container
-// as well as adding a second container in the container list
-// Note that for SMP/WithSchema merge, the name:nginx entry
-// is mandatory
-func addContainerAndEnvPatch(kind string) string {
-	return fmt.Sprintf(`
-apiVersion: apps/v1
-kind: %s
-metadata:
-  name: deploy1
-spec:
-  template:
-    spec:
-      containers:
-      - name: nginx
-        env:
-        - name: ANOTHERENV
-          value: ANOTHERVALUE
-      - name: anothercontainer
-        image: anotherimage`, kind)
-}
-
-// addContainerAndEnvPatch produces a patch object which replaces
-// the value of the image field in the first/nginx container
-// Note that for SMP/WithSchema merge, the name:nginx entry
-// is mandatory
-func changeImagePatch(kind string, newImage string) string {
-	return fmt.Sprintf(`
-apiVersion: apps/v1
-kind: %s
-metadata:
-  name: deploy1
-spec:
-  template:
-    spec:
-      containers:
-      - name: nginx
-        image: %s`, kind, newImage)
-}
-
-// utility method to build the expected result of a multipatch
-// the order of the patches still have influence especially
-// in the insertion location within arrays.
-func expectedResultMultiPatch(kind string, reversed bool) string {
-	pattern := `apiVersion: apps/v1
-kind: %s
-metadata:
-  name: deploy1
-spec:
-  template:
-    metadata:
-      labels:
-        old-label: old-value
-        some-label: some-value
-    spec:
-      containers:
-      - env:
-        %s
-        image: nginx:latest
-        name: nginx
-      - image: anotherimage
-        name: anothercontainer
-`
-	if reversed {
-		return fmt.Sprintf(pattern, kind, `- name: SOMEENV
-          value: SOMEVALUE
-        - name: ANOTHERENV
-          value: ANOTHERVALUE`)
-	}
-	return fmt.Sprintf(pattern, kind, `- name: ANOTHERENV
-          value: ANOTHERVALUE
-        - name: SOMEENV
-          value: SOMEVALUE`)
-}
-
-// utility method building the expected output of a JMP.
-// imagename parameter allows to build a result consistent
-// with the JMP behavior which basically overrides the
-// entire "containers" list.
-func expectedResultJMP(imagename string) string {
-	if imagename == "" {
-		return `apiVersion: apps/v1
-kind: myCRD
-metadata:
-  name: deploy1
-spec:
-  template:
-    metadata:
-      labels:
-        old-label: old-value
-        some-label: some-value
-    spec:
-      containers:
-      - env:
-        - name: SOMEENV
-          value: SOMEVALUE
-        name: nginx
-`
-	}
-	return fmt.Sprintf(`apiVersion: apps/v1
-kind: myCRD
-metadata:
-  name: deploy1
-spec:
-  template:
-    metadata:
-      labels:
-        old-label: old-value
-        some-label: some-value
-    spec:
-      containers:
-      - image: %s
-        name: nginx
-`, imagename)
-}

api/testutils/kusttest/harnessenhanced.go

@@ -8,11 +8,13 @@ import (
 
 	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/api/ifc"
+	"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"
 	fLdr "sigs.k8s.io/kustomize/api/loader"
-	"sigs.k8s.io/kustomize/api/provider"
 	"sigs.k8s.io/kustomize/api/resmap"
+	"sigs.k8s.io/kustomize/api/resource"
 	valtest_test "sigs.k8s.io/kustomize/api/testutils/valtest"
 	"sigs.k8s.io/kustomize/api/types"
 )
@@ -44,10 +46,11 @@ func MakeEnhancedHarness(t *testing.T) *HarnessEnhanced {
 	if err != nil {
 		t.Fatal(err)
 	}
-	p := provider.NewDefaultDepProvider()
-	resourceFactory := p.GetResourceFactory()
+	resourceFactory := resource.NewFactory(
+		kunstruct.NewKunstructuredFactoryImpl())
 	resmapFactory := resmap.NewFactory(
-		resourceFactory, p.GetConflictDetectorFactory())
+		resourceFactory,
+		merge.NewMerginator(resourceFactory))
 
 	result := &HarnessEnhanced{
 		Harness: MakeHarness(t),

api/testutils/resmaptest/rmbuilder.go

@@ -6,7 +6,6 @@ package resmaptest_test
 import (
 	"testing"
 
-	"sigs.k8s.io/kustomize/api/provider"
 	"sigs.k8s.io/kustomize/api/resmap"
 	"sigs.k8s.io/kustomize/api/resource"
 )
@@ -26,15 +25,6 @@ func NewRmBuilder(t *testing.T, rf *resource.Factory) *rmBuilder {
 	return NewSeededRmBuilder(t, rf, resmap.New())
 }
 
-func NewRmBuilderDefault(t *testing.T) *rmBuilder {
-	return NewSeededRmBuilderDefault(t, resmap.New())
-}
-
-func NewSeededRmBuilderDefault(t *testing.T, m resmap.ResMap) *rmBuilder {
-	return NewSeededRmBuilder(
-		t, provider.NewDefaultDepProvider().GetResourceFactory(), m)
-}
-
 func (rm *rmBuilder) Add(m map[string]interface{}) *rmBuilder {
 	return rm.AddR(rm.rf.FromMap(m))
 }

api/types/builtinpluginloadingoptions_string.go

@@ -1,25 +0,0 @@
-// Code generated by "stringer -type=BuiltinPluginLoadingOptions"; DO NOT EDIT.
-
-package types
-
-import "strconv"
-
-func _() {
-	// An "invalid array index" compiler error signifies that the constant values have changed.
-	// Re-run the stringer command to generate them again.
-	var x [1]struct{}
-	_ = x[BploUndefined-0]
-	_ = x[BploUseStaticallyLinked-1]
-	_ = x[BploLoadFromFileSys-2]
-}
-
-const _BuiltinPluginLoadingOptions_name = "BploUndefinedBploUseStaticallyLinkedBploLoadFromFileSys"
-
-var _BuiltinPluginLoadingOptions_index = [...]uint8{0, 13, 36, 55}
-
-func (i BuiltinPluginLoadingOptions) String() string {
-	if i < 0 || i >= BuiltinPluginLoadingOptions(len(_BuiltinPluginLoadingOptions_index)-1) {
-		return "BuiltinPluginLoadingOptions(" + strconv.FormatInt(int64(i), 10) + ")"
-	}
-	return _BuiltinPluginLoadingOptions_name[_BuiltinPluginLoadingOptions_index[i]:_BuiltinPluginLoadingOptions_index[i+1]]
-}

api/types/helmchartargs.go

@@ -10,13 +10,10 @@ type HelmChartArgs struct {
 	ChartRepoURL string `json:"chartRepoUrl,omitempty" yaml:"chartRepoUrl,omitempty"`
 	ChartHome    string `json:"chartHome,omitempty" yaml:"chartHome,omitempty"`
 	// Use chartRelease to keep compatible with old exec plugin
-	ChartRepoName    string                 `json:"chartRelease,omitempty" yaml:"chartRelease,omitempty"`
-	HelmBin          string                 `json:"helmBin,omitempty" yaml:"helmBin,omitempty"`
-	HelmHome         string                 `json:"helmHome,omitempty" yaml:"helmHome,omitempty"`
-	Values           string                 `json:"values,omitempty" yaml:"values,omitempty"`
-	ValuesLocal      map[string]interface{} `json:"valuesLocal,omitempty" yaml:"valuesLocal,omitempty"`
-	ValuesMerge      string                 `json:"valuesMerge,omitempty" yaml:"valuesMerge,omitempty"`
-	ReleaseName      string                 `json:"releaseName,omitempty" yaml:"releaseName,omitempty"`
-	ReleaseNamespace string                 `json:"releaseNamespace,omitempty" yaml:"releaseNamespace,omitempty"`
-	ExtraArgs        []string               `json:"extraArgs,omitempty" yaml:"extraArgs,omitempty"`
+	ChartRepoName    string `json:"chartRelease,omitempty" yaml:"chartRelease,omitempty"`
+	HelmBin          string `json:"helmBin,omitempty" yaml:"helmBin,omitempty"`
+	HelmHome         string `json:"helmHome,omitempty" yaml:"helmHome,omitempty"`
+	Values           string `json:"values,omitempty" yaml:"values,omitempty"`
+	ReleaseName      string `json:"releaseName,omitempty" yaml:"releaseName,omitempty"`
+	ReleaseNamespace string `json:"releaseNamespace,omitempty" yaml:"releaseNamespace,omitempty"`
 }

cmd/config/go.mod

@@ -1,6 +1,6 @@
 module sigs.k8s.io/kustomize/cmd/config
 
-go 1.15
+go 1.14
 
 require (
 	github.com/go-errors/errors v1.0.1
@@ -14,6 +14,8 @@ require (
 	golang.org/x/net v0.0.0-20200625001655-4c5254603344 // indirect
 	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
 	gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
-	k8s.io/apimachinery v0.18.10
-	sigs.k8s.io/kustomize/kyaml v0.10.5
+	k8s.io/apimachinery v0.17.3
+	sigs.k8s.io/kustomize/kyaml v0.9.3
 )
+
+replace sigs.k8s.io/kustomize/kyaml v0.9.3 => ../../kyaml

cmd/config/go.sum

@@ -34,6 +34,7 @@ github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7
 github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
 github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
+github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -44,9 +45,10 @@ github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDD
 github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96 h1:cenwrSVm+Z7QLSV/BsnenAOcDXdX4cMv4wP0B/5QbPg=
 github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM=
 github.com/dustmop/soup v1.1.2-0.20190516214245-38228baa104e/go.mod h1:CgNC6SGbT+Xb8wGGvzilttZL1mc5sQ/5KkcxsZttMIk=
-github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
+github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e h1:p1yVGRW3nmb85p1Sh1ZJSDm4A4iKLS5QNbvUHMgGu/M=
+github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
 github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
-github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
+github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
 github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
@@ -118,11 +120,10 @@ github.com/go-openapi/validate v0.19.8 h1:YFzsdWIDfVuLvIOF+ZmKjVg1MbPJ1QgY9PihMw
 github.com/go-openapi/validate v0.19.8/go.mod h1:8DJv2CVJQ6kGNpFW6eV9N3JviE1C85nY1c2z52x1Gk4=
 github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
-github.com/gobuffalo/here v0.6.0/go.mod h1:wAG085dHOYqUpf+Ap+WOdrPTp5IYcDAs/x7PLa8Y5fM=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
-github.com/gogo/protobuf v1.3.1 h1:DqDEcV5aeaTmdFBePNpYsp3FlcVH/2ISVVM9Qf8PSls=
-github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
+github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d h1:3PaI8p3seN09VjbTYC/QWlUZdZ1qS1zGjy7LH2Wt07I=
+github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef h1:veQD95Isof8w9/WXiA+pa3tz3fJXkt5B7QaRBrM62gk=
@@ -140,15 +141,13 @@ 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.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM=
 github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+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=
-github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g=
-github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
-github.com/googleapis/gnostic v0.1.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
 github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
 github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
@@ -162,7 +161,7 @@ github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NH
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/jonboulle/clockwork v0.1.0 h1:VKV+ZcuP6l3yW9doeqz6ziZGgcynBVQO+obU0+0hcPo=
 github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
-github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
+github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.8 h1:QiWkFLKq0T7mpzwOTu6BzNDbfTE8OLrYhVKYMLF46Ok=
 github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
@@ -188,7 +187,6 @@ github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN
 github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.7.0 h1:aizVhC/NAAcKWb+5QsU1iNOZb4Yws5UO2I+aIprQITM=
 github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs=
-github.com/markbates/pkger v0.17.1/go.mod h1:0JoVlrol20BSywW79rN3kdFFsE5xYM+rSCQDXbLhiuI=
 github.com/mattn/go-runewidth v0.0.7 h1:Ei8KR0497xHyKJPAv59M1dkC+rOZCMBJ+t3fZ+twI54=
 github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
@@ -198,6 +196,7 @@ github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI=
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
@@ -214,7 +213,8 @@ github.com/olekukonko/tablewriter v0.0.4 h1:vHD/YYe1Wolo78koG299f7V/VAS08c6IpCLn
 github.com/olekukonko/tablewriter v0.0.4/go.mod h1:zq6QwlOf5SlnkVbMSr5EoBv3636FWnp+qbPhuoO21uA=
 github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.10.1 h1:q/mM8GF/n0shIN8SaAZ0V+jnLPzen6WIVZdiwrRlMlo=
+github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
 github.com/onsi/gomega v1.7.0 h1:XPnZz8VVBHjVsy1vzJmRwIcSwiUO+JFfrv/xGiigmME=
 github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
@@ -222,7 +222,7 @@ github.com/paulmach/orb v0.1.3/go.mod h1:VFlX/8C+IQ1p6FTRRKzKoOPJnvEtA5G0Veuqwbu
 github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
@@ -259,6 +259,7 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
 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=
 github.com/stretchr/testify v1.2.3-0.20181224173747-660f15d67dbb/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
@@ -329,9 +330,9 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20190321052220-f7bb7a8bee54/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191002063906-3421d5a6bb1c h1:Vco5b+cuG5NNfORVxZy6bYZQ7rsigisU1WQFkvQ0L5E=
 golang.org/x/sys v0.0.0-20191002063906-3421d5a6bb1c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -373,25 +374,23 @@ gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bl
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v3 v3.0.0-20200121175148-a6ecf24a6d71 h1:Xe2gvTZUJpsvOWUnvmL/tmhVBZUmHSvLbMjRj6NUUKo=
+gopkg.in/yaml.v3 v3.0.0-20200121175148-a6ecf24a6d71/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-k8s.io/apimachinery v0.18.10 h1:Zupk3lPrUfhCF9puTpA8EvEfPsrhNZtrpOqdp66mKVs=
-k8s.io/apimachinery v0.18.10/go.mod h1:PF5taHbXgTEJLU+xMypMmYTXTWPJ5LaW8bfsisxnEXk=
+k8s.io/apimachinery v0.17.3 h1:f+uZV6rm4/tHE7xXgLyToprg6xWairaClGVkm2t8omg=
+k8s.io/apimachinery v0.17.3/go.mod h1:gxLnyZcGNdZTCLnq3fgzyg2A5BVCHTNDFrw8AmuJ+0g=
 k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
 k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
 k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8=
 k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
-k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6/go.mod h1:GRQhZsXIAJ1xR0C9bd8UpWHZ5plfAS9fzPjJuQ6JL3E=
-sigs.k8s.io/kustomize/kyaml v0.10.5 h1:PbJcsZsEM7O3hHtUWTR+4WkHVbQRW9crSy75or1gRbI=
-sigs.k8s.io/kustomize/kyaml v0.10.5/go.mod h1:P6Oy/ah/GZMKzJMIJA2a3/bc8YrBkuL5kJji13PSIzY=
-sigs.k8s.io/structured-merge-diff/v3 v3.0.0-20200116222232-67a7b8c61874/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw=
-sigs.k8s.io/structured-merge-diff/v3 v3.0.0/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw=
+k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a h1:UcxjrRMyNx/i/y8G7kPvLyy7rfbeuf1PYyBf973pgyU=
+k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E=
+sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI=
 sigs.k8s.io/yaml v1.1.0 h1:4A07+ZFc2wgJwo8YNlQpr1rVlgUDlxXHhPJciaPY5gs=
 sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
-sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=

cmd/config/internal/commands/cmdcreatesetter.go

@@ -17,7 +17,8 @@ import (
 	"sigs.k8s.io/kustomize/cmd/config/internal/generateddocs/commands"
 	"sigs.k8s.io/kustomize/cmd/config/runner"
 	"sigs.k8s.io/kustomize/kyaml/errors"
-	"sigs.k8s.io/kustomize/kyaml/openapi"
+	"sigs.k8s.io/kustomize/kyaml/kio"
+	"sigs.k8s.io/kustomize/kyaml/setters"
 	"sigs.k8s.io/kustomize/kyaml/setters2/settersutil"
 )
 
@@ -33,23 +34,34 @@ func NewCreateSetterRunner(parent string) *CreateSetterRunner {
 		PreRunE: r.preRunE,
 		RunE:    r.runE,
 	}
-	set.Flags().StringVar(&r.FieldValue, "value", "",
+	set.Flags().StringVar(&r.Set.SetPartialField.Setter.Value, "value", "",
 		"optional flag, alternative to specifying the value as an argument. e.g. used to specify values that start with '-'")
-	set.Flags().StringVar(&r.SetBy, "set-by", "",
+	set.Flags().StringVar(&r.Set.SetPartialField.SetBy, "set-by", "",
 		"record who the field was default by.")
-	set.Flags().StringVar(&r.Description, "description", "",
+	set.Flags().StringVar(&r.Set.SetPartialField.Description, "description", "",
 		"record a description for the current setter value.")
-	set.Flags().StringVar(&r.FieldName, "field", "",
+	set.Flags().StringVar(&r.Set.SetPartialField.Field, "field", "",
 		"name of the field to set, a suffix of the path to the field, or the full"+
 			" path to the field. Default is to match all fields.")
-	set.Flags().StringVar(&r.Type, "type", "",
+	set.Flags().StringVar(&r.Set.ResourceMeta.Name, "name", "",
+		"name of the Resource on which to create the setter.")
+	set.Flags().MarkHidden("name")
+	set.Flags().StringVar(&r.Set.ResourceMeta.Kind, "kind", "",
+		"kind of the Resource on which to create the setter.")
+	set.Flags().MarkHidden("kind")
+	set.Flags().StringVar(&r.Set.SetPartialField.Type, "type", "",
 		"OpenAPI field type for the setter -- e.g. integer,boolean,string.")
-	set.Flags().BoolVar(&r.Required, "required", false,
+	set.Flags().BoolVar(&r.Set.SetPartialField.Partial, "partial", false,
+		"create a partial setter for only part of the field value.")
+	set.Flags().MarkHidden("partial")
+	set.Flags().StringVar(&setterVersion, "version", "",
+		"use this version of the setter format")
+	set.Flags().BoolVar(&r.CreateSetter.Required, "required", false,
 		"indicates that this setter must be set by package consumer before live apply/preview")
 	set.Flags().StringVar(&r.SchemaPath, "schema-path", "",
 		`openAPI schema file path for setter constraints -- file content `+
 			`e.g. {"type": "string", "maxLength": 15, "enum": ["allowedValue1", "allowedValue2"]}`)
-	set.Flags().BoolVarP(&r.RecurseSubPackages, "recurse-subpackages", "R", false,
+	set.Flags().BoolVarP(&r.CreateSetter.RecurseSubPackages, "recurse-subpackages", "R", false,
 		"creates setter recursively in all the nested subpackages")
 	set.Flags().MarkHidden("version")
 	runner.FixDocs(parent, set)
@@ -62,19 +74,11 @@ func CreateSetterCommand(parent string) *cobra.Command {
 }
 
 type CreateSetterRunner struct {
-	Command            *cobra.Command
-	CreateSetter       settersutil.SetterCreator
-	OpenAPIFile        string
-	SchemaPath         string
-	FieldValue         string
-	SetBy              string
-	Description        string
-	SetterName         string
-	Type               string
-	FieldName          string
-	Schema             string
-	Required           bool
-	RecurseSubPackages bool
+	Command      *cobra.Command
+	Set          setters.CreateSetter
+	CreateSetter settersutil.SetterCreator
+	OpenAPIFile  string
+	SchemaPath   string
 }
 
 func (r *CreateSetterRunner) runE(c *cobra.Command, args []string) error {
@@ -82,29 +86,48 @@ func (r *CreateSetterRunner) runE(c *cobra.Command, args []string) error {
 }
 
 func (r *CreateSetterRunner) preRunE(c *cobra.Command, args []string) error {
+	valueSetFromFlag := c.Flag("value").Changed
 	var err error
-	r.SetterName = args[1]
-	if len(args) > 2 {
-		r.FieldValue = args[2]
+	r.Set.SetPartialField.Setter.Name = args[1]
+	r.CreateSetter.Name = args[1]
+	if valueSetFromFlag {
+		r.CreateSetter.FieldValue = r.Set.SetPartialField.Setter.Value
+	} else if len(args) > 2 {
+		r.Set.SetPartialField.Setter.Value = args[2]
+		r.CreateSetter.FieldValue = args[2]
 	}
-	r.FieldName, err = c.Flags().GetString("field")
+	r.CreateSetter.FieldName, err = c.Flags().GetString("field")
 	if err != nil {
 		return err
 	}
 
-	if r.Type != "array" && !c.Flag("value").Changed && len(args) < 3 {
+	if setterVersion == "" {
+		if len(args) == 2 && r.Set.SetPartialField.Type == "array" && c.Flag("field").Changed {
+			setterVersion = "v2"
+		} else if err := initSetterVersion(c, args); err != nil {
+			return err
+		}
+	}
+
+	if r.Set.SetPartialField.Type != "array" && !c.Flag("value").Changed && len(args) < 3 {
 		return errors.Errorf("setter name and value must be provided, " +
 			"value can either be an argument or can be passed as a flag --value")
 	}
 
-	err = r.processSchema()
-	if err != nil {
-		return err
-	}
+	if setterVersion == "v2" {
+		r.CreateSetter.Description = r.Set.SetPartialField.Description
+		r.CreateSetter.SetBy = r.Set.SetPartialField.SetBy
+		r.CreateSetter.Type = r.Set.SetPartialField.Type
 
-	if r.Type == "array" {
-		if !c.Flag("field").Changed {
-			return errors.Errorf("field flag must be set for array type setters")
+		err = r.processSchema()
+		if err != nil {
+			return err
+		}
+
+		if r.CreateSetter.Type == "array" {
+			if !c.Flag("field").Changed {
+				return errors.Errorf("field flag must be set for array type setters")
+			}
 		}
 	}
 	return nil
@@ -116,7 +139,7 @@ func (r *CreateSetterRunner) processSchema() error {
 		return err
 	}
 
-	flagType := r.Type
+	flagType := r.CreateSetter.Type
 	var schemaType string
 	switch {
 	// json schema allows more than one type to be specified, but openapi
@@ -133,13 +156,13 @@ func (r *CreateSetterRunner) processSchema() error {
 	// are both set with different values, we return an error.
 	switch {
 	case flagType == "" && schemaType != "":
-		r.Type = schemaType
+		r.CreateSetter.Type = schemaType
 	case flagType != "" && schemaType == "":
 		sc.Type = []string{flagType}
 	case flagType != "" && schemaType != "":
 		if flagType != schemaType {
 			return errors.Errorf("type provided in type flag (%s) and in schema (%s) doesn't match",
-				r.Type, sc.Type[0])
+				r.CreateSetter.Type, sc.Type[0])
 		}
 	}
 
@@ -151,47 +174,54 @@ func (r *CreateSetterRunner) processSchema() error {
 	if err != nil {
 		return errors.Errorf("error marshalling schema: %v", err)
 	}
-	r.Schema = string(b)
+	r.CreateSetter.Schema = string(b)
 	return nil
 }
 
 func (r *CreateSetterRunner) createSetter(c *cobra.Command, args []string) error {
-	e := runner.ExecuteCmdOnPkgs{
-		NeedOpenAPI:        true,
-		Writer:             c.OutOrStdout(),
-		RootPkgPath:        args[0],
-		RecurseSubPackages: r.RecurseSubPackages,
-		CmdRunner:          r,
+	if setterVersion == "v2" {
+		e := runner.ExecuteCmdOnPkgs{
+			NeedOpenAPI:        true,
+			Writer:             c.OutOrStdout(),
+			RootPkgPath:        args[0],
+			RecurseSubPackages: r.CreateSetter.RecurseSubPackages,
+			CmdRunner:          r,
+		}
+		err := e.Execute()
+		if err != nil {
+			return runner.HandleError(c, err)
+		}
+		return nil
 	}
-	err := e.Execute()
+
+	rw := &kio.LocalPackageReadWriter{PackagePath: args[0]}
+	err := kio.Pipeline{
+		Inputs:  []kio.Reader{rw},
+		Filters: []kio.Filter{&r.Set},
+		Outputs: []kio.Writer{rw}}.Execute()
 	if err != nil {
-		return runner.HandleError(c, err)
+		return err
 	}
 	return nil
 }
 
 func (r *CreateSetterRunner) ExecuteCmd(w io.Writer, pkgPath string) error {
-	sc, err := openapi.SchemaFromFile(filepath.Join(pkgPath, ext.KRMFileName()))
-	if err != nil {
-		return err
-	}
 	r.CreateSetter = settersutil.SetterCreator{
-		Name:               r.SetterName,
-		SetBy:              r.SetBy,
-		Description:        r.Description,
-		Type:               r.Type,
-		Schema:             r.Schema,
-		FieldName:          r.FieldName,
-		FieldValue:         r.FieldValue,
-		Required:           r.Required,
-		RecurseSubPackages: r.RecurseSubPackages,
+		Name:               r.CreateSetter.Name,
+		SetBy:              r.CreateSetter.SetBy,
+		Description:        r.CreateSetter.Description,
+		Type:               r.CreateSetter.Type,
+		Schema:             r.CreateSetter.Schema,
+		FieldName:          r.CreateSetter.FieldName,
+		FieldValue:         r.CreateSetter.FieldValue,
+		Required:           r.CreateSetter.Required,
+		RecurseSubPackages: r.CreateSetter.RecurseSubPackages,
 		OpenAPIFileName:    ext.KRMFileName(),
 		OpenAPIPath:        filepath.Join(pkgPath, ext.KRMFileName()),
 		ResourcesPath:      pkgPath,
-		SettersSchema:      sc,
 	}
 
-	err = r.CreateSetter.Create()
+	err := r.CreateSetter.Create()
 	if err != nil {
 		// return err if RecurseSubPackages is false
 		if !r.CreateSetter.RecurseSubPackages {