Merge pull request #1655 from monopole/drainPkgTransformers

Drain pkg transformers

api/builtinconfig/consts/commonannotations.go

@@ -1,20 +1,7 @@
-/*
-Copyright 2018 The Kubernetes Authors.
+// Copyright 2019 The Kubernetes Authors.
+// SPDX-License-Identifier: Apache-2.0
 
-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 defaultconfig
+package consts
 
 const commonAnnotationFieldSpecs = `
 commonAnnotations:

api/builtinconfig/consts/commonlabels.go

@@ -1,20 +1,7 @@
-/*
-Copyright 2018 The Kubernetes Authors.
+// Copyright 2019 The Kubernetes Authors.
+// SPDX-License-Identifier: Apache-2.0
 
-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 defaultconfig
+package consts
 
 const commonLabelFieldSpecs = `
 commonLabels:

api/builtinconfig/consts/defaultconfig.go

@@ -1,22 +1,7 @@
-/*
-Copyright 2018 The Kubernetes Authors.
+// Copyright 2019 The Kubernetes Authors.
+// SPDX-License-Identifier: Apache-2.0
 
-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 defaultconfig provides the default
-// transformer configurations
-package defaultconfig
+package consts
 
 import (
 	"bytes"

api/builtinconfig/consts/doc.go

@@ -0,0 +1,5 @@
+// Copyright 2019 The Kubernetes Authors.
+// SPDX-License-Identifier: Apache-2.0
+
+// Package consts provides builtin plugin configuration data.
+package consts

api/builtinconfig/consts/images.go

@@ -0,0 +1,10 @@
+// Copyright 2019 The Kubernetes Authors.
+// SPDX-License-Identifier: Apache-2.0
+
+package consts
+
+const (
+	// imageFieldSpecs is left empty since `containers` and `initContainers`
+	// of *ANY* kind in *ANY* path are builtin supported in code
+	imagesFieldSpecs = ``
+)

api/builtinconfig/consts/nameprefix.go

@@ -0,0 +1,11 @@
+// Copyright 2019 The Kubernetes Authors.
+// SPDX-License-Identifier: Apache-2.0
+
+package consts
+
+const (
+	namePrefixFieldSpecs = `
+namePrefix:
+- path: metadata/name
+`
+)

api/builtinconfig/consts/namereference.go

@@ -1,20 +1,7 @@
-/*
-Copyright 2018 The Kubernetes Authors.
+// Copyright 2019 The Kubernetes Authors.
+// SPDX-License-Identifier: Apache-2.0
 
-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 defaultconfig
+package consts
 
 const (
 	nameReferenceFieldSpecs = `

api/builtinconfig/consts/namespace.go

@@ -0,0 +1,16 @@
+// Copyright 2019 The Kubernetes Authors.
+// SPDX-License-Identifier: Apache-2.0
+
+package consts
+
+const (
+	namespaceFieldSpecs = `
+namespace:
+- path: metadata/namespace
+  create: true
+- path: subjects
+  kind: RoleBinding
+- path: subjects
+  kind: ClusterRoleBinding
+`
+)

api/builtinconfig/consts/replicas.go

@@ -1,4 +1,7 @@
-package defaultconfig
+// Copyright 2019 The Kubernetes Authors.
+// SPDX-License-Identifier: Apache-2.0
+
+package consts
 
 const replicasFieldSpecs = `
 replicas:

api/builtinconfig/consts/varreference.go

@@ -1,20 +1,7 @@
-/*
-Copyright 2018 The Kubernetes Authors.
+// Copyright 2019 The Kubernetes Authors.
+// SPDX-License-Identifier: Apache-2.0
 
-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 defaultconfig
+package consts
 
 const (
 	varReferenceFieldSpecs = `

api/builtinconfig/doc.go

@@ -0,0 +1,8 @@
+// Copyright 2019 The Kubernetes Authors.
+// SPDX-License-Identifier: Apache-2.0
+
+// Package builtinconfig provides legacy methods for
+// configuring builting plugins from a common config file.
+// It's better to configure them individually if using
+// a custom configuration.
+package builtinconfig

api/builtinconfig/loaddefaultconfig.go

@@ -0,0 +1,42 @@
+// Copyright 2019 The Kubernetes Authors.
+// SPDX-License-Identifier: Apache-2.0
+
+package builtinconfig
+
+import (
+	"sigs.k8s.io/kustomize/v3/pkg/ifc"
+	"sigs.k8s.io/yaml"
+)
+
+// loadDefaultConfig returns a TranformerConfig
+// object from a list of files.
+func loadDefaultConfig(
+	ldr ifc.Loader, paths []string) (*TransformerConfig, error) {
+	result := &TransformerConfig{}
+	for _, path := range paths {
+		data, err := ldr.Load(path)
+		if err != nil {
+			return nil, err
+		}
+		t, err := makeTransformerConfigFromBytes(data)
+		if err != nil {
+			return nil, err
+		}
+		result, err = result.Merge(t)
+		if err != nil {
+			return nil, err
+		}
+	}
+	return result, nil
+}
+
+// makeTransformerConfigFromBytes returns a TransformerConfig object from bytes
+func makeTransformerConfigFromBytes(data []byte) (*TransformerConfig, error) {
+	var t TransformerConfig
+	err := yaml.Unmarshal(data, &t)
+	if err != nil {
+		return nil, err
+	}
+	t.sortFields()
+	return &t, nil
+}

api/builtinconfig/loaddefaultconfig_test.go

@@ -1,35 +1,30 @@
 // Copyright 2019 The Kubernetes Authors.
 // SPDX-License-Identifier: Apache-2.0
 
-package config
+package builtinconfig
 
 import (
 	"reflect"
-	"sigs.k8s.io/kustomize/v3/api/resid"
 	"testing"
 
+	"sigs.k8s.io/kustomize/v3/api/resid"
+	"sigs.k8s.io/kustomize/v3/api/types"
 	"sigs.k8s.io/kustomize/v3/internal/loadertest"
 )
 
-func TestMakeDefaultConfig(t *testing.T) {
-	// Confirm default can be made without fatal error inside call.
-	_ = MakeDefaultConfig()
-}
-
-func TestFromFiles(t *testing.T) {
-
+func TestLoadDefaultConfigsFromFiles(t *testing.T) {
 	ldr := loadertest.NewFakeLoader("/app")
 	ldr.AddFile("/app/config.yaml", []byte(`
 namePrefix:
 - path: nameprefix/path
   kind: SomeKind
 `))
-	tcfg, err := NewFactory(ldr).FromFiles([]string{"/app/config.yaml"})
+	tcfg, err := loadDefaultConfig(ldr, []string{"/app/config.yaml"})
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}
 	expected := &TransformerConfig{
-		NamePrefix: []FieldSpec{
+		NamePrefix: []types.FieldSpec{
 			{
 				Gvk:  resid.Gvk{Kind: "SomeKind"},
 				Path: "nameprefix/path",

api/builtinconfig/namebackreferences.go

@@ -1,23 +1,11 @@
-/*
-Copyright 2018 The Kubernetes Authors.
+// Copyright 2019 The Kubernetes Authors.
+// SPDX-License-Identifier: Apache-2.0
 
-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 config
+package builtinconfig
 
 import (
 	"sigs.k8s.io/kustomize/v3/api/resid"
+	"sigs.k8s.io/kustomize/v3/api/types"
 	"strings"
 )
 
@@ -51,7 +39,7 @@ import (
 //   }
 type NameBackReferences struct {
 	resid.Gvk  `json:",inline,omitempty" yaml:",inline,omitempty"`
-	FieldSpecs fsSlice `json:"FieldSpecs,omitempty" yaml:"FieldSpecs,omitempty"`
+	FieldSpecs types.FsSlice `json:"FieldSpecs,omitempty" yaml:"FieldSpecs,omitempty"`
 }
 
 func (n NameBackReferences) String() string {
@@ -88,7 +76,7 @@ func (s nbrSlice) mergeOne(other NameBackReferences) (nbrSlice, error) {
 	found := false
 	for _, c := range s {
 		if c.Gvk.Equals(other.Gvk) {
-			c.FieldSpecs, err = c.FieldSpecs.mergeAll(other.FieldSpecs)
+			c.FieldSpecs, err = c.FieldSpecs.MergeAll(other.FieldSpecs)
 			if err != nil {
 				return nil, err
 			}

api/builtinconfig/namebackreferences_test.go

@@ -1,29 +1,17 @@
-/*
-Copyright 2018 The Kubernetes Authors.
+// Copyright 2019 The Kubernetes Authors.
+// SPDX-License-Identifier: Apache-2.0
 
-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 config
+package builtinconfig
 
 import (
 	"reflect"
 	"sigs.k8s.io/kustomize/v3/api/resid"
+	"sigs.k8s.io/kustomize/v3/api/types"
 	"testing"
 )
 
 func TestMergeAll(t *testing.T) {
-	fsSlice1 := []FieldSpec{
+	fsSlice1 := []types.FieldSpec{
 		{
 			Gvk: resid.Gvk{
 				Kind: "Pod",
@@ -39,7 +27,7 @@ func TestMergeAll(t *testing.T) {
 			CreateIfNotPresent: false,
 		},
 	}
-	fsSlice2 := []FieldSpec{
+	fsSlice2 := []types.FieldSpec{
 		{
 			Gvk: resid.Gvk{
 				Kind: "Job",

api/builtinconfig/transformerconfig.go

@@ -0,0 +1,148 @@
+// Copyright 2019 The Kubernetes Authors.
+// SPDX-License-Identifier: Apache-2.0
+
+package builtinconfig
+
+import (
+	"log"
+	"sort"
+
+	"sigs.k8s.io/kustomize/v3/api/builtinconfig/consts"
+	"sigs.k8s.io/kustomize/v3/api/types"
+	"sigs.k8s.io/kustomize/v3/pkg/ifc"
+)
+
+// TransformerConfig holds the data needed to perform transformations.
+type TransformerConfig struct {
+	NamePrefix        types.FsSlice `json:"namePrefix,omitempty" yaml:"namePrefix,omitempty"`
+	NameSuffix        types.FsSlice `json:"nameSuffix,omitempty" yaml:"nameSuffix,omitempty"`
+	NameSpace         types.FsSlice `json:"namespace,omitempty" yaml:"namespace,omitempty"`
+	CommonLabels      types.FsSlice `json:"commonLabels,omitempty" yaml:"commonLabels,omitempty"`
+	CommonAnnotations types.FsSlice `json:"commonAnnotations,omitempty" yaml:"commonAnnotations,omitempty"`
+	NameReference     nbrSlice      `json:"nameReference,omitempty" yaml:"nameReference,omitempty"`
+	VarReference      types.FsSlice `json:"varReference,omitempty" yaml:"varReference,omitempty"`
+	Images            types.FsSlice `json:"images,omitempty" yaml:"images,omitempty"`
+	Replicas          types.FsSlice `json:"replicas,omitempty" yaml:"replicas,omitempty"`
+}
+
+// MakeEmptyConfig returns an empty TransformerConfig object
+func MakeEmptyConfig() *TransformerConfig {
+	return &TransformerConfig{}
+}
+
+// MakeDefaultConfig returns a default TransformerConfig.
+func MakeDefaultConfig() *TransformerConfig {
+	c, err := makeTransformerConfigFromBytes(
+		consts.GetDefaultFieldSpecs())
+	if err != nil {
+		log.Fatalf("Unable to make default transformconfig: %v", err)
+	}
+	return c
+}
+
+// MakeTransformerConfig returns a merger of custom config,
+// if any, with default config.
+func MakeTransformerConfig(
+	ldr ifc.Loader, paths []string) (*TransformerConfig, error) {
+	t1 := MakeDefaultConfig()
+	if len(paths) == 0 {
+		return t1, nil
+	}
+	t2, err := loadDefaultConfig(ldr, paths)
+	if err != nil {
+		return nil, err
+	}
+	return t1.Merge(t2)
+}
+
+// sortFields provides determinism in logging, tests, etc.
+func (t *TransformerConfig) sortFields() {
+	sort.Sort(t.NamePrefix)
+	sort.Sort(t.NameSpace)
+	sort.Sort(t.CommonLabels)
+	sort.Sort(t.CommonAnnotations)
+	sort.Sort(t.NameReference)
+	sort.Sort(t.VarReference)
+	sort.Sort(t.Images)
+	sort.Sort(t.Replicas)
+}
+
+// AddPrefixFieldSpec adds a FieldSpec to NamePrefix
+func (t *TransformerConfig) AddPrefixFieldSpec(fs types.FieldSpec) (err error) {
+	t.NamePrefix, err = t.NamePrefix.MergeOne(fs)
+	return err
+}
+
+// AddSuffixFieldSpec adds a FieldSpec to NameSuffix
+func (t *TransformerConfig) AddSuffixFieldSpec(fs types.FieldSpec) (err error) {
+	t.NameSuffix, err = t.NameSuffix.MergeOne(fs)
+	return err
+}
+
+// AddLabelFieldSpec adds a FieldSpec to CommonLabels
+func (t *TransformerConfig) AddLabelFieldSpec(fs types.FieldSpec) (err error) {
+	t.CommonLabels, err = t.CommonLabels.MergeOne(fs)
+	return err
+}
+
+// AddAnnotationFieldSpec adds a FieldSpec to CommonAnnotations
+func (t *TransformerConfig) AddAnnotationFieldSpec(fs types.FieldSpec) (err error) {
+	t.CommonAnnotations, err = t.CommonAnnotations.MergeOne(fs)
+	return err
+}
+
+// AddNamereferenceFieldSpec adds a NameBackReferences to NameReference
+func (t *TransformerConfig) AddNamereferenceFieldSpec(
+	nbrs NameBackReferences) (err error) {
+	t.NameReference, err = t.NameReference.mergeOne(nbrs)
+	return err
+}
+
+// Merge merges two TransformerConfigs objects into
+// a new TransformerConfig object
+func (t *TransformerConfig) Merge(input *TransformerConfig) (
+	merged *TransformerConfig, err error) {
+	if input == nil {
+		return t, nil
+	}
+	merged = &TransformerConfig{}
+	merged.NamePrefix, err = t.NamePrefix.MergeAll(input.NamePrefix)
+	if err != nil {
+		return nil, err
+	}
+	merged.NameSuffix, err = t.NameSuffix.MergeAll(input.NameSuffix)
+	if err != nil {
+		return nil, err
+	}
+	merged.NameSpace, err = t.NameSpace.MergeAll(input.NameSpace)
+	if err != nil {
+		return nil, err
+	}
+	merged.CommonAnnotations, err = t.CommonAnnotations.MergeAll(
+		input.CommonAnnotations)
+	if err != nil {
+		return nil, err
+	}
+	merged.CommonLabels, err = t.CommonLabels.MergeAll(input.CommonLabels)
+	if err != nil {
+		return nil, err
+	}
+	merged.VarReference, err = t.VarReference.MergeAll(input.VarReference)
+	if err != nil {
+		return nil, err
+	}
+	merged.NameReference, err = t.NameReference.mergeAll(input.NameReference)
+	if err != nil {
+		return nil, err
+	}
+	merged.Images, err = t.Images.MergeAll(input.Images)
+	if err != nil {
+		return nil, err
+	}
+	merged.Replicas, err = t.Replicas.MergeAll(input.Replicas)
+	if err != nil {
+		return nil, err
+	}
+	merged.sortFields()
+	return merged, nil
+}

api/builtinconfig/transformerconfig_test.go

@@ -1,28 +1,22 @@
-/*
-Copyright 2018 The Kubernetes Authors.
+// Copyright 2019 The Kubernetes Authors.
+// SPDX-License-Identifier: Apache-2.0
 
-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 config
+package builtinconfig_test
 
 import (
-	"sigs.k8s.io/kustomize/v3/api/resid"
+	"reflect"
 	"testing"
 
-	"reflect"
+	. "sigs.k8s.io/kustomize/v3/api/builtinconfig"
+	"sigs.k8s.io/kustomize/v3/api/resid"
+	"sigs.k8s.io/kustomize/v3/api/types"
 )
 
+func TestMakeDefaultConfig(t *testing.T) {
+	// Confirm default can be made without fatal error inside call.
+	_ = MakeDefaultConfig()
+}
+
 func TestAddNamereferenceFieldSpec(t *testing.T) {
 	cfg := &TransformerConfig{}
 
@@ -30,7 +24,7 @@ func TestAddNamereferenceFieldSpec(t *testing.T) {
 		Gvk: resid.Gvk{
 			Kind: "KindA",
 		},
-		FieldSpecs: []FieldSpec{
+		FieldSpecs: []types.FieldSpec{
 			{
 				Gvk: resid.Gvk{
 					Kind: "KindB",
@@ -53,7 +47,7 @@ func TestAddNamereferenceFieldSpec(t *testing.T) {
 func TestAddFieldSpecs(t *testing.T) {
 	cfg := &TransformerConfig{}
 
-	fieldSpec := FieldSpec{
+	fieldSpec := types.FieldSpec{
 		Gvk:                resid.Gvk{Group: "GroupA", Kind: "KindB"},
 		Path:               "path/to/a/field",
 		CreateIfNotPresent: true,
@@ -95,7 +89,7 @@ func TestMerge(t *testing.T) {
 			Gvk: resid.Gvk{
 				Kind: "KindA",
 			},
-			FieldSpecs: []FieldSpec{
+			FieldSpecs: []types.FieldSpec{
 				{
 					Gvk: resid.Gvk{
 						Kind: "KindB",
@@ -109,7 +103,7 @@ func TestMerge(t *testing.T) {
 			Gvk: resid.Gvk{
 				Kind: "KindA",
 			},
-			FieldSpecs: []FieldSpec{
+			FieldSpecs: []types.FieldSpec{
 				{
 					Gvk: resid.Gvk{
 						Kind: "KindC",
@@ -120,7 +114,7 @@ func TestMerge(t *testing.T) {
 			},
 		},
 	}
-	fieldSpecs := []FieldSpec{
+	fieldSpecs := []types.FieldSpec{
 		{
 			Gvk:                resid.Gvk{Group: "GroupA", Kind: "KindB"},
 			Path:               "path/to/a/field",

api/kusttest/kusttestharness.go

@@ -9,6 +9,7 @@ import (
 	"strings"
 	"testing"
 
+	"sigs.k8s.io/kustomize/v3/api/builtinconfig/consts"
 	"sigs.k8s.io/kustomize/v3/api/types"
 	"sigs.k8s.io/kustomize/v3/internal/loadertest"
 	"sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct"
@@ -19,7 +20,6 @@ import (
 	"sigs.k8s.io/kustomize/v3/pkg/resmap"
 	"sigs.k8s.io/kustomize/v3/pkg/resource"
 	"sigs.k8s.io/kustomize/v3/pkg/target"
-	"sigs.k8s.io/kustomize/v3/pkg/transformers/config/defaultconfig"
 	"sigs.k8s.io/kustomize/v3/pkg/validators"
 )
 
@@ -101,7 +101,7 @@ func (th *KustTestHarness) FromMapAndOption(m map[string]interface{}, args *type
 }
 
 func (th *KustTestHarness) WriteDefaultConfigs(fName string) {
-	m := defaultconfig.GetDefaultFieldSpecsAsMap()
+	m := consts.GetDefaultFieldSpecsAsMap()
 	var content []byte
 	for _, tCfg := range m {
 		content = append(content, []byte(tCfg)...)

api/transform/maptransformer.go

@@ -1,54 +1,28 @@
-/*
-Copyright 2018 The Kubernetes Authors.
+// Copyright 2019 The Kubernetes Authors.
+// SPDX-License-Identifier: Apache-2.0
 
-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 transformers
+package transform
 
 import (
 	"errors"
 	"fmt"
-
+	"sigs.k8s.io/kustomize/v3/api/types"
 	"sigs.k8s.io/kustomize/v3/pkg/resmap"
-	"sigs.k8s.io/kustomize/v3/pkg/transformers/config"
 )
 
 // mapTransformer applies a string->string map to fieldSpecs.
 type mapTransformer struct {
 	m          map[string]string
-	fieldSpecs []config.FieldSpec
+	fieldSpecs []types.FieldSpec
 }
 
 var _ resmap.Transformer = &mapTransformer{}
 
-// NewLabelsMapTransformer constructs a mapTransformer.
-func NewLabelsMapTransformer(
-	m map[string]string, fs []config.FieldSpec) (resmap.Transformer, error) {
-	return NewMapTransformer(fs, m)
-}
-
-// NewAnnotationsMapTransformer construct a mapTransformer.
-func NewAnnotationsMapTransformer(
-	m map[string]string, fs []config.FieldSpec) (resmap.Transformer, error) {
-	return NewMapTransformer(fs, m)
-}
-
 // NewMapTransformer construct a mapTransformer.
 func NewMapTransformer(
-	pc []config.FieldSpec, m map[string]string) (resmap.Transformer, error) {
+	pc []types.FieldSpec, m map[string]string) (resmap.Transformer, error) {
 	if m == nil {
-		return NewNoOpTransformer(), nil
+		return newNoOpTransformer(), nil
 	}
 	if pc == nil {
 		return nil, errors.New("fieldSpecs is not expected to be nil")

api/transform/maptransformer_test.go

@@ -1,22 +1,22 @@
 // Copyright 2019 The Kubernetes Authors.
 // SPDX-License-Identifier: Apache-2.0
 
-package transformers
+package transform_test
 
 import (
 	"testing"
 
+	"sigs.k8s.io/kustomize/v3/api/builtinconfig"
+	. "sigs.k8s.io/kustomize/v3/api/transform"
 	"sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct"
 	"sigs.k8s.io/kustomize/v3/pkg/resmaptest"
 	"sigs.k8s.io/kustomize/v3/pkg/resource"
-	"sigs.k8s.io/kustomize/v3/pkg/transformers/config"
 )
 
-var rf = resource.NewFactory(kunstruct.NewKunstructuredFactoryImpl())
-var defaultTransformerConfig = config.MakeDefaultConfig()
+var resourceFactory = resource.NewFactory(kunstruct.NewKunstructuredFactoryImpl())
 
 func TestLabelsRun(t *testing.T) {
-	m := resmaptest_test.NewRmBuilder(t, rf).
+	m := resmaptest_test.NewRmBuilder(t, resourceFactory).
 		Add(map[string]interface{}{
 			"apiVersion": "v1",
 			"kind":       "ConfigMap",
@@ -161,7 +161,7 @@ func TestLabelsRun(t *testing.T) {
 			},
 		}).ResMap()
 
-	expected := resmaptest_test.NewRmBuilder(t, rf).
+	expected := resmaptest_test.NewRmBuilder(t, resourceFactory).
 		Add(map[string]interface{}{
 			"apiVersion": "v1",
 			"kind":       "ConfigMap",
@@ -386,9 +386,9 @@ func TestLabelsRun(t *testing.T) {
 			},
 		}).ResMap()
 
-	lt, err := NewLabelsMapTransformer(
-		map[string]string{"label-key1": "label-value1", "label-key2": "label-value2"},
-		defaultTransformerConfig.CommonLabels)
+	lt, err := NewMapTransformer(
+		builtinconfig.MakeDefaultConfig().CommonLabels,
+		map[string]string{"label-key1": "label-value1", "label-key2": "label-value2"})
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}
@@ -402,7 +402,7 @@ func TestLabelsRun(t *testing.T) {
 }
 
 func TestAnnotationsRun(t *testing.T) {
-	m := resmaptest_test.NewRmBuilder(t, rf).
+	m := resmaptest_test.NewRmBuilder(t, resourceFactory).
 		Add(map[string]interface{}{
 			"apiVersion": "v1",
 			"kind":       "ConfigMap",
@@ -451,7 +451,7 @@ func TestAnnotationsRun(t *testing.T) {
 			},
 		}).ResMap()
 
-	expected := resmaptest_test.NewRmBuilder(t, rf).
+	expected := resmaptest_test.NewRmBuilder(t, resourceFactory).
 		Add(map[string]interface{}{
 			"apiVersion": "v1",
 			"kind":       "ConfigMap",
@@ -515,9 +515,9 @@ func TestAnnotationsRun(t *testing.T) {
 				},
 			},
 		}).ResMap()
-	at, err := NewAnnotationsMapTransformer(
-		map[string]string{"anno-key1": "anno-value1", "anno-key2": "anno-value2"},
-		defaultTransformerConfig.CommonAnnotations)
+	at, err := NewMapTransformer(
+		builtinconfig.MakeDefaultConfig().CommonAnnotations,
+		map[string]string{"anno-key1": "anno-value1", "anno-key2": "anno-value2"})
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}
@@ -531,7 +531,7 @@ func TestAnnotationsRun(t *testing.T) {
 }
 
 func TestAnnotationsRunWithNullValue(t *testing.T) {
-	m := resmaptest_test.NewRmBuilder(t, rf).
+	m := resmaptest_test.NewRmBuilder(t, resourceFactory).
 		Add(map[string]interface{}{
 			"apiVersion": "v1",
 			"kind":       "ConfigMap",
@@ -541,7 +541,7 @@ func TestAnnotationsRunWithNullValue(t *testing.T) {
 			},
 		}).ResMap()
 
-	expected := resmaptest_test.NewRmBuilder(t, rf).
+	expected := resmaptest_test.NewRmBuilder(t, resourceFactory).
 		Add(map[string]interface{}{
 			"apiVersion": "v1",
 			"kind":       "ConfigMap",
@@ -554,9 +554,9 @@ func TestAnnotationsRunWithNullValue(t *testing.T) {
 			},
 		}).ResMap()
 
-	at, err := NewAnnotationsMapTransformer(
-		map[string]string{"anno-key1": "anno-value1", "anno-key2": "anno-value2"},
-		defaultTransformerConfig.CommonAnnotations)
+	at, err := NewMapTransformer(
+		builtinconfig.MakeDefaultConfig().CommonAnnotations,
+		map[string]string{"anno-key1": "anno-value1", "anno-key2": "anno-value2"})
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}

api/transform/multitransformer.go

@@ -1,20 +1,7 @@
-/*
-Copyright 2018 The Kubernetes Authors.
+// Copyright 2019 The Kubernetes Authors.
+// SPDX-License-Identifier: Apache-2.0
 
-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 transformers
+package transform
 
 import (
 	"fmt"

api/transform/mutatefield.go

@@ -1,20 +1,7 @@
-/*
-Copyright 2018 The Kubernetes Authors.
+// Copyright 2019 The Kubernetes Authors.
+// SPDX-License-Identifier: Apache-2.0
 
-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 transformers
+package transform
 
 import (
 	"fmt"

api/transform/mutatefield_test.go

@@ -1,27 +1,14 @@
-/*
-Copyright 2018 The Kubernetes Authors.
+// Copyright 2019 The Kubernetes Authors.
+// SPDX-License-Identifier: Apache-2.0
 
-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 transformers
+package transform_test
 
 import (
 	"fmt"
-	"testing"
-
+	. "sigs.k8s.io/kustomize/v3/api/transform"
 	"sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct"
 	"sigs.k8s.io/kustomize/v3/pkg/ifc"
+	"testing"
 )
 
 type noopMutator struct {

api/transform/nooptransformer.go

@@ -0,0 +1,21 @@
+// Copyright 2019 The Kubernetes Authors.
+// SPDX-License-Identifier: Apache-2.0
+
+package transform
+
+import "sigs.k8s.io/kustomize/v3/pkg/resmap"
+
+// noOpTransformer contains a no-op transformer.
+type noOpTransformer struct{}
+
+var _ resmap.Transformer = &noOpTransformer{}
+
+// newNoOpTransformer constructs a noOpTransformer.
+func newNoOpTransformer() resmap.Transformer {
+	return &noOpTransformer{}
+}
+
+// Transform does nothing.
+func (o *noOpTransformer) Transform(_ resmap.ResMap) error {
+	return nil
+}

api/types/fieldspec.go

@@ -1,25 +1,13 @@
-/*
-Copyright 2018 The Kubernetes Authors.
+// Copyright 2019 The Kubernetes Authors.
+// SPDX-License-Identifier: Apache-2.0
 
-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 config
+package types
 
 import (
 	"fmt"
-	"sigs.k8s.io/kustomize/v3/api/resid"
 	"strings"
+
+	"sigs.k8s.io/kustomize/v3/api/resid"
 )
 
 // FieldSpec completely specifies a kustomizable field in
@@ -89,22 +77,22 @@ func (fs FieldSpec) PathSlice() []string {
 	return result
 }
 
-type fsSlice []FieldSpec
+type FsSlice []FieldSpec
 
-func (s fsSlice) Len() int      { return len(s) }
-func (s fsSlice) Swap(i, j int) { s[i], s[j] = s[j], s[i] }
-func (s fsSlice) Less(i, j int) bool {
+func (s FsSlice) Len() int      { return len(s) }
+func (s FsSlice) Swap(i, j int) { s[i], s[j] = s[j], s[i] }
+func (s FsSlice) Less(i, j int) bool {
 	return s[i].Gvk.IsLessThan(s[j].Gvk)
 }
 
-// mergeAll merges the argument into this, returning the result.
+// MergeAll merges the argument into this, returning the result.
 // Items already present are ignored.
 // Items that conflict (primary key matches, but remain data differs)
 // result in an error.
-func (s fsSlice) mergeAll(incoming fsSlice) (result fsSlice, err error) {
+func (s FsSlice) MergeAll(incoming FsSlice) (result FsSlice, err error) {
 	result = s
 	for _, x := range incoming {
-		result, err = result.mergeOne(x)
+		result, err = result.MergeOne(x)
 		if err != nil {
 			return nil, err
 		}
@@ -112,11 +100,11 @@ func (s fsSlice) mergeAll(incoming fsSlice) (result fsSlice, err error) {
 	return result, nil
 }
 
-// mergeOne merges the argument into this, returning the result.
+// MergeOne merges the argument into this, returning the result.
 // If the item's primary key is already present, and there are no
 // conflicts, it is ignored (we don't want duplicates).
 // If there is a conflict, the merge fails.
-func (s fsSlice) mergeOne(x FieldSpec) (fsSlice, error) {
+func (s FsSlice) MergeOne(x FieldSpec) (FsSlice, error) {
 	i := s.index(x)
 	if i > -1 {
 		// It's already there.
@@ -128,7 +116,7 @@ func (s fsSlice) mergeOne(x FieldSpec) (fsSlice, error) {
 	return append(s, x), nil
 }
 
-func (s fsSlice) index(fs FieldSpec) int {
+func (s FsSlice) index(fs FieldSpec) int {
 	for i, x := range s {
 		if x.effectivelyEquals(fs) {
 			return i

api/types/fieldspec_test.go

@@ -1,7 +1,7 @@
 // Copyright 2019 The Kubernetes Authors.
 // SPDX-License-Identifier: Apache-2.0
 
-package config
+package types_test
 
 import (
 	"fmt"
@@ -10,6 +10,7 @@ import (
 	"testing"
 
 	"sigs.k8s.io/kustomize/v3/api/resid"
+	. "sigs.k8s.io/kustomize/v3/api/types"
 )
 
 func TestPathSlice(t *testing.T) {
@@ -38,14 +39,14 @@ func TestPathSlice(t *testing.T) {
 
 var mergeTests = []struct {
 	name     string
-	original fsSlice
-	incoming fsSlice
+	original FsSlice
+	incoming FsSlice
 	err      error
-	result   fsSlice
+	result   FsSlice
 }{
 	{
 		"normal",
-		fsSlice{
+		FsSlice{
 			{
 				Path:               "whatever",
 				Gvk:                resid.Gvk{Group: "apple"},
@@ -57,7 +58,7 @@ var mergeTests = []struct {
 				CreateIfNotPresent: false,
 			},
 		},
-		fsSlice{
+		FsSlice{
 			{
 				Path:               "home",
 				Gvk:                resid.Gvk{Group: "beans"},
@@ -65,7 +66,7 @@ var mergeTests = []struct {
 			},
 		},
 		nil,
-		fsSlice{
+		FsSlice{
 			{
 				Path:               "whatever",
 				Gvk:                resid.Gvk{Group: "apple"},
@@ -85,7 +86,7 @@ var mergeTests = []struct {
 	},
 	{
 		"ignore copy",
-		fsSlice{
+		FsSlice{
 			{
 				Path:               "whatever",
 				Gvk:                resid.Gvk{Group: "apple"},
@@ -97,7 +98,7 @@ var mergeTests = []struct {
 				CreateIfNotPresent: false,
 			},
 		},
-		fsSlice{
+		FsSlice{
 			{
 				Path:               "whatever",
 				Gvk:                resid.Gvk{Group: "apple"},
@@ -105,7 +106,7 @@ var mergeTests = []struct {
 			},
 		},
 		nil,
-		fsSlice{
+		FsSlice{
 			{
 				Path:               "whatever",
 				Gvk:                resid.Gvk{Group: "apple"},
@@ -120,7 +121,7 @@ var mergeTests = []struct {
 	},
 	{
 		"error on conflict",
-		fsSlice{
+		FsSlice{
 			{
 				Path:               "whatever",
 				Gvk:                resid.Gvk{Group: "apple"},
@@ -132,7 +133,7 @@ var mergeTests = []struct {
 				CreateIfNotPresent: false,
 			},
 		},
-		fsSlice{
+		FsSlice{
 			{
 				Path:               "whatever",
 				Gvk:                resid.Gvk{Group: "apple"},
@@ -140,13 +141,13 @@ var mergeTests = []struct {
 			},
 		},
 		fmt.Errorf("hey"),
-		fsSlice{},
+		FsSlice{},
 	},
 }
 
 func TestFsSlice_MergeAll(t *testing.T) {
 	for _, item := range mergeTests {
-		result, err := item.original.mergeAll(item.incoming)
+		result, err := item.original.MergeAll(item.incoming)
 		if item.err == nil {
 			if err != nil {
 				t.Fatalf("test %s: unexpected err %v", item.name, err)

docs/plugins/builtins.md

@@ -36,7 +36,7 @@ complete plugin argument specification.
 [types.GeneratorOptions]: ../../api/types/generatoroptions.go
 [types.SecretArgs]: ../../api/types/secretargs.go
 [types.ConfigMapArgs]: ../../api/types/configmapargs.go
-[config.FieldSpec]: ../../pkg/transformers/config/fieldspec.go
+[config.FieldSpec]: ../../api/builtinconfig/fieldspec.go
 [types.ObjectMeta]: ../../api/types/objectmeta.go
 [types.Selector]: ../../api/types/selector.go
 [types.Replica]: ../../api/types/replica.go

examples/configureBuiltinPlugin.md

@@ -4,7 +4,7 @@
 [plugin]: ../docs/plugins
 [fields]: ../docs/fields.md
 [fields in a kustomization file]: ../docs/fields.md
-[TransformerConfig]: ../pkg/transformers/config/transformerconfig.go
+[TransformerConfig]: ../api/builtinconfig/transformerconfig.go
 [kustomization]: ../docs/glossary.md#kustomization
 
 # Customizing kustomize

go.sum

@@ -438,6 +438,7 @@ 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 v2.0.3+incompatible h1:JUufWFNlI44MdtnjUqVnvh29rR37PQFzPbLXqhyOyX0=
 sigs.k8s.io/kustomize/pluginator v1.0.0 h1:aeLqD8CIaqr++49YrcuRUcXl5vVKYLhCSfwXUi3ifQ4=
 sigs.k8s.io/kustomize/pluginator v1.0.0/go.mod h1:i8HdU5FdH1zDjCKiFf5CNl7slsc0QffyKsY2OuPynJ0=
 sigs.k8s.io/kustomize/v3 v3.2.0/go.mod h1:ztX4zYc/QIww3gSripwF7TBOarBTm5BvyAMem0kCzOE=

hacks/awker.sh

@@ -1,13 +1,14 @@
 function showDeps {
-  echo "==== $1 =================================="
+  echo "==== begin $1 =================================="
   find $1 -name "*.go" |\
-    xargs grep sigs.k8s.io/kustomize/v3 |\
+    xargs grep \"sigs.k8s.io/kustomize/v3 |\
+    grep -v "/api/" |\
     sed 's|"sigs.k8s.io/kustomize/v3/||' |\
     awk '{ printf "%40s  %s\n", $2, $1 }' |\
     sed 's|"  \./| |' |\
     sed 's|:$||' |\
     sort | uniq
-  echo "==== $1 =================================="
+  echo "==== end $1 =================================="
 }
 
 

kustomize/internal/commands/config/config.go

@@ -9,8 +9,8 @@ import (
 
 	"github.com/spf13/cobra"
 
+	"sigs.k8s.io/kustomize/v3/api/builtinconfig/consts"
 	"sigs.k8s.io/kustomize/v3/api/filesys"
-	"sigs.k8s.io/kustomize/v3/pkg/transformers/config/defaultconfig"
 )
 
 // NewCmdConfig returns an instance of 'config' subcommand.
@@ -89,7 +89,7 @@ func (o *saveOptions) Complete(fSys filesys.FileSystem) error {
 
 // RunSave saves the default transformer configurations local directory
 func (o *saveOptions) RunSave(fSys filesys.FileSystem) error {
-	m := defaultconfig.GetDefaultFieldSpecsAsMap()
+	m := consts.GetDefaultFieldSpecsAsMap()
 	for tname, tcfg := range m {
 		filename := filepath.Join(o.saveDirectory, tname+".yaml")
 		err := fSys.WriteFile(filename, []byte(tcfg))

pkg/accumulator/loadconfigfromcrds.go

@@ -1,29 +1,18 @@
-/*
-Copyright 2018 The Kubernetes Authors.
+// Copyright 2019 The Kubernetes Authors.
+// SPDX-License-Identifier: Apache-2.0
 
-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 config
+package accumulator
 
 import (
 	"encoding/json"
-	"sigs.k8s.io/kustomize/v3/api/resid"
 	"strings"
 
 	"github.com/go-openapi/spec"
 	"github.com/pkg/errors"
 	"k8s.io/kube-openapi/pkg/common"
+	"sigs.k8s.io/kustomize/v3/api/builtinconfig"
+	"sigs.k8s.io/kustomize/v3/api/resid"
+	"sigs.k8s.io/kustomize/v3/api/types"
 	"sigs.k8s.io/kustomize/v3/pkg/ifc"
 	"sigs.k8s.io/yaml"
 )
@@ -33,8 +22,8 @@ type nameToApiMap map[string]common.OpenAPIDefinition
 
 // LoadConfigFromCRDs parse CRD schemas from paths into a TransformerConfig
 func LoadConfigFromCRDs(
-	ldr ifc.Loader, paths []string) (*TransformerConfig, error) {
-	tc := MakeEmptyConfig()
+	ldr ifc.Loader, paths []string) (*builtinconfig.TransformerConfig, error) {
+	tc := builtinconfig.MakeEmptyConfig()
 	for _, path := range paths {
 		content, err := ldr.Load(path)
 		if err != nil {
@@ -65,13 +54,13 @@ func makeNameToApiMap(content []byte) (result nameToApiMap, err error) {
 	return
 }
 
-func makeConfigFromApiMap(m nameToApiMap) (*TransformerConfig, error) {
-	result := MakeEmptyConfig()
+func makeConfigFromApiMap(m nameToApiMap) (*builtinconfig.TransformerConfig, error) {
+	result := builtinconfig.MakeEmptyConfig()
 	for name, api := range m {
 		if !looksLikeAk8sType(api.Schema.SchemaProps.Properties) {
 			continue
 		}
-		tc := MakeEmptyConfig()
+		tc := builtinconfig.MakeEmptyConfig()
 		err := loadCrdIntoConfig(
 			tc, makeGvkFromTypeName(name), m, name, []string{})
 		if err != nil {
@@ -133,7 +122,7 @@ const (
 
 // loadCrdIntoConfig loads a CRD spec into a TransformerConfig
 func loadCrdIntoConfig(
-	theConfig *TransformerConfig, theGvk resid.Gvk, theMap nameToApiMap,
+	theConfig *builtinconfig.TransformerConfig, theGvk resid.Gvk, theMap nameToApiMap,
 	typeName string, path []string) (err error) {
 	api, ok := theMap[typeName]
 	if !ok {
@@ -173,9 +162,9 @@ func loadCrdIntoConfig(
 					nameKey = "name"
 				}
 				err = theConfig.AddNamereferenceFieldSpec(
-					NameBackReferences{
+					builtinconfig.NameBackReferences{
 						Gvk: resid.Gvk{Kind: kind, Version: version},
-						FieldSpecs: []FieldSpec{
+						FieldSpecs: []types.FieldSpec{
 							makeFs(theGvk, append(path, propName, nameKey))},
 					})
 				if err != nil {
@@ -192,8 +181,8 @@ func loadCrdIntoConfig(
 	return nil
 }
 
-func makeFs(in resid.Gvk, path []string) FieldSpec {
-	return FieldSpec{
+func makeFs(in resid.Gvk, path []string) types.FieldSpec {
+	return types.FieldSpec{
 		CreateIfNotPresent: false,
 		Gvk:                in,
 		Path:               strings.Join(path, "/"),

pkg/accumulator/loadconfigfromcrds_test.go

@@ -1,27 +1,17 @@
-/*
-Copyright 2018 The Kubernetes Authors.
+// Copyright 2019 The Kubernetes Authors.
+// SPDX-License-Identifier: Apache-2.0
 
-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 config
+package accumulator_test
 
 import (
 	"reflect"
-	"sigs.k8s.io/kustomize/v3/api/resid"
 	"testing"
 
+	"sigs.k8s.io/kustomize/v3/api/builtinconfig"
+	"sigs.k8s.io/kustomize/v3/api/resid"
+	"sigs.k8s.io/kustomize/v3/api/types"
 	"sigs.k8s.io/kustomize/v3/internal/loadertest"
+	. "sigs.k8s.io/kustomize/v3/pkg/accumulator"
 	"sigs.k8s.io/kustomize/v3/pkg/ifc"
 )
 
@@ -155,10 +145,10 @@ func makeLoader(t *testing.T) ifc.Loader {
 }
 
 func TestLoadCRDs(t *testing.T) {
-	nbrs := []NameBackReferences{
+	nbrs := []builtinconfig.NameBackReferences{
 		{
 			Gvk: resid.Gvk{Kind: "Secret", Version: "v1"},
-			FieldSpecs: []FieldSpec{
+			FieldSpecs: []types.FieldSpec{
 				{
 					CreateIfNotPresent: false,
 					Gvk:                resid.Gvk{Kind: "MyKind"},
@@ -168,7 +158,7 @@ func TestLoadCRDs(t *testing.T) {
 		},
 		{
 			Gvk: resid.Gvk{Kind: "Bee", Version: "v1beta1"},
-			FieldSpecs: []FieldSpec{
+			FieldSpecs: []types.FieldSpec{
 				{
 					CreateIfNotPresent: false,
 					Gvk:                resid.Gvk{Kind: "MyKind"},
@@ -178,7 +168,7 @@ func TestLoadCRDs(t *testing.T) {
 		},
 	}
 
-	expectedTc := &TransformerConfig{
+	expectedTc := &builtinconfig.TransformerConfig{
 		NameReference: nbrs,
 	}
 

pkg/accumulator/namereferencetransformer.go

@@ -1,28 +1,28 @@
 // Copyright 2019 The Kubernetes Authors.
 // SPDX-License-Identifier: Apache-2.0
 
-package transformers
+package accumulator
 
 import (
 	"fmt"
 	"log"
+
+	"sigs.k8s.io/kustomize/v3/api/builtinconfig"
 	"sigs.k8s.io/kustomize/v3/api/resid"
-
-	"sigs.k8s.io/kustomize/v3/pkg/resource"
-
+	"sigs.k8s.io/kustomize/v3/api/transform"
 	"sigs.k8s.io/kustomize/v3/pkg/resmap"
-	"sigs.k8s.io/kustomize/v3/pkg/transformers/config"
+	"sigs.k8s.io/kustomize/v3/pkg/resource"
 )
 
 type nameReferenceTransformer struct {
-	backRefs []config.NameBackReferences
+	backRefs []builtinconfig.NameBackReferences
 }
 
 var _ resmap.Transformer = &nameReferenceTransformer{}
 
-// NewNameReferenceTransformer constructs a nameReferenceTransformer
+// newNameReferenceTransformer constructs a nameReferenceTransformer
 // with a given slice of NameBackReferences.
-func NewNameReferenceTransformer(br []config.NameBackReferences) resmap.Transformer {
+func newNameReferenceTransformer(br []builtinconfig.NameBackReferences) resmap.Transformer {
 	if br == nil {
 		log.Fatal("backrefs not expected to be nil")
 	}
@@ -86,7 +86,7 @@ func (o *nameReferenceTransformer) Transform(m resmap.ResMap) error {
 					if candidates == nil {
 						candidates = m.SubsetThatCouldBeReferencedByResource(referrer)
 					}
-					err := MutateField(
+					err := transform.MutateField(
 						referrer.Map(),
 						fSpec.PathSlice(),
 						fSpec.CreateIfNotPresent,

pkg/accumulator/namereferencetransformer_test.go

@@ -1,12 +1,13 @@
 // Copyright 2019 The Kubernetes Authors.
 // SPDX-License-Identifier: Apache-2.0
 
-package transformers
+package accumulator
 
 import (
 	"strings"
 	"testing"
 
+	"sigs.k8s.io/kustomize/v3/api/builtinconfig"
 	"sigs.k8s.io/kustomize/v3/api/resid"
 	"sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct"
 	"sigs.k8s.io/kustomize/v3/pkg/resmap"
@@ -462,7 +463,7 @@ func TestNameReferenceHappyRun(t *testing.T) {
 			},
 		}).ResMap()
 
-	nrt := NewNameReferenceTransformer(defaultTransformerConfig.NameReference)
+	nrt := newNameReferenceTransformer(builtinconfig.MakeDefaultConfig().NameReference)
 	err := nrt.Transform(m)
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
@@ -522,7 +523,7 @@ func TestNameReferenceUnhappyRun(t *testing.T) {
 			expectedErr: "is expected to contain a name field"},
 	}
 
-	nrt := NewNameReferenceTransformer(defaultTransformerConfig.NameReference)
+	nrt := newNameReferenceTransformer(builtinconfig.MakeDefaultConfig().NameReference)
 	for _, test := range tests {
 		err := nrt.Transform(test.resMap)
 		if err == nil {
@@ -580,7 +581,7 @@ func TestNameReferencePersistentVolumeHappyRun(t *testing.T) {
 
 	m1 := resmaptest_test.NewRmBuilder(t, rf).AddR(v1).AddR(c1).ResMap()
 
-	nrt := NewNameReferenceTransformer(defaultTransformerConfig.NameReference)
+	nrt := newNameReferenceTransformer(builtinconfig.MakeDefaultConfig().NameReference)
 	if err := nrt.Transform(m1); err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}
@@ -719,7 +720,7 @@ func TestNameReferenceNamespace(t *testing.T) {
 		ReplaceResource(deploymentMap(ns1, prefixedname, prefixedname, prefixedname)).
 		ReplaceResource(deploymentMap(ns2, suffixedname, suffixedname, suffixedname)).ResMap()
 
-	nrt := NewNameReferenceTransformer(defaultTransformerConfig.NameReference)
+	nrt := newNameReferenceTransformer(builtinconfig.MakeDefaultConfig().NameReference)
 	err := nrt.Transform(m)
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
@@ -882,7 +883,7 @@ func TestNameReferenceClusterWide(t *testing.T) {
 	clusterRole, _ := expected.GetByCurrentId(clusterRoleId)
 	clusterRole.AppendRefBy(clusterRoleBindingId)
 
-	nrt := NewNameReferenceTransformer(defaultTransformerConfig.NameReference)
+	nrt := newNameReferenceTransformer(builtinconfig.MakeDefaultConfig().NameReference)
 	err := nrt.Transform(m)
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
@@ -1010,7 +1011,7 @@ func TestNameReferenceNamespaceTransformation(t *testing.T) {
 	clusterRole, _ := expected.GetByCurrentId(clusterRoleId)
 	clusterRole.AppendRefBy(clusterRoleBindingId)
 
-	nrt := NewNameReferenceTransformer(defaultTransformerConfig.NameReference)
+	nrt := newNameReferenceTransformer(builtinconfig.MakeDefaultConfig().NameReference)
 	err := nrt.Transform(m)
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
@@ -1048,7 +1049,7 @@ func TestNameReferenceCandidateSelection(t *testing.T) {
 		ReplaceResource(deploymentMap("", "p1-deploy1", "p1-cm1-hash", "p1-secret1-hash")).
 		ResMap()
 
-	nrt := NewNameReferenceTransformer(defaultTransformerConfig.NameReference)
+	nrt := newNameReferenceTransformer(builtinconfig.MakeDefaultConfig().NameReference)
 	err := nrt.Transform(m)
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)

pkg/accumulator/refvartransformer.go

@@ -1,42 +1,30 @@
-/*
-Copyright 2018 The Kubernetes Authors.
+// Copyright 2019 The Kubernetes Authors.
+// SPDX-License-Identifier: Apache-2.0
 
-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 transformers
+package accumulator
 
 import (
 	"fmt"
 
+	"sigs.k8s.io/kustomize/v3/api/transform"
+	"sigs.k8s.io/kustomize/v3/api/types"
 	"sigs.k8s.io/kustomize/v3/pkg/expansion"
 	"sigs.k8s.io/kustomize/v3/pkg/resmap"
-	"sigs.k8s.io/kustomize/v3/pkg/transformers/config"
 )
 
-type RefVarTransformer struct {
+type refVarTransformer struct {
 	varMap            map[string]interface{}
 	replacementCounts map[string]int
-	fieldSpecs        []config.FieldSpec
+	fieldSpecs        []types.FieldSpec
 	mappingFunc       func(string) interface{}
 }
 
-// NewRefVarTransformer returns a new RefVarTransformer
+// newRefVarTransformer returns a new refVarTransformer
 // that replaces $(VAR) style variables with values.
 // The fieldSpecs are the places to look for occurrences of $(VAR).
-func NewRefVarTransformer(
-	varMap map[string]interface{}, fs []config.FieldSpec) *RefVarTransformer {
-	return &RefVarTransformer{
+func newRefVarTransformer(
+	varMap map[string]interface{}, fs []types.FieldSpec) *refVarTransformer {
+	return &refVarTransformer{
 		varMap:     varMap,
 		fieldSpecs: fs,
 	}
@@ -46,7 +34,7 @@ func NewRefVarTransformer(
 // embedded instances of $VAR style variables, e.g. a container command string.
 // The function returns the string with the variables expanded to their final
 // values.
-func (rv *RefVarTransformer) replaceVars(in interface{}) (interface{}, error) {
+func (rv *refVarTransformer) replaceVars(in interface{}) (interface{}, error) {
 	switch vt := in.(type) {
 	case []interface{}:
 		var xs []interface{}
@@ -90,7 +78,7 @@ func (rv *RefVarTransformer) replaceVars(in interface{}) (interface{}, error) {
 
 // UnusedVars returns slice of Var names that were unused
 // after a Transform run.
-func (rv *RefVarTransformer) UnusedVars() []string {
+func (rv *refVarTransformer) UnusedVars() []string {
 	var unused []string
 	for k := range rv.varMap {
 		_, ok := rv.replacementCounts[k]
@@ -102,14 +90,14 @@ func (rv *RefVarTransformer) UnusedVars() []string {
 }
 
 // Transform replaces $(VAR) style variables with values.
-func (rv *RefVarTransformer) Transform(m resmap.ResMap) error {
+func (rv *refVarTransformer) Transform(m resmap.ResMap) error {
 	rv.replacementCounts = make(map[string]int)
 	rv.mappingFunc = expansion.MappingFuncFor(
 		rv.replacementCounts, rv.varMap)
 	for _, res := range m.Resources() {
 		for _, fieldSpec := range rv.fieldSpecs {
 			if res.OrgId().IsSelected(&fieldSpec.Gvk) {
-				if err := MutateField(
+				if err := transform.MutateField(
 					res.Map(), fieldSpec.PathSlice(),
 					false, rv.replaceVars); err != nil {
 					return err

pkg/accumulator/refvartransformer_test.go

@@ -1,22 +1,24 @@
 // Copyright 2019 The Kubernetes Authors.
 // SPDX-License-Identifier: Apache-2.0
 
-package transformers
+package accumulator
 
 import (
 	"reflect"
-	"sigs.k8s.io/kustomize/v3/api/resid"
 	"testing"
 
+	"sigs.k8s.io/kustomize/v3/api/resid"
+	"sigs.k8s.io/kustomize/v3/api/types"
+	"sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct"
 	"sigs.k8s.io/kustomize/v3/pkg/resmap"
 	"sigs.k8s.io/kustomize/v3/pkg/resmaptest"
-	"sigs.k8s.io/kustomize/v3/pkg/transformers/config"
+	"sigs.k8s.io/kustomize/v3/pkg/resource"
 )
 
-func TestVarRef(t *testing.T) {
+func TestRefVarTransformer(t *testing.T) {
 	type given struct {
 		varMap map[string]interface{}
-		fs     []config.FieldSpec
+		fs     []types.FieldSpec
 		res    resmap.ResMap
 	}
 	type expected struct {
@@ -37,14 +39,15 @@ func TestVarRef(t *testing.T) {
 					"BAZ": int64(5),
 					"BOO": true,
 				},
-				fs: []config.FieldSpec{
+				fs: []types.FieldSpec{
 					{Gvk: resid.Gvk{Version: "v1", Kind: "ConfigMap"}, Path: "data/map"},
 					{Gvk: resid.Gvk{Version: "v1", Kind: "ConfigMap"}, Path: "data/slice"},
 					{Gvk: resid.Gvk{Version: "v1", Kind: "ConfigMap"}, Path: "data/interface"},
 					{Gvk: resid.Gvk{Version: "v1", Kind: "ConfigMap"}, Path: "data/nil"},
 					{Gvk: resid.Gvk{Version: "v1", Kind: "ConfigMap"}, Path: "data/num"},
 				},
-				res: resmaptest_test.NewRmBuilder(t, rf).
+				res: resmaptest_test.NewRmBuilder(
+					t, resource.NewFactory(kunstruct.NewKunstructuredFactoryImpl())).
 					Add(map[string]interface{}{
 						"apiVersion": "v1",
 						"kind":       "ConfigMap",
@@ -75,7 +78,8 @@ func TestVarRef(t *testing.T) {
 						}}).ResMap(),
 			},
 			expected: expected{
-				res: resmaptest_test.NewRmBuilder(t, rf).
+				res: resmaptest_test.NewRmBuilder(
+					t, resource.NewFactory(kunstruct.NewKunstructuredFactoryImpl())).
 					Add(map[string]interface{}{
 						"apiVersion": "v1",
 						"kind":       "ConfigMap",
@@ -112,7 +116,7 @@ func TestVarRef(t *testing.T) {
 	for _, tc := range testCases {
 		t.Run(tc.description, func(t *testing.T) {
 			// arrange
-			tr := NewRefVarTransformer(tc.given.varMap, tc.given.fs)
+			tr := newRefVarTransformer(tc.given.varMap, tc.given.fs)
 
 			// act
 			err := tr.Transform(tc.given.res)

pkg/accumulator/resaccumulator.go

@@ -8,11 +8,10 @@ import (
 	"log"
 	"strings"
 
+	"sigs.k8s.io/kustomize/v3/api/builtinconfig"
 	"sigs.k8s.io/kustomize/v3/api/resid"
 	"sigs.k8s.io/kustomize/v3/api/types"
 	"sigs.k8s.io/kustomize/v3/pkg/resmap"
-	"sigs.k8s.io/kustomize/v3/pkg/transformers"
-	"sigs.k8s.io/kustomize/v3/pkg/transformers/config"
 )
 
 // ResAccumulator accumulates resources and the rules
@@ -20,14 +19,14 @@ import (
 // plus stuff needed to modify the ResMap.
 type ResAccumulator struct {
 	resMap  resmap.ResMap
-	tConfig *config.TransformerConfig
+	tConfig *builtinconfig.TransformerConfig
 	varSet  types.VarSet
 }
 
 func MakeEmptyAccumulator() *ResAccumulator {
 	ra := &ResAccumulator{}
 	ra.resMap = resmap.New()
-	ra.tConfig = &config.TransformerConfig{}
+	ra.tConfig = &builtinconfig.TransformerConfig{}
 	ra.varSet = types.NewVarSet()
 	return ra
 }
@@ -53,12 +52,12 @@ func (ra *ResAccumulator) AbsorbAll(
 }
 
 func (ra *ResAccumulator) MergeConfig(
-	tConfig *config.TransformerConfig) (err error) {
+	tConfig *builtinconfig.TransformerConfig) (err error) {
 	ra.tConfig, err = ra.tConfig.Merge(tConfig)
 	return err
 }
 
-func (ra *ResAccumulator) GetTransformerConfig() *config.TransformerConfig {
+func (ra *ResAccumulator) GetTransformerConfig() *builtinconfig.TransformerConfig {
 	return ra.tConfig
 }
 
@@ -147,7 +146,7 @@ func (ra *ResAccumulator) ResolveVars() error {
 	if len(replacementMap) == 0 {
 		return nil
 	}
-	t := transformers.NewRefVarTransformer(
+	t := newRefVarTransformer(
 		replacementMap, ra.tConfig.VarReference)
 	err = ra.Transform(t)
 	if len(t.UnusedVars()) > 0 {
@@ -162,6 +161,6 @@ func (ra *ResAccumulator) FixBackReferences() (err error) {
 	if ra.tConfig.NameReference == nil {
 		return nil
 	}
-	return ra.Transform(transformers.NewNameReferenceTransformer(
+	return ra.Transform(newNameReferenceTransformer(
 		ra.tConfig.NameReference))
 }

pkg/accumulator/resaccumulator_test.go

@@ -10,6 +10,7 @@ import (
 	"strings"
 	"testing"
 
+	"sigs.k8s.io/kustomize/v3/api/builtinconfig"
 	"sigs.k8s.io/kustomize/v3/api/resid"
 	"sigs.k8s.io/kustomize/v3/api/types"
 	"sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct"
@@ -17,12 +18,11 @@ import (
 	"sigs.k8s.io/kustomize/v3/pkg/resmap"
 	"sigs.k8s.io/kustomize/v3/pkg/resmaptest"
 	"sigs.k8s.io/kustomize/v3/pkg/resource"
-	"sigs.k8s.io/kustomize/v3/pkg/transformers/config"
 )
 
 func makeResAccumulator(t *testing.T) (*ResAccumulator, *resource.Factory) {
 	ra := MakeEmptyAccumulator()
-	err := ra.MergeConfig(config.MakeDefaultConfig())
+	err := ra.MergeConfig(builtinconfig.MakeDefaultConfig())
 	if err != nil {
 		t.Fatalf("unexpected err: %v", err)
 	}

pkg/target/kusttarget.go

@@ -10,17 +10,17 @@ import (
 	"encoding/json"
 	"fmt"
 	"log"
+	"sigs.k8s.io/kustomize/v3/api/transform"
 	"strings"
 
 	"github.com/pkg/errors"
+	"sigs.k8s.io/kustomize/v3/api/builtinconfig"
 	"sigs.k8s.io/kustomize/v3/api/types"
 	"sigs.k8s.io/kustomize/v3/pkg/accumulator"
 	"sigs.k8s.io/kustomize/v3/pkg/ifc"
 	"sigs.k8s.io/kustomize/v3/pkg/pgmconfig"
 	"sigs.k8s.io/kustomize/v3/pkg/plugins"
 	"sigs.k8s.io/kustomize/v3/pkg/resmap"
-	"sigs.k8s.io/kustomize/v3/pkg/transformers"
-	"sigs.k8s.io/kustomize/v3/pkg/transformers/config"
 	"sigs.k8s.io/kustomize/v3/plugin/builtin"
 	"sigs.k8s.io/yaml"
 )
@@ -216,7 +216,7 @@ func (kt *KustTarget) AccumulateTarget() (
 	if err != nil {
 		return nil, errors.Wrap(err, "accumulating resources")
 	}
-	tConfig, err := config.MakeTransformerConfig(
+	tConfig, err := builtinconfig.MakeTransformerConfig(
 		kt.ldr, kt.kustomization.Configurations)
 	if err != nil {
 		return nil, err
@@ -226,7 +226,7 @@ func (kt *KustTarget) AccumulateTarget() (
 		return nil, errors.Wrapf(
 			err, "merging config %v", tConfig)
 	}
-	crdTc, err := config.LoadConfigFromCRDs(kt.ldr, kt.kustomization.Crds)
+	crdTc, err := accumulator.LoadConfigFromCRDs(kt.ldr, kt.kustomization.Crds)
 	if err != nil {
 		return nil, errors.Wrapf(
 			err, "loading CRDs %v", kt.kustomization.Crds)
@@ -300,7 +300,7 @@ func (kt *KustTarget) runTransformers(ra *accumulator.ResAccumulator) error {
 		return err
 	}
 	r = append(r, lts...)
-	t := transformers.NewMultiTransformer(r)
+	t := transform.NewMultiTransformer(r)
 	return ra.Transform(t)
 }
 

pkg/target/kusttarget_configplugin.go

@@ -4,10 +4,10 @@
 package target
 
 import (
+	"sigs.k8s.io/kustomize/v3/api/builtinconfig"
 	"sigs.k8s.io/kustomize/v3/api/types"
 	"sigs.k8s.io/kustomize/v3/pkg/plugins"
 	"sigs.k8s.io/kustomize/v3/pkg/resmap"
-	"sigs.k8s.io/kustomize/v3/pkg/transformers/config"
 )
 
 // Functions dedicated to configuring the builtin
@@ -42,7 +42,7 @@ func (kt *KustTarget) configureBuiltinGenerators() (
 }
 
 func (kt *KustTarget) configureBuiltinTransformers(
-	tc *config.TransformerConfig) (
+	tc *builtinconfig.TransformerConfig) (
 	result []resmap.Transformer, err error) {
 	for _, bpt := range []plugins.BuiltinPluginType{
 		plugins.PatchStrategicMergeTransformer,
@@ -120,13 +120,13 @@ var transformerConfigurators = map[plugins.BuiltinPluginType]func(
 	kt *KustTarget,
 	bpt plugins.BuiltinPluginType,
 	f tFactory,
-	tc *config.TransformerConfig) (result []resmap.Transformer, err error){
+	tc *builtinconfig.TransformerConfig) (result []resmap.Transformer, err error){
 	plugins.NamespaceTransformer: func(
-		kt *KustTarget, bpt plugins.BuiltinPluginType, f tFactory, tc *config.TransformerConfig) (
+		kt *KustTarget, bpt plugins.BuiltinPluginType, f tFactory, tc *builtinconfig.TransformerConfig) (
 		result []resmap.Transformer, err error) {
 		var c struct {
 			types.ObjectMeta `json:"metadata,omitempty" yaml:"metadata,omitempty"`
-			FieldSpecs       []config.FieldSpec
+			FieldSpecs       []types.FieldSpec
 		}
 		c.Namespace = kt.kustomization.Namespace
 		c.FieldSpecs = tc.NameSpace
@@ -140,7 +140,7 @@ var transformerConfigurators = map[plugins.BuiltinPluginType]func(
 	},
 
 	plugins.PatchJson6902Transformer: func(
-		kt *KustTarget, bpt plugins.BuiltinPluginType, f tFactory, _ *config.TransformerConfig) (
+		kt *KustTarget, bpt plugins.BuiltinPluginType, f tFactory, _ *builtinconfig.TransformerConfig) (
 		result []resmap.Transformer, err error) {
 		var c struct {
 			Target types.PatchTarget `json:"target,omitempty" yaml:"target,omitempty"`
@@ -161,7 +161,7 @@ var transformerConfigurators = map[plugins.BuiltinPluginType]func(
 		return
 	},
 	plugins.PatchStrategicMergeTransformer: func(
-		kt *KustTarget, bpt plugins.BuiltinPluginType, f tFactory, _ *config.TransformerConfig) (
+		kt *KustTarget, bpt plugins.BuiltinPluginType, f tFactory, _ *builtinconfig.TransformerConfig) (
 		result []resmap.Transformer, err error) {
 		if len(kt.kustomization.PatchesStrategicMerge) == 0 {
 			return
@@ -180,7 +180,7 @@ var transformerConfigurators = map[plugins.BuiltinPluginType]func(
 		return
 	},
 	plugins.PatchTransformer: func(
-		kt *KustTarget, bpt plugins.BuiltinPluginType, f tFactory, _ *config.TransformerConfig) (
+		kt *KustTarget, bpt plugins.BuiltinPluginType, f tFactory, _ *builtinconfig.TransformerConfig) (
 		result []resmap.Transformer, err error) {
 		if len(kt.kustomization.Patches) == 0 {
 			return
@@ -204,11 +204,11 @@ var transformerConfigurators = map[plugins.BuiltinPluginType]func(
 		return
 	},
 	plugins.LabelTransformer: func(
-		kt *KustTarget, bpt plugins.BuiltinPluginType, f tFactory, tc *config.TransformerConfig) (
+		kt *KustTarget, bpt plugins.BuiltinPluginType, f tFactory, tc *builtinconfig.TransformerConfig) (
 		result []resmap.Transformer, err error) {
 		var c struct {
 			Labels     map[string]string
-			FieldSpecs []config.FieldSpec
+			FieldSpecs []types.FieldSpec
 		}
 		c.Labels = kt.kustomization.CommonLabels
 		c.FieldSpecs = tc.CommonLabels
@@ -221,11 +221,11 @@ var transformerConfigurators = map[plugins.BuiltinPluginType]func(
 		return
 	},
 	plugins.AnnotationsTransformer: func(
-		kt *KustTarget, bpt plugins.BuiltinPluginType, f tFactory, tc *config.TransformerConfig) (
+		kt *KustTarget, bpt plugins.BuiltinPluginType, f tFactory, tc *builtinconfig.TransformerConfig) (
 		result []resmap.Transformer, err error) {
 		var c struct {
 			Annotations map[string]string
-			FieldSpecs  []config.FieldSpec
+			FieldSpecs  []types.FieldSpec
 		}
 		c.Annotations = kt.kustomization.CommonAnnotations
 		c.FieldSpecs = tc.CommonAnnotations
@@ -238,12 +238,12 @@ var transformerConfigurators = map[plugins.BuiltinPluginType]func(
 		return
 	},
 	plugins.PrefixSuffixTransformer: func(
-		kt *KustTarget, bpt plugins.BuiltinPluginType, f tFactory, tc *config.TransformerConfig) (
+		kt *KustTarget, bpt plugins.BuiltinPluginType, f tFactory, tc *builtinconfig.TransformerConfig) (
 		result []resmap.Transformer, err error) {
 		var c struct {
 			Prefix     string
 			Suffix     string
-			FieldSpecs []config.FieldSpec
+			FieldSpecs []types.FieldSpec
 		}
 		c.Prefix = kt.kustomization.NamePrefix
 		c.Suffix = kt.kustomization.NameSuffix
@@ -257,11 +257,11 @@ var transformerConfigurators = map[plugins.BuiltinPluginType]func(
 		return
 	},
 	plugins.ImageTagTransformer: func(
-		kt *KustTarget, bpt plugins.BuiltinPluginType, f tFactory, tc *config.TransformerConfig) (
+		kt *KustTarget, bpt plugins.BuiltinPluginType, f tFactory, tc *builtinconfig.TransformerConfig) (
 		result []resmap.Transformer, err error) {
 		var c struct {
 			ImageTag   types.Image
-			FieldSpecs []config.FieldSpec
+			FieldSpecs []types.FieldSpec
 		}
 		for _, args := range kt.kustomization.Images {
 			c.ImageTag = args
@@ -276,11 +276,11 @@ var transformerConfigurators = map[plugins.BuiltinPluginType]func(
 		return
 	},
 	plugins.ReplicaCountTransformer: func(
-		kt *KustTarget, bpt plugins.BuiltinPluginType, f tFactory, tc *config.TransformerConfig) (
+		kt *KustTarget, bpt plugins.BuiltinPluginType, f tFactory, tc *builtinconfig.TransformerConfig) (
 		result []resmap.Transformer, err error) {
 		var c struct {
 			Replica    types.Replica
-			FieldSpecs []config.FieldSpec
+			FieldSpecs []types.FieldSpec
 		}
 		for _, args := range kt.kustomization.Replicas {
 			c.Replica = args

pkg/transformers/config/defaultconfig/images.go

@@ -1,23 +0,0 @@
-/*
-Copyright 2019 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 defaultconfig
-
-const (
-	// imageFieldSpecs is left empty since `containers` and `initContainers`
-	// of *ANY* kind in *ANY* path are builtin supported in code
-	imagesFieldSpecs = ``
-)

pkg/transformers/config/defaultconfig/nameprefix.go

@@ -1,24 +0,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 defaultconfig
-
-const (
-	namePrefixFieldSpecs = `
-namePrefix:
-- path: metadata/name
-`
-)

pkg/transformers/config/defaultconfig/namespace.go

@@ -1,29 +0,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 defaultconfig
-
-const (
-	namespaceFieldSpecs = `
-namespace:
-- path: metadata/namespace
-  create: true
-- path: subjects
-  kind: RoleBinding
-- path: subjects
-  kind: ClusterRoleBinding
-`
-)

pkg/transformers/config/factory.go

@@ -1,87 +0,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 config
-
-import (
-	"log"
-
-	"sigs.k8s.io/kustomize/v3/pkg/ifc"
-	"sigs.k8s.io/yaml"
-)
-
-// Factory makes instances of TransformerConfig.
-type Factory struct {
-	ldr ifc.Loader
-}
-
-// MakeTransformerConfig returns a merger of custom config,
-// if any, with default config.
-func MakeTransformerConfig(
-	ldr ifc.Loader, paths []string) (*TransformerConfig, error) {
-	t1 := MakeDefaultConfig()
-	if len(paths) == 0 {
-		return t1, nil
-	}
-	t2, err := NewFactory(ldr).FromFiles(paths)
-	if err != nil {
-		return nil, err
-	}
-	return t1.Merge(t2)
-}
-
-func NewFactory(l ifc.Loader) *Factory {
-	return &Factory{ldr: l}
-}
-
-func (tf *Factory) loader() ifc.Loader {
-	if tf.ldr.(ifc.Loader) == nil {
-		log.Fatal("no loader")
-	}
-	return tf.ldr
-}
-
-// FromFiles returns a TranformerConfig object from a list of files
-func (tf *Factory) FromFiles(
-	paths []string) (*TransformerConfig, error) {
-	result := &TransformerConfig{}
-	for _, path := range paths {
-		data, err := tf.loader().Load(path)
-		if err != nil {
-			return nil, err
-		}
-		t, err := makeTransformerConfigFromBytes(data)
-		if err != nil {
-			return nil, err
-		}
-		result, err = result.Merge(t)
-		if err != nil {
-			return nil, err
-		}
-	}
-	return result, nil
-}
-
-// makeTransformerConfigFromBytes returns a TransformerConfig object from bytes
-func makeTransformerConfigFromBytes(data []byte) (*TransformerConfig, error) {
-	var t TransformerConfig
-	err := yaml.Unmarshal(data, &t)
-	if err != nil {
-		return nil, err
-	}
-	t.sortFields()
-	return &t, nil
-}

pkg/transformers/config/transformerconfig.go

@@ -1,146 +0,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 config provides the functions to load default or user provided configurations
-// for different transformers
-package config
-
-import (
-	"log"
-	"sort"
-
-	"sigs.k8s.io/kustomize/v3/pkg/transformers/config/defaultconfig"
-)
-
-// TransformerConfig holds the data needed to perform transformations.
-type TransformerConfig struct {
-	NamePrefix        fsSlice  `json:"namePrefix,omitempty" yaml:"namePrefix,omitempty"`
-	NameSuffix        fsSlice  `json:"nameSuffix,omitempty" yaml:"nameSuffix,omitempty"`
-	NameSpace         fsSlice  `json:"namespace,omitempty" yaml:"namespace,omitempty"`
-	CommonLabels      fsSlice  `json:"commonLabels,omitempty" yaml:"commonLabels,omitempty"`
-	CommonAnnotations fsSlice  `json:"commonAnnotations,omitempty" yaml:"commonAnnotations,omitempty"`
-	NameReference     nbrSlice `json:"nameReference,omitempty" yaml:"nameReference,omitempty"`
-	VarReference      fsSlice  `json:"varReference,omitempty" yaml:"varReference,omitempty"`
-	Images            fsSlice  `json:"images,omitempty" yaml:"images,omitempty"`
-	Replicas          fsSlice  `json:"replicas,omitempty" yaml:"replicas,omitempty"`
-}
-
-// MakeEmptyConfig returns an empty TransformerConfig object
-func MakeEmptyConfig() *TransformerConfig {
-	return &TransformerConfig{}
-}
-
-// MakeDefaultConfig returns a default TransformerConfig.
-func MakeDefaultConfig() *TransformerConfig {
-	c, err := makeTransformerConfigFromBytes(
-		defaultconfig.GetDefaultFieldSpecs())
-	if err != nil {
-		log.Fatalf("Unable to make default transformconfig: %v", err)
-	}
-	return c
-}
-
-// sortFields provides determinism in logging, tests, etc.
-func (t *TransformerConfig) sortFields() {
-	sort.Sort(t.NamePrefix)
-	sort.Sort(t.NameSpace)
-	sort.Sort(t.CommonLabels)
-	sort.Sort(t.CommonAnnotations)
-	sort.Sort(t.NameReference)
-	sort.Sort(t.VarReference)
-	sort.Sort(t.Images)
-	sort.Sort(t.Replicas)
-}
-
-// AddPrefixFieldSpec adds a FieldSpec to NamePrefix
-func (t *TransformerConfig) AddPrefixFieldSpec(fs FieldSpec) (err error) {
-	t.NamePrefix, err = t.NamePrefix.mergeOne(fs)
-	return err
-}
-
-// AddSuffixFieldSpec adds a FieldSpec to NameSuffix
-func (t *TransformerConfig) AddSuffixFieldSpec(fs FieldSpec) (err error) {
-	t.NameSuffix, err = t.NameSuffix.mergeOne(fs)
-	return err
-}
-
-// AddLabelFieldSpec adds a FieldSpec to CommonLabels
-func (t *TransformerConfig) AddLabelFieldSpec(fs FieldSpec) (err error) {
-	t.CommonLabels, err = t.CommonLabels.mergeOne(fs)
-	return err
-}
-
-// AddAnnotationFieldSpec adds a FieldSpec to CommonAnnotations
-func (t *TransformerConfig) AddAnnotationFieldSpec(fs FieldSpec) (err error) {
-	t.CommonAnnotations, err = t.CommonAnnotations.mergeOne(fs)
-	return err
-}
-
-// AddNamereferenceFieldSpec adds a NameBackReferences to NameReference
-func (t *TransformerConfig) AddNamereferenceFieldSpec(
-	nbrs NameBackReferences) (err error) {
-	t.NameReference, err = t.NameReference.mergeOne(nbrs)
-	return err
-}
-
-// Merge merges two TransformerConfigs objects into
-// a new TransformerConfig object
-func (t *TransformerConfig) Merge(input *TransformerConfig) (
-	merged *TransformerConfig, err error) {
-	if input == nil {
-		return t, nil
-	}
-	merged = &TransformerConfig{}
-	merged.NamePrefix, err = t.NamePrefix.mergeAll(input.NamePrefix)
-	if err != nil {
-		return nil, err
-	}
-	merged.NameSuffix, err = t.NameSuffix.mergeAll(input.NameSuffix)
-	if err != nil {
-		return nil, err
-	}
-	merged.NameSpace, err = t.NameSpace.mergeAll(input.NameSpace)
-	if err != nil {
-		return nil, err
-	}
-	merged.CommonAnnotations, err = t.CommonAnnotations.mergeAll(
-		input.CommonAnnotations)
-	if err != nil {
-		return nil, err
-	}
-	merged.CommonLabels, err = t.CommonLabels.mergeAll(input.CommonLabels)
-	if err != nil {
-		return nil, err
-	}
-	merged.VarReference, err = t.VarReference.mergeAll(input.VarReference)
-	if err != nil {
-		return nil, err
-	}
-	merged.NameReference, err = t.NameReference.mergeAll(input.NameReference)
-	if err != nil {
-		return nil, err
-	}
-	merged.Images, err = t.Images.mergeAll(input.Images)
-	if err != nil {
-		return nil, err
-	}
-	merged.Replicas, err = t.Replicas.mergeAll(input.Replicas)
-	if err != nil {
-		return nil, err
-	}
-	merged.sortFields()
-	return merged, nil
-}

pkg/transformers/doc.go

@@ -1,9 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-// Utilities to aid transformer plugins.
-//
-// TODO: Push remaining code down into the plugins
-// or into an appropriately named utility package.
-// This package made more sense in the pre-plugin days.
-package transformers

pkg/transformers/nooptransformer.go

@@ -1,34 +0,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 transformers
-
-import "sigs.k8s.io/kustomize/v3/pkg/resmap"
-
-// noOpTransformer contains a no-op transformer.
-type noOpTransformer struct{}
-
-var _ resmap.Transformer = &noOpTransformer{}
-
-// NewNoOpTransformer constructs a noOpTransformer.
-func NewNoOpTransformer() resmap.Transformer {
-	return &noOpTransformer{}
-}
-
-// Transform does nothing.
-func (o *noOpTransformer) Transform(_ resmap.ResMap) error {
-	return nil
-}

plugin/builtin/AnnotationsTransformer.go

@@ -2,16 +2,16 @@
 package builtin
 
 import (
+	"sigs.k8s.io/kustomize/v3/api/transform"
+	"sigs.k8s.io/kustomize/v3/api/types"
 	"sigs.k8s.io/kustomize/v3/pkg/resmap"
-	"sigs.k8s.io/kustomize/v3/pkg/transformers"
-	"sigs.k8s.io/kustomize/v3/pkg/transformers/config"
 	"sigs.k8s.io/yaml"
 )
 
 // Add the given annotations to the given field specifications.
 type AnnotationsTransformerPlugin struct {
-	Annotations map[string]string  `json:"annotations,omitempty" yaml:"annotations,omitempty"`
-	FieldSpecs  []config.FieldSpec `json:"fieldSpecs,omitempty" yaml:"fieldSpecs,omitempty"`
+	Annotations map[string]string `json:"annotations,omitempty" yaml:"annotations,omitempty"`
+	FieldSpecs  []types.FieldSpec `json:"fieldSpecs,omitempty" yaml:"fieldSpecs,omitempty"`
 }
 
 func (p *AnnotationsTransformerPlugin) Config(
@@ -22,7 +22,7 @@ func (p *AnnotationsTransformerPlugin) Config(
 }
 
 func (p *AnnotationsTransformerPlugin) Transform(m resmap.ResMap) error {
-	t, err := transformers.NewMapTransformer(
+	t, err := transform.NewMapTransformer(
 		p.FieldSpecs,
 		p.Annotations,
 	)

plugin/builtin/ImageTagTransformer.go

@@ -4,20 +4,19 @@ package builtin
 import (
 	"fmt"
 	"regexp"
+	"sigs.k8s.io/kustomize/v3/api/transform"
 	"sigs.k8s.io/kustomize/v3/api/types"
 	"strings"
 
 	"sigs.k8s.io/kustomize/v3/pkg/resmap"
-	"sigs.k8s.io/kustomize/v3/pkg/transformers"
-	"sigs.k8s.io/kustomize/v3/pkg/transformers/config"
 	"sigs.k8s.io/yaml"
 )
 
 // Find matching image declarations and replace
 // the name, tag and/or digest.
 type ImageTagTransformerPlugin struct {
-	ImageTag   types.Image        `json:"imageTag,omitempty" yaml:"imageTag,omitempty"`
-	FieldSpecs []config.FieldSpec `json:"fieldSpecs,omitempty" yaml:"fieldSpecs,omitempty"`
+	ImageTag   types.Image       `json:"imageTag,omitempty" yaml:"imageTag,omitempty"`
+	FieldSpecs []types.FieldSpec `json:"fieldSpecs,omitempty" yaml:"fieldSpecs,omitempty"`
 }
 
 func (p *ImageTagTransformerPlugin) Config(
@@ -33,7 +32,7 @@ func (p *ImageTagTransformerPlugin) Transform(m resmap.ResMap) error {
 			if !r.OrgId().IsSelected(&path.Gvk) {
 				continue
 			}
-			err := transformers.MutateField(
+			err := transform.MutateField(
 				r.Map(), path.PathSlice(), false, p.mutateImage)
 			if err != nil {
 				return err

plugin/builtin/LabelTransformer.go

@@ -2,16 +2,16 @@
 package builtin
 
 import (
+	"sigs.k8s.io/kustomize/v3/api/transform"
+	"sigs.k8s.io/kustomize/v3/api/types"
 	"sigs.k8s.io/kustomize/v3/pkg/resmap"
-	"sigs.k8s.io/kustomize/v3/pkg/transformers"
-	"sigs.k8s.io/kustomize/v3/pkg/transformers/config"
 	"sigs.k8s.io/yaml"
 )
 
 // Add the given labels to the given field specifications.
 type LabelTransformerPlugin struct {
-	Labels     map[string]string  `json:"labels,omitempty" yaml:"labels,omitempty"`
-	FieldSpecs []config.FieldSpec `json:"fieldSpecs,omitempty" yaml:"fieldSpecs,omitempty"`
+	Labels     map[string]string `json:"labels,omitempty" yaml:"labels,omitempty"`
+	FieldSpecs []types.FieldSpec `json:"fieldSpecs,omitempty" yaml:"fieldSpecs,omitempty"`
 }
 
 func (p *LabelTransformerPlugin) Config(
@@ -22,7 +22,7 @@ func (p *LabelTransformerPlugin) Config(
 }
 
 func (p *LabelTransformerPlugin) Transform(m resmap.ResMap) error {
-	t, err := transformers.NewMapTransformer(
+	t, err := transform.NewMapTransformer(
 		p.FieldSpecs,
 		p.Labels,
 	)

plugin/builtin/NamespaceTransformer.go

@@ -3,20 +3,19 @@ package builtin
 
 import (
 	"fmt"
+	"sigs.k8s.io/kustomize/v3/api/transform"
 
 	"sigs.k8s.io/kustomize/v3/api/resid"
 	"sigs.k8s.io/kustomize/v3/api/types"
 	"sigs.k8s.io/kustomize/v3/pkg/resmap"
 	"sigs.k8s.io/kustomize/v3/pkg/resource"
-	"sigs.k8s.io/kustomize/v3/pkg/transformers"
-	"sigs.k8s.io/kustomize/v3/pkg/transformers/config"
 	"sigs.k8s.io/yaml"
 )
 
 // Change or set the namespace of non-cluster level resources.
 type NamespaceTransformerPlugin struct {
 	types.ObjectMeta `json:"metadata,omitempty" yaml:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
-	FieldSpecs       []config.FieldSpec `json:"fieldSpecs,omitempty" yaml:"fieldSpecs,omitempty"`
+	FieldSpecs       []types.FieldSpec `json:"fieldSpecs,omitempty" yaml:"fieldSpecs,omitempty"`
 }
 
 func (p *NamespaceTransformerPlugin) Config(
@@ -40,7 +39,7 @@ func (p *NamespaceTransformerPlugin) Transform(m resmap.ResMap) error {
 		applicableFs := p.applicableFieldSpecs(id)
 
 		for _, fs := range applicableFs {
-			err := transformers.MutateField(
+			err := transform.MutateField(
 				r.Map(), fs.PathSlice(), fs.CreateIfNotPresent,
 				p.changeNamespace(r))
 			if err != nil {
@@ -62,8 +61,8 @@ const metaNamespace = "metadata/namespace"
 // all objects have it, even "ClusterKind" objects
 // that don't exist in a namespace (the Namespace
 // object itself doesn't live in a namespace).
-func (p *NamespaceTransformerPlugin) applicableFieldSpecs(id resid.ResId) []config.FieldSpec {
-	var res []config.FieldSpec
+func (p *NamespaceTransformerPlugin) applicableFieldSpecs(id resid.ResId) []types.FieldSpec {
+	var res []types.FieldSpec
 	for _, fs := range p.FieldSpecs {
 		if id.IsSelected(&fs.Gvk) && (fs.Path != metaNamespace || (fs.Path == metaNamespace && id.IsNamespaceableKind())) {
 			res = append(res, fs)

plugin/builtin/PrefixSuffixTransformer.go

@@ -4,23 +4,23 @@ package builtin
 import (
 	"errors"
 	"fmt"
+	"sigs.k8s.io/kustomize/v3/api/transform"
+	"sigs.k8s.io/kustomize/v3/api/types"
 
 	"sigs.k8s.io/kustomize/v3/api/resid"
 	"sigs.k8s.io/kustomize/v3/pkg/resmap"
-	"sigs.k8s.io/kustomize/v3/pkg/transformers"
-	"sigs.k8s.io/kustomize/v3/pkg/transformers/config"
 	"sigs.k8s.io/yaml"
 )
 
 // Add the given prefix and suffix to the field.
 type PrefixSuffixTransformerPlugin struct {
-	Prefix     string             `json:"prefix,omitempty" yaml:"prefix,omitempty"`
-	Suffix     string             `json:"suffix,omitempty" yaml:"suffix,omitempty"`
-	FieldSpecs []config.FieldSpec `json:"fieldSpecs,omitempty" yaml:"fieldSpecs,omitempty"`
+	Prefix     string            `json:"prefix,omitempty" yaml:"prefix,omitempty"`
+	Suffix     string            `json:"suffix,omitempty" yaml:"suffix,omitempty"`
+	FieldSpecs []types.FieldSpec `json:"fieldSpecs,omitempty" yaml:"fieldSpecs,omitempty"`
 }
 
 // Not placed in a file yet due to lack of demand.
-var prefixSuffixFieldSpecsToSkip = []config.FieldSpec{
+var prefixSuffixFieldSpecsToSkip = []types.FieldSpec{
 	{
 		Gvk: resid.Gvk{Kind: "CustomResourceDefinition"},
 	},
@@ -79,7 +79,7 @@ func (p *PrefixSuffixTransformerPlugin) Transform(m resmap.ResMap) error {
 			// the addPrefixSuffix method will not
 			// change the name if both the prefix and suffix
 			// are empty.
-			err := transformers.MutateField(
+			err := transform.MutateField(
 				r.Map(),
 				path.PathSlice(),
 				path.CreateIfNotPresent,
@@ -92,7 +92,7 @@ func (p *PrefixSuffixTransformerPlugin) Transform(m resmap.ResMap) error {
 	return nil
 }
 
-func smellsLikeANameChange(fs *config.FieldSpec) bool {
+func smellsLikeANameChange(fs *types.FieldSpec) bool {
 	return fs.Path == "metadata/name"
 }
 

plugin/builtin/ReplicaCountTransformer.go

@@ -3,20 +3,19 @@ package builtin
 
 import (
 	"fmt"
+	"sigs.k8s.io/kustomize/v3/api/transform"
 
 	"sigs.k8s.io/kustomize/v3/api/resid"
 	"sigs.k8s.io/kustomize/v3/api/types"
 	"sigs.k8s.io/kustomize/v3/pkg/resmap"
-	"sigs.k8s.io/kustomize/v3/pkg/transformers"
-	"sigs.k8s.io/kustomize/v3/pkg/transformers/config"
 	"sigs.k8s.io/yaml"
 )
 
 // Find matching replicas declarations and replace the count.
 // Eases the kustomization configuration of replica changes.
 type ReplicaCountTransformerPlugin struct {
-	Replica    types.Replica      `json:"replica,omitempty" yaml:"replica,omitempty"`
-	FieldSpecs []config.FieldSpec `json:"fieldSpecs,omitempty" yaml:"fieldSpecs,omitempty"`
+	Replica    types.Replica     `json:"replica,omitempty" yaml:"replica,omitempty"`
+	FieldSpecs []types.FieldSpec `json:"fieldSpecs,omitempty" yaml:"fieldSpecs,omitempty"`
 }
 
 func (p *ReplicaCountTransformerPlugin) Config(
@@ -36,7 +35,7 @@ func (p *ReplicaCountTransformerPlugin) Transform(m resmap.ResMap) error {
 
 		for _, res := range append(matchOriginal, matchCurrent...) {
 			found = true
-			err := transformers.MutateField(
+			err := transform.MutateField(
 				res.Map(), replicaSpec.PathSlice(),
 				replicaSpec.CreateIfNotPresent, p.addReplicas)
 			if err != nil {

plugin/builtin/annotationstransformer/AnnotationsTransformer.go

@@ -5,16 +5,16 @@
 package main
 
 import (
+	"sigs.k8s.io/kustomize/v3/api/transform"
+	"sigs.k8s.io/kustomize/v3/api/types"
 	"sigs.k8s.io/kustomize/v3/pkg/resmap"
-	"sigs.k8s.io/kustomize/v3/pkg/transformers"
-	"sigs.k8s.io/kustomize/v3/pkg/transformers/config"
 	"sigs.k8s.io/yaml"
 )
 
 // Add the given annotations to the given field specifications.
 type plugin struct {
-	Annotations map[string]string  `json:"annotations,omitempty" yaml:"annotations,omitempty"`
-	FieldSpecs  []config.FieldSpec `json:"fieldSpecs,omitempty" yaml:"fieldSpecs,omitempty"`
+	Annotations map[string]string `json:"annotations,omitempty" yaml:"annotations,omitempty"`
+	FieldSpecs  []types.FieldSpec `json:"fieldSpecs,omitempty" yaml:"fieldSpecs,omitempty"`
 }
 
 //noinspection GoUnusedGlobalVariable
@@ -28,7 +28,7 @@ func (p *plugin) Config(
 }
 
 func (p *plugin) Transform(m resmap.ResMap) error {
-	t, err := transformers.NewMapTransformer(
+	t, err := transform.NewMapTransformer(
 		p.FieldSpecs,
 		p.Annotations,
 	)

plugin/builtin/imagetagtransformer/ImageTagTransformer.go

@@ -7,20 +7,19 @@ package main
 import (
 	"fmt"
 	"regexp"
+	"sigs.k8s.io/kustomize/v3/api/transform"
 	"sigs.k8s.io/kustomize/v3/api/types"
 	"strings"
 
 	"sigs.k8s.io/kustomize/v3/pkg/resmap"
-	"sigs.k8s.io/kustomize/v3/pkg/transformers"
-	"sigs.k8s.io/kustomize/v3/pkg/transformers/config"
 	"sigs.k8s.io/yaml"
 )
 
 // Find matching image declarations and replace
 // the name, tag and/or digest.
 type plugin struct {
-	ImageTag   types.Image        `json:"imageTag,omitempty" yaml:"imageTag,omitempty"`
-	FieldSpecs []config.FieldSpec `json:"fieldSpecs,omitempty" yaml:"fieldSpecs,omitempty"`
+	ImageTag   types.Image       `json:"imageTag,omitempty" yaml:"imageTag,omitempty"`
+	FieldSpecs []types.FieldSpec `json:"fieldSpecs,omitempty" yaml:"fieldSpecs,omitempty"`
 }
 
 //noinspection GoUnusedGlobalVariable
@@ -39,7 +38,7 @@ func (p *plugin) Transform(m resmap.ResMap) error {
 			if !r.OrgId().IsSelected(&path.Gvk) {
 				continue
 			}
-			err := transformers.MutateField(
+			err := transform.MutateField(
 				r.Map(), path.PathSlice(), false, p.mutateImage)
 			if err != nil {
 				return err

plugin/builtin/labeltransformer/LabelTransformer.go

@@ -5,16 +5,16 @@
 package main
 
 import (
+	"sigs.k8s.io/kustomize/v3/api/transform"
+	"sigs.k8s.io/kustomize/v3/api/types"
 	"sigs.k8s.io/kustomize/v3/pkg/resmap"
-	"sigs.k8s.io/kustomize/v3/pkg/transformers"
-	"sigs.k8s.io/kustomize/v3/pkg/transformers/config"
 	"sigs.k8s.io/yaml"
 )
 
 // Add the given labels to the given field specifications.
 type plugin struct {
-	Labels     map[string]string  `json:"labels,omitempty" yaml:"labels,omitempty"`
-	FieldSpecs []config.FieldSpec `json:"fieldSpecs,omitempty" yaml:"fieldSpecs,omitempty"`
+	Labels     map[string]string `json:"labels,omitempty" yaml:"labels,omitempty"`
+	FieldSpecs []types.FieldSpec `json:"fieldSpecs,omitempty" yaml:"fieldSpecs,omitempty"`
 }
 
 //noinspection GoUnusedGlobalVariable
@@ -28,7 +28,7 @@ func (p *plugin) Config(
 }
 
 func (p *plugin) Transform(m resmap.ResMap) error {
-	t, err := transformers.NewMapTransformer(
+	t, err := transform.NewMapTransformer(
 		p.FieldSpecs,
 		p.Labels,
 	)

plugin/builtin/namespacetransformer/NamespaceTransformer.go

@@ -6,20 +6,19 @@ package main
 
 import (
 	"fmt"
+	"sigs.k8s.io/kustomize/v3/api/transform"
 
 	"sigs.k8s.io/kustomize/v3/api/resid"
 	"sigs.k8s.io/kustomize/v3/api/types"
 	"sigs.k8s.io/kustomize/v3/pkg/resmap"
 	"sigs.k8s.io/kustomize/v3/pkg/resource"
-	"sigs.k8s.io/kustomize/v3/pkg/transformers"
-	"sigs.k8s.io/kustomize/v3/pkg/transformers/config"
 	"sigs.k8s.io/yaml"
 )
 
 // Change or set the namespace of non-cluster level resources.
 type plugin struct {
 	types.ObjectMeta `json:"metadata,omitempty" yaml:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
-	FieldSpecs       []config.FieldSpec `json:"fieldSpecs,omitempty" yaml:"fieldSpecs,omitempty"`
+	FieldSpecs       []types.FieldSpec `json:"fieldSpecs,omitempty" yaml:"fieldSpecs,omitempty"`
 }
 
 //noinspection GoUnusedGlobalVariable
@@ -46,7 +45,7 @@ func (p *plugin) Transform(m resmap.ResMap) error {
 		applicableFs := p.applicableFieldSpecs(id)
 
 		for _, fs := range applicableFs {
-			err := transformers.MutateField(
+			err := transform.MutateField(
 				r.Map(), fs.PathSlice(), fs.CreateIfNotPresent,
 				p.changeNamespace(r))
 			if err != nil {
@@ -68,8 +67,8 @@ const metaNamespace = "metadata/namespace"
 // all objects have it, even "ClusterKind" objects
 // that don't exist in a namespace (the Namespace
 // object itself doesn't live in a namespace).
-func (p *plugin) applicableFieldSpecs(id resid.ResId) []config.FieldSpec {
-	var res []config.FieldSpec
+func (p *plugin) applicableFieldSpecs(id resid.ResId) []types.FieldSpec {
+	var res []types.FieldSpec
 	for _, fs := range p.FieldSpecs {
 		if id.IsSelected(&fs.Gvk) && (fs.Path != metaNamespace || (fs.Path == metaNamespace && id.IsNamespaceableKind())) {
 			res = append(res, fs)

plugin/builtin/prefixsuffixtransformer/PrefixSuffixTransformer.go

@@ -7,26 +7,26 @@ package main
 import (
 	"errors"
 	"fmt"
+	"sigs.k8s.io/kustomize/v3/api/transform"
+	"sigs.k8s.io/kustomize/v3/api/types"
 
 	"sigs.k8s.io/kustomize/v3/api/resid"
 	"sigs.k8s.io/kustomize/v3/pkg/resmap"
-	"sigs.k8s.io/kustomize/v3/pkg/transformers"
-	"sigs.k8s.io/kustomize/v3/pkg/transformers/config"
 	"sigs.k8s.io/yaml"
 )
 
 // Add the given prefix and suffix to the field.
 type plugin struct {
-	Prefix     string             `json:"prefix,omitempty" yaml:"prefix,omitempty"`
-	Suffix     string             `json:"suffix,omitempty" yaml:"suffix,omitempty"`
-	FieldSpecs []config.FieldSpec `json:"fieldSpecs,omitempty" yaml:"fieldSpecs,omitempty"`
+	Prefix     string            `json:"prefix,omitempty" yaml:"prefix,omitempty"`
+	Suffix     string            `json:"suffix,omitempty" yaml:"suffix,omitempty"`
+	FieldSpecs []types.FieldSpec `json:"fieldSpecs,omitempty" yaml:"fieldSpecs,omitempty"`
 }
 
 //noinspection GoUnusedGlobalVariable
 var KustomizePlugin plugin
 
 // Not placed in a file yet due to lack of demand.
-var prefixSuffixFieldSpecsToSkip = []config.FieldSpec{
+var prefixSuffixFieldSpecsToSkip = []types.FieldSpec{
 	{
 		Gvk: resid.Gvk{Kind: "CustomResourceDefinition"},
 	},
@@ -85,7 +85,7 @@ func (p *plugin) Transform(m resmap.ResMap) error {
 			// the addPrefixSuffix method will not
 			// change the name if both the prefix and suffix
 			// are empty.
-			err := transformers.MutateField(
+			err := transform.MutateField(
 				r.Map(),
 				path.PathSlice(),
 				path.CreateIfNotPresent,
@@ -98,7 +98,7 @@ func (p *plugin) Transform(m resmap.ResMap) error {
 	return nil
 }
 
-func smellsLikeANameChange(fs *config.FieldSpec) bool {
+func smellsLikeANameChange(fs *types.FieldSpec) bool {
 	return fs.Path == "metadata/name"
 }
 

plugin/builtin/replicacounttransformer/ReplicaCountTransformer.go

@@ -6,20 +6,19 @@ package main
 
 import (
 	"fmt"
+	"sigs.k8s.io/kustomize/v3/api/transform"
 
 	"sigs.k8s.io/kustomize/v3/api/resid"
 	"sigs.k8s.io/kustomize/v3/api/types"
 	"sigs.k8s.io/kustomize/v3/pkg/resmap"
-	"sigs.k8s.io/kustomize/v3/pkg/transformers"
-	"sigs.k8s.io/kustomize/v3/pkg/transformers/config"
 	"sigs.k8s.io/yaml"
 )
 
 // Find matching replicas declarations and replace the count.
 // Eases the kustomization configuration of replica changes.
 type plugin struct {
-	Replica    types.Replica      `json:"replica,omitempty" yaml:"replica,omitempty"`
-	FieldSpecs []config.FieldSpec `json:"fieldSpecs,omitempty" yaml:"fieldSpecs,omitempty"`
+	Replica    types.Replica     `json:"replica,omitempty" yaml:"replica,omitempty"`
+	FieldSpecs []types.FieldSpec `json:"fieldSpecs,omitempty" yaml:"fieldSpecs,omitempty"`
 }
 
 //noinspection GoUnusedGlobalVariable
@@ -42,7 +41,7 @@ func (p *plugin) Transform(m resmap.ResMap) error {
 
 		for _, res := range append(matchOriginal, matchCurrent...) {
 			found = true
-			err := transformers.MutateField(
+			err := transform.MutateField(
 				res.Map(), replicaSpec.PathSlice(),
 				replicaSpec.CreateIfNotPresent, p.addReplicas)
 			if err != nil {

plugin/doc.go

@@ -101,7 +101,7 @@ etc.
 Generated plugins are used in kustomize via
 
   package whatever
-  import "sigs.k8s.io/kustomize/v3/plugin/builtin
+  import sigs.k8s.io/kustomize/v3/plugin/builtin
   ...
   g := builtin.NewSecretGenerator()
   g.Config(h, k)

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

@@ -5,8 +5,8 @@ package main
 
 import (
 	"github.com/pkg/errors"
+	"sigs.k8s.io/kustomize/v3/api/types"
 	"sigs.k8s.io/kustomize/v3/pkg/resmap"
-	"sigs.k8s.io/kustomize/v3/pkg/transformers/config"
 	"sigs.k8s.io/kustomize/v3/plugin/builtin"
 	"sigs.k8s.io/yaml"
 )
@@ -25,10 +25,10 @@ func (p *plugin) makePrefixSuffixPluginConfig() ([]byte, error) {
 	var s struct {
 		Prefix     string
 		Suffix     string
-		FieldSpecs []config.FieldSpec
+		FieldSpecs []types.FieldSpec
 	}
 	s.Prefix = getDate() + "-"
-	s.FieldSpecs = []config.FieldSpec{
+	s.FieldSpecs = []types.FieldSpec{
 		{Path: "metadata/name"},
 	}
 	return yaml.Marshal(s)

plugin/someteam.example.com/v1/stringprefixer/StringPrefixer.go

@@ -7,7 +7,6 @@ import (
 	"github.com/pkg/errors"
 	"sigs.k8s.io/kustomize/v3/api/types"
 	"sigs.k8s.io/kustomize/v3/pkg/resmap"
-	"sigs.k8s.io/kustomize/v3/pkg/transformers/config"
 	"sigs.k8s.io/kustomize/v3/plugin/builtin"
 	"sigs.k8s.io/yaml"
 )
@@ -27,10 +26,10 @@ func (p *plugin) makePrefixSuffixPluginConfig(n string) ([]byte, error) {
 	var s struct {
 		Prefix     string
 		Suffix     string
-		FieldSpecs []config.FieldSpec
+		FieldSpecs []types.FieldSpec
 	}
 	s.Prefix = n + "-"
-	s.FieldSpecs = []config.FieldSpec{
+	s.FieldSpecs = []types.FieldSpec{
 		{Path: "metadata/name"},
 	}
 	return yaml.Marshal(s)