Make types package public.

docs/plugins/builtins.md

@@ -33,16 +33,16 @@ be defaulted.  The latter method allows for
 complete plugin argument specification.
 
 
-[types.GeneratorOptions]: ../../pkg/types/generatoroptions.go
+[types.GeneratorOptions]: ../../types/generatoroptions.go
-[types.SecretArgs]: ../../pkg/types/secretargs.go
+[types.SecretArgs]: ../../types/secretargs.go
-[types.ConfigMapArgs]: ../../pkg/types/configmapargs.go
+[types.ConfigMapArgs]: ../../types/configmapargs.go
 [config.FieldSpec]: ../../pkg/transformers/config/fieldspec.go
-[types.ObjectMeta]: ../../pkg/types/objectmeta.go
+[types.ObjectMeta]: ../../types/objectmeta.go
-[types.Selector]: ../../pkg/types/selector.go
+[types.Selector]: ../../types/selector.go
-[types.Replica]: ../../pkg/types/replica.go
+[types.Replica]: ../../types/replica.go
-[types.PatchStrategicMerge]: ../../pkg/types/patchstrategicmerge.go
+[types.PatchStrategicMerge]: ../../types/patchstrategicmerge.go
-[types.PatchTarget]: ../../pkg/types/patchtarget.go
+[types.PatchTarget]: ../../types/patchtarget.go
-[image.Image]: ../../pkg/image/image.go
+[image.Image]: ../../types/image.go
 
 ## _AnnotationTransformer_
 ### Usage via `kustomization.yaml`

k8sdeps/configmapandsecret/configmapfactory.go

@@ -10,7 +10,7 @@ import (
 
 	"github.com/pkg/errors"
 	"k8s.io/api/core/v1"
-	"sigs.k8s.io/kustomize/v3/pkg/types"
+	"sigs.k8s.io/kustomize/v3/types"
 )
 
 func makeFreshConfigMap(

k8sdeps/configmapandsecret/configmapfactory_test.go

@@ -13,8 +13,8 @@ import (
 	"sigs.k8s.io/kustomize/v3/filesys"
 	"sigs.k8s.io/kustomize/v3/kv"
 	"sigs.k8s.io/kustomize/v3/pkg/loader"
-	"sigs.k8s.io/kustomize/v3/pkg/types"
 	"sigs.k8s.io/kustomize/v3/pkg/validators"
+	"sigs.k8s.io/kustomize/v3/types"
 )
 
 func makeEnvConfigMap(name string) *corev1.ConfigMap {

k8sdeps/configmapandsecret/factory.go

@@ -5,7 +5,7 @@ package configmapandsecret
 
 import (
 	"sigs.k8s.io/kustomize/v3/pkg/ifc"
-	"sigs.k8s.io/kustomize/v3/pkg/types"
+	"sigs.k8s.io/kustomize/v3/types"
 )
 
 // Factory makes ConfigMaps and Secrets.

k8sdeps/configmapandsecret/secretfactory.go

@@ -7,7 +7,7 @@ import (
 	"fmt"
 
 	corev1 "k8s.io/api/core/v1"
-	"sigs.k8s.io/kustomize/v3/pkg/types"
+	"sigs.k8s.io/kustomize/v3/types"
 )
 
 func makeFreshSecret(

k8sdeps/configmapandsecret/secretfactory_test.go

@@ -12,8 +12,8 @@ import (
 	"sigs.k8s.io/kustomize/v3/filesys"
 	"sigs.k8s.io/kustomize/v3/kv"
 	"sigs.k8s.io/kustomize/v3/pkg/loader"
-	"sigs.k8s.io/kustomize/v3/pkg/types"
 	"sigs.k8s.io/kustomize/v3/pkg/validators"
+	"sigs.k8s.io/kustomize/v3/types"
 )
 
 func makeEnvSecret(name string) *corev1.Secret {

k8sdeps/kunstruct/factory.go

@@ -14,7 +14,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/yaml"
 	"sigs.k8s.io/kustomize/v3/k8sdeps/configmapandsecret"
 	"sigs.k8s.io/kustomize/v3/pkg/ifc"
-	"sigs.k8s.io/kustomize/v3/pkg/types"
+	"sigs.k8s.io/kustomize/v3/types"
 )
 
 // KunstructuredFactoryImpl hides construction using apimachinery types.

kustomize/internal/commands/create/create_test.go

@@ -10,7 +10,7 @@ import (
 	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
 	"sigs.k8s.io/kustomize/v3/filesys"
 	"sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct"
-	"sigs.k8s.io/kustomize/v3/pkg/types"
+	"sigs.k8s.io/kustomize/v3/types"
 )
 
 var factory = kunstruct.NewKunstructuredFactoryImpl()

kustomize/internal/commands/edit/add/addmetadata.go

@@ -11,7 +11,7 @@ import (
 	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/util"
 	"sigs.k8s.io/kustomize/v3/filesys"
 	"sigs.k8s.io/kustomize/v3/pkg/pgmconfig"
-	"sigs.k8s.io/kustomize/v3/pkg/types"
+	"sigs.k8s.io/kustomize/v3/types"
 )
 
 // kindOfAdd is the kind of metadata being added: label or annotation

kustomize/internal/commands/edit/add/addmetadata_test.go

@@ -9,8 +9,8 @@ import (
 	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
 	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils"
 	"sigs.k8s.io/kustomize/v3/filesys"
-	"sigs.k8s.io/kustomize/v3/pkg/types"
 	"sigs.k8s.io/kustomize/v3/pkg/validators"
+	"sigs.k8s.io/kustomize/v3/types"
 )
 
 func makeKustomization(t *testing.T) *types.Kustomization {

kustomize/internal/commands/edit/add/configmap.go

@@ -8,7 +8,7 @@ import (
 	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
 	"sigs.k8s.io/kustomize/v3/filesys"
 	"sigs.k8s.io/kustomize/v3/pkg/ifc"
-	"sigs.k8s.io/kustomize/v3/pkg/types"
+	"sigs.k8s.io/kustomize/v3/types"
 )
 
 // newCmdAddConfigMap returns a new command.

kustomize/internal/commands/edit/add/configmap_test.go

@@ -9,8 +9,8 @@ import (
 	"sigs.k8s.io/kustomize/v3/filesys"
 	"sigs.k8s.io/kustomize/v3/kv"
 	"sigs.k8s.io/kustomize/v3/pkg/loader"
-	"sigs.k8s.io/kustomize/v3/pkg/types"
 	"sigs.k8s.io/kustomize/v3/pkg/validators"
+	"sigs.k8s.io/kustomize/v3/types"
 )
 
 func TestNewAddConfigMapIsNotNil(t *testing.T) {

kustomize/internal/commands/edit/add/secret.go

@@ -8,7 +8,7 @@ import (
 	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
 	"sigs.k8s.io/kustomize/v3/filesys"
 	"sigs.k8s.io/kustomize/v3/pkg/ifc"
-	"sigs.k8s.io/kustomize/v3/pkg/types"
+	"sigs.k8s.io/kustomize/v3/types"
 )
 
 // newCmdAddSecret returns a new command.

kustomize/internal/commands/edit/add/secret_test.go

@@ -10,8 +10,8 @@ import (
 
 	"sigs.k8s.io/kustomize/v3/filesys"
 	"sigs.k8s.io/kustomize/v3/pkg/loader"
-	"sigs.k8s.io/kustomize/v3/pkg/types"
 	"sigs.k8s.io/kustomize/v3/pkg/validators"
+	"sigs.k8s.io/kustomize/v3/types"
 )
 
 func TestNewCmdAddSecretIsNotNil(t *testing.T) {

kustomize/internal/commands/edit/remove/removemetadata.go

@@ -11,7 +11,7 @@ import (
 	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
 	"sigs.k8s.io/kustomize/v3/filesys"
 	"sigs.k8s.io/kustomize/v3/pkg/pgmconfig"
-	"sigs.k8s.io/kustomize/v3/pkg/types"
+	"sigs.k8s.io/kustomize/v3/types"
 )
 
 // kindOfAdd is the kind of metadata being added: label or annotation

kustomize/internal/commands/edit/remove/removemetadata_test.go

@@ -11,8 +11,8 @@ import (
 	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
 	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils"
 	"sigs.k8s.io/kustomize/v3/filesys"
-	"sigs.k8s.io/kustomize/v3/pkg/types"
 	"sigs.k8s.io/kustomize/v3/pkg/validators"
+	"sigs.k8s.io/kustomize/v3/types"
 )
 
 func makeKustomizationFS() filesys.FileSystem {

kustomize/internal/commands/edit/set/setimage.go

@@ -6,17 +6,17 @@ package set
 import (
 	"errors"
 	"regexp"
+	"sigs.k8s.io/kustomize/v3/types"
 	"sort"
 	"strings"
 
 	"github.com/spf13/cobra"
 	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
 	"sigs.k8s.io/kustomize/v3/filesys"
-	"sigs.k8s.io/kustomize/v3/pkg/image"
 )
 
 type setImageOptions struct {
-	imageMap map[string]image.Image
+	imageMap map[string]types.Image
 }
 
 var pattern = regexp.MustCompile("^(.*):([a-zA-Z0-9._-]*)$")
@@ -96,7 +96,7 @@ func (o *setImageOptions) Validate(args []string) error {
 		return errImageNoArgs
 	}
 
-	o.imageMap = make(map[string]image.Image)
+	o.imageMap = make(map[string]types.Image)
 
 	for _, arg := range args {
 
@@ -129,7 +129,7 @@ func (o *setImageOptions) RunSetImage(fSys filesys.FileSystem) error {
 		o.imageMap[im.Name] = im
 	}
 
-	var images []image.Image
+	var images []types.Image
 	for _, v := range o.imageMap {
 		images = append(images, v)
 	}
@@ -142,13 +142,13 @@ func (o *setImageOptions) RunSetImage(fSys filesys.FileSystem) error {
 	return mf.Write(m)
 }
 
-func parse(arg string) (image.Image, error) {
+func parse(arg string) (types.Image, error) {
 
 	// matches if there is an image name to overwrite
 	// <image>=<new-image><:|@><new-tag>
 	if s := strings.Split(arg, separator); len(s) == 2 {
 		p, err := parseOverwrite(s[1], true)
-		return image.Image{
+		return types.Image{
 			Name:    s[0],
 			NewName: p.name,
 			NewTag:  p.tag,
@@ -159,7 +159,7 @@ func parse(arg string) (image.Image, error) {
 	// matches only for <tag|digest> overwrites
 	// <image><:|@><new-tag>
 	p, err := parseOverwrite(arg, false)
-	return image.Image{
+	return types.Image{
 		Name:   p.name,
 		NewTag: p.tag,
 		Digest: p.digest,

kustomize/internal/commands/edit/set/setreplicas.go

@@ -12,7 +12,7 @@ import (
 	"github.com/spf13/cobra"
 	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
 	"sigs.k8s.io/kustomize/v3/filesys"
-	"sigs.k8s.io/kustomize/v3/pkg/types"
+	"sigs.k8s.io/kustomize/v3/types"
 )
 
 type setReplicasOptions struct {

kustomize/internal/commands/kustfile/kustomizationfile.go

@@ -15,7 +15,7 @@ import (
 
 	"sigs.k8s.io/kustomize/v3/filesys"
 	"sigs.k8s.io/kustomize/v3/pkg/pgmconfig"
-	"sigs.k8s.io/kustomize/v3/pkg/types"
+	"sigs.k8s.io/kustomize/v3/types"
 	"sigs.k8s.io/yaml"
 )
 

kustomize/internal/commands/kustfile/kustomizationfile_test.go

@@ -12,7 +12,7 @@ import (
 
 	"sigs.k8s.io/kustomize/v3/filesys"
 	"sigs.k8s.io/kustomize/v3/pkg/pgmconfig"
-	"sigs.k8s.io/kustomize/v3/pkg/types"
+	"sigs.k8s.io/kustomize/v3/types"
 )
 
 func TestFieldOrder(t *testing.T) {

kv/kv.go

@@ -15,7 +15,7 @@ import (
 
 	"github.com/pkg/errors"
 	"sigs.k8s.io/kustomize/v3/pkg/ifc"
-	"sigs.k8s.io/kustomize/v3/pkg/types"
+	"sigs.k8s.io/kustomize/v3/types"
 )
 
 var utf8bom = []byte{0xEF, 0xBB, 0xBF}

kv/kv_test.go

@@ -9,8 +9,8 @@ import (
 
 	"sigs.k8s.io/kustomize/v3/filesys"
 	ldr "sigs.k8s.io/kustomize/v3/pkg/loader"
-	"sigs.k8s.io/kustomize/v3/pkg/types"
 	"sigs.k8s.io/kustomize/v3/pkg/validators"
+	"sigs.k8s.io/kustomize/v3/types"
 )
 
 func makeKvLoader(fSys filesys.FileSystem) *loader {

pkg/accumulator/resaccumulator.go

@@ -12,7 +12,7 @@ import (
 	"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/pkg/types"
+	"sigs.k8s.io/kustomize/v3/types"
 )
 
 // ResAccumulator accumulates resources and the rules

pkg/accumulator/resaccumulator_test.go

@@ -17,7 +17,7 @@ import (
 	"sigs.k8s.io/kustomize/v3/pkg/resmaptest"
 	"sigs.k8s.io/kustomize/v3/pkg/resource"
 	"sigs.k8s.io/kustomize/v3/pkg/transformers/config"
-	"sigs.k8s.io/kustomize/v3/pkg/types"
+	"sigs.k8s.io/kustomize/v3/types"
 )
 
 func makeResAccumulator(t *testing.T) (*ResAccumulator, *resource.Factory) {

pkg/ifc/ifc.go

@@ -6,7 +6,7 @@ package ifc
 
 import (
 	"sigs.k8s.io/kustomize/v3/pkg/gvk"
-	"sigs.k8s.io/kustomize/v3/pkg/types"
+	"sigs.k8s.io/kustomize/v3/types"
 )
 
 // Validator provides functions to validate annotations and labels

pkg/image/deprecatedimage.go

@@ -1,32 +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 image
-
-// DeprecatedImage contains an image and a new tag,
-// which will replace the original tag.
-// Deprecated, instead use Image.
-type DeprecatedImage struct {
-	// Name is a tag-less image name.
-	Name string `json:"name,omitempty" yaml:"name,omitempty"`
-
-	// NewTag is the value to use in replacing the original tag.
-	NewTag string `json:"newTag,omitempty" yaml:"newTag,omitempty"`
-
-	// Digest is the value used to replace the original image tag.
-	// If digest is present NewTag value is ignored.
-	Digest string `json:"digest,omitempty" yaml:"digest,omitempty"`
-}

pkg/kusttest/kusttestharness.go

@@ -19,8 +19,8 @@ import (
 	"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/types"
 	"sigs.k8s.io/kustomize/v3/pkg/validators"
+	"sigs.k8s.io/kustomize/v3/types"
 )
 
 // KustTestHarness helps test kustomization generation and transformation.

pkg/patch/strategicmerge.go

@@ -16,7 +16,7 @@ limitations under the License.
 
 package patch
 
-import "sigs.k8s.io/kustomize/v3/pkg/types"
+import "sigs.k8s.io/kustomize/v3/types"
 
 // Append appends a slice of patch paths to a PatchStrategicMerge slice
 func Append(patches []types.PatchStrategicMerge, paths ...string) []types.PatchStrategicMerge {

pkg/patch/strategicmerge_test.go

@@ -6,7 +6,7 @@ package patch
 import (
 	"testing"
 
-	"sigs.k8s.io/kustomize/v3/pkg/types"
+	"sigs.k8s.io/kustomize/v3/types"
 )
 
 func buildPatchStrategicMergeSlice(patchStrings []string) []types.PatchStrategicMerge {

pkg/plugins/config.go

@@ -11,7 +11,7 @@ import (
 
 	"github.com/spf13/pflag"
 	"sigs.k8s.io/kustomize/v3/pkg/pgmconfig"
-	"sigs.k8s.io/kustomize/v3/pkg/types"
+	"sigs.k8s.io/kustomize/v3/types"
 )
 
 const (

pkg/plugins/execplugin.go

@@ -15,7 +15,7 @@ import (
 	"github.com/pkg/errors"
 	"sigs.k8s.io/kustomize/v3/pkg/resid"
 	"sigs.k8s.io/kustomize/v3/pkg/resmap"
-	"sigs.k8s.io/kustomize/v3/pkg/types"
+	"sigs.k8s.io/kustomize/v3/types"
 	"sigs.k8s.io/yaml"
 )
 

pkg/plugins/execplugin_test.go

@@ -12,8 +12,8 @@ import (
 	"sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct"
 	"sigs.k8s.io/kustomize/v3/pkg/resmap"
 	"sigs.k8s.io/kustomize/v3/pkg/resource"
-	"sigs.k8s.io/kustomize/v3/pkg/types"
 	"sigs.k8s.io/kustomize/v3/pkg/validators"
+	"sigs.k8s.io/kustomize/v3/types"
 )
 
 func TestExecPluginConfig(t *testing.T) {

pkg/plugins/loader.go

@@ -16,7 +16,7 @@ import (
 	"sigs.k8s.io/kustomize/v3/pkg/resid"
 	"sigs.k8s.io/kustomize/v3/pkg/resmap"
 	"sigs.k8s.io/kustomize/v3/pkg/resource"
-	"sigs.k8s.io/kustomize/v3/pkg/types"
+	"sigs.k8s.io/kustomize/v3/types"
 )
 
 type Loader struct {

pkg/resmap/factory.go

@@ -8,7 +8,7 @@ import (
 	"sigs.k8s.io/kustomize/v3/internal/kusterr"
 	"sigs.k8s.io/kustomize/v3/pkg/ifc"
 	"sigs.k8s.io/kustomize/v3/pkg/resource"
-	"sigs.k8s.io/kustomize/v3/pkg/types"
+	"sigs.k8s.io/kustomize/v3/types"
 )
 
 // Factory makes instances of ResMap.

pkg/resmap/factory_test.go

@@ -16,8 +16,8 @@ import (
 	"sigs.k8s.io/kustomize/v3/pkg/loader"
 	. "sigs.k8s.io/kustomize/v3/pkg/resmap"
 	"sigs.k8s.io/kustomize/v3/pkg/resmaptest"
-	"sigs.k8s.io/kustomize/v3/pkg/types"
 	"sigs.k8s.io/kustomize/v3/pkg/validators"
+	"sigs.k8s.io/kustomize/v3/types"
 )
 
 func TestFromFile(t *testing.T) {

pkg/resmap/resmap.go

@@ -14,7 +14,7 @@ import (
 	"sigs.k8s.io/kustomize/v3/pkg/ifc"
 	"sigs.k8s.io/kustomize/v3/pkg/resid"
 	"sigs.k8s.io/kustomize/v3/pkg/resource"
-	"sigs.k8s.io/kustomize/v3/pkg/types"
+	"sigs.k8s.io/kustomize/v3/types"
 	"sigs.k8s.io/yaml"
 )
 

pkg/resmap/resmap_test.go

@@ -14,7 +14,7 @@ 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/types"
+	"sigs.k8s.io/kustomize/v3/types"
 )
 
 var rf = resource.NewFactory(

pkg/resmap/selector_test.go

@@ -8,7 +8,7 @@ import (
 
 	"sigs.k8s.io/kustomize/v3/pkg/gvk"
 	"sigs.k8s.io/kustomize/v3/pkg/resmap"
-	"sigs.k8s.io/kustomize/v3/pkg/types"
+	"sigs.k8s.io/kustomize/v3/types"
 )
 
 func setupRMForPatchTargets(t *testing.T) resmap.ResMap {

pkg/resource/factory.go

@@ -11,7 +11,7 @@ import (
 
 	"sigs.k8s.io/kustomize/v3/internal/kusterr"
 	"sigs.k8s.io/kustomize/v3/pkg/ifc"
-	"sigs.k8s.io/kustomize/v3/pkg/types"
+	"sigs.k8s.io/kustomize/v3/types"
 )
 
 // Factory makes instances of Resource.

pkg/resource/factory_test.go

@@ -22,7 +22,7 @@ import (
 
 	"sigs.k8s.io/kustomize/v3/internal/loadertest"
 	. "sigs.k8s.io/kustomize/v3/pkg/resource"
-	"sigs.k8s.io/kustomize/v3/pkg/types"
+	"sigs.k8s.io/kustomize/v3/types"
 )
 
 func TestSliceFromPatches(t *testing.T) {

pkg/resource/resource.go

@@ -10,7 +10,7 @@ import (
 
 	"sigs.k8s.io/kustomize/v3/pkg/ifc"
 	"sigs.k8s.io/kustomize/v3/pkg/resid"
-	"sigs.k8s.io/kustomize/v3/pkg/types"
+	"sigs.k8s.io/kustomize/v3/types"
 	"sigs.k8s.io/yaml"
 )
 

pkg/resource/resource_test.go

@@ -24,7 +24,7 @@ import (
 	"sigs.k8s.io/kustomize/v3/pkg/gvk"
 	"sigs.k8s.io/kustomize/v3/pkg/resid"
 	. "sigs.k8s.io/kustomize/v3/pkg/resource"
-	"sigs.k8s.io/kustomize/v3/pkg/types"
+	"sigs.k8s.io/kustomize/v3/types"
 )
 
 var factory = NewFactory(

pkg/target/kusttarget.go

@@ -20,8 +20,8 @@ import (
 	"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/pkg/types"
 	"sigs.k8s.io/kustomize/v3/plugin/builtin"
+	"sigs.k8s.io/kustomize/v3/types"
 	"sigs.k8s.io/yaml"
 )
 

pkg/target/kusttarget_configplugin.go

@@ -4,11 +4,10 @@
 package target
 
 import (
-	"sigs.k8s.io/kustomize/v3/pkg/image"
 	"sigs.k8s.io/kustomize/v3/pkg/plugins"
 	"sigs.k8s.io/kustomize/v3/pkg/resmap"
 	"sigs.k8s.io/kustomize/v3/pkg/transformers/config"
-	"sigs.k8s.io/kustomize/v3/pkg/types"
+	"sigs.k8s.io/kustomize/v3/types"
 )
 
 // Functions dedicated to configuring the builtin
@@ -261,7 +260,7 @@ var transformerConfigurators = map[plugins.BuiltinPluginType]func(
 		kt *KustTarget, bpt plugins.BuiltinPluginType, f tFactory, tc *config.TransformerConfig) (
 		result []resmap.Transformer, err error) {
 		var c struct {
-			ImageTag   image.Image
+			ImageTag   types.Image
 			FieldSpecs []config.FieldSpec
 		}
 		for _, args := range kt.kustomization.Images {

pkg/target/kusttarget_test.go

@@ -16,8 +16,8 @@ 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/types"
 	"sigs.k8s.io/kustomize/v3/pkg/validators"
+	"sigs.k8s.io/kustomize/v3/types"
 )
 
 const (

plugin/builtin/ConfigMapGenerator.go

@@ -4,7 +4,7 @@ package builtin
 import (
 	"sigs.k8s.io/kustomize/v3/kv"
 	"sigs.k8s.io/kustomize/v3/pkg/resmap"
-	"sigs.k8s.io/kustomize/v3/pkg/types"
+	"sigs.k8s.io/kustomize/v3/types"
 	"sigs.k8s.io/yaml"
 )
 

plugin/builtin/ImageTagTransformer.go

@@ -4,9 +4,9 @@ package builtin
 import (
 	"fmt"
 	"regexp"
+	"sigs.k8s.io/kustomize/v3/types"
 	"strings"
 
-	"sigs.k8s.io/kustomize/v3/pkg/image"
 	"sigs.k8s.io/kustomize/v3/pkg/resmap"
 	"sigs.k8s.io/kustomize/v3/pkg/transformers"
 	"sigs.k8s.io/kustomize/v3/pkg/transformers/config"
@@ -16,13 +16,13 @@ import (
 // Find matching image declarations and replace
 // the name, tag and/or digest.
 type ImageTagTransformerPlugin struct {
-	ImageTag   image.Image        `json:"imageTag,omitempty" yaml:"imageTag,omitempty"`
+	ImageTag   types.Image        `json:"imageTag,omitempty" yaml:"imageTag,omitempty"`
 	FieldSpecs []config.FieldSpec `json:"fieldSpecs,omitempty" yaml:"fieldSpecs,omitempty"`
 }
 
 func (p *ImageTagTransformerPlugin) Config(
 	h *resmap.PluginHelpers, c []byte) (err error) {
-	p.ImageTag = image.Image{}
+	p.ImageTag = types.Image{}
 	p.FieldSpecs = nil
 	return yaml.Unmarshal(c, p)
 }

plugin/builtin/InventoryTransformer.go

@@ -10,7 +10,7 @@ import (
 	"sigs.k8s.io/kustomize/v3/pkg/resid"
 	"sigs.k8s.io/kustomize/v3/pkg/resmap"
 	"sigs.k8s.io/kustomize/v3/pkg/resource"
-	"sigs.k8s.io/kustomize/v3/pkg/types"
+	"sigs.k8s.io/kustomize/v3/types"
 	"sigs.k8s.io/yaml"
 )
 

plugin/builtin/NamespaceTransformer.go

@@ -9,7 +9,7 @@ import (
 	"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/kustomize/v3/pkg/types"
+	"sigs.k8s.io/kustomize/v3/types"
 	"sigs.k8s.io/yaml"
 )
 

plugin/builtin/PatchJson6902Transformer.go

@@ -10,7 +10,7 @@ import (
 	"sigs.k8s.io/kustomize/v3/pkg/ifc"
 	"sigs.k8s.io/kustomize/v3/pkg/resid"
 	"sigs.k8s.io/kustomize/v3/pkg/resmap"
-	"sigs.k8s.io/kustomize/v3/pkg/types"
+	"sigs.k8s.io/kustomize/v3/types"
 	"sigs.k8s.io/yaml"
 )
 

plugin/builtin/PatchStrategicMergeTransformer.go

@@ -6,7 +6,7 @@ import (
 
 	"sigs.k8s.io/kustomize/v3/pkg/resmap"
 	"sigs.k8s.io/kustomize/v3/pkg/resource"
-	"sigs.k8s.io/kustomize/v3/pkg/types"
+	"sigs.k8s.io/kustomize/v3/types"
 	"sigs.k8s.io/yaml"
 )
 

plugin/builtin/PatchTransformer.go

@@ -8,7 +8,7 @@ import (
 	"github.com/pkg/errors"
 	"sigs.k8s.io/kustomize/v3/pkg/resmap"
 	"sigs.k8s.io/kustomize/v3/pkg/resource"
-	"sigs.k8s.io/kustomize/v3/pkg/types"
+	"sigs.k8s.io/kustomize/v3/types"
 	"sigs.k8s.io/yaml"
 )
 

plugin/builtin/ReplicaCountTransformer.go

@@ -8,7 +8,7 @@ import (
 	"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/pkg/types"
+	"sigs.k8s.io/kustomize/v3/types"
 	"sigs.k8s.io/yaml"
 )
 

plugin/builtin/SecretGenerator.go

@@ -4,7 +4,7 @@ package builtin
 import (
 	"sigs.k8s.io/kustomize/v3/kv"
 	"sigs.k8s.io/kustomize/v3/pkg/resmap"
-	"sigs.k8s.io/kustomize/v3/pkg/types"
+	"sigs.k8s.io/kustomize/v3/types"
 	"sigs.k8s.io/yaml"
 )
 

plugin/builtin/configmapgenerator/ConfigMapGenerator.go

@@ -7,7 +7,7 @@ package main
 import (
 	"sigs.k8s.io/kustomize/v3/kv"
 	"sigs.k8s.io/kustomize/v3/pkg/resmap"
-	"sigs.k8s.io/kustomize/v3/pkg/types"
+	"sigs.k8s.io/kustomize/v3/types"
 	"sigs.k8s.io/yaml"
 )
 

plugin/builtin/imagetagtransformer/ImageTagTransformer.go

@@ -7,9 +7,9 @@ package main
 import (
 	"fmt"
 	"regexp"
+	"sigs.k8s.io/kustomize/v3/types"
 	"strings"
 
-	"sigs.k8s.io/kustomize/v3/pkg/image"
 	"sigs.k8s.io/kustomize/v3/pkg/resmap"
 	"sigs.k8s.io/kustomize/v3/pkg/transformers"
 	"sigs.k8s.io/kustomize/v3/pkg/transformers/config"
@@ -19,7 +19,7 @@ import (
 // Find matching image declarations and replace
 // the name, tag and/or digest.
 type plugin struct {
-	ImageTag   image.Image        `json:"imageTag,omitempty" yaml:"imageTag,omitempty"`
+	ImageTag   types.Image        `json:"imageTag,omitempty" yaml:"imageTag,omitempty"`
 	FieldSpecs []config.FieldSpec `json:"fieldSpecs,omitempty" yaml:"fieldSpecs,omitempty"`
 }
 
@@ -28,7 +28,7 @@ var KustomizePlugin plugin
 
 func (p *plugin) Config(
 	h *resmap.PluginHelpers, c []byte) (err error) {
-	p.ImageTag = image.Image{}
+	p.ImageTag = types.Image{}
 	p.FieldSpecs = nil
 	return yaml.Unmarshal(c, p)
 }

plugin/builtin/inventorytransformer/InventoryTransformer.go

@@ -13,7 +13,7 @@ import (
 	"sigs.k8s.io/kustomize/v3/pkg/resid"
 	"sigs.k8s.io/kustomize/v3/pkg/resmap"
 	"sigs.k8s.io/kustomize/v3/pkg/resource"
-	"sigs.k8s.io/kustomize/v3/pkg/types"
+	"sigs.k8s.io/kustomize/v3/types"
 	"sigs.k8s.io/yaml"
 )
 

plugin/builtin/namespacetransformer/NamespaceTransformer.go

@@ -12,7 +12,7 @@ import (
 	"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/kustomize/v3/pkg/types"
+	"sigs.k8s.io/kustomize/v3/types"
 	"sigs.k8s.io/yaml"
 )
 

plugin/builtin/patchjson6902transformer/PatchJson6902Transformer.go

@@ -13,7 +13,7 @@ import (
 	"sigs.k8s.io/kustomize/v3/pkg/ifc"
 	"sigs.k8s.io/kustomize/v3/pkg/resid"
 	"sigs.k8s.io/kustomize/v3/pkg/resmap"
-	"sigs.k8s.io/kustomize/v3/pkg/types"
+	"sigs.k8s.io/kustomize/v3/types"
 	"sigs.k8s.io/yaml"
 )
 

plugin/builtin/patchstrategicmergetransformer/PatchStrategicMergeTransformer.go

@@ -9,7 +9,7 @@ import (
 
 	"sigs.k8s.io/kustomize/v3/pkg/resmap"
 	"sigs.k8s.io/kustomize/v3/pkg/resource"
-	"sigs.k8s.io/kustomize/v3/pkg/types"
+	"sigs.k8s.io/kustomize/v3/types"
 	"sigs.k8s.io/yaml"
 )
 

plugin/builtin/patchtransformer/PatchTransformer.go

@@ -11,7 +11,7 @@ import (
 	"github.com/pkg/errors"
 	"sigs.k8s.io/kustomize/v3/pkg/resmap"
 	"sigs.k8s.io/kustomize/v3/pkg/resource"
-	"sigs.k8s.io/kustomize/v3/pkg/types"
+	"sigs.k8s.io/kustomize/v3/types"
 	"sigs.k8s.io/yaml"
 )
 

plugin/builtin/replicacounttransformer/ReplicaCountTransformer.go

@@ -11,7 +11,7 @@ import (
 	"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/pkg/types"
+	"sigs.k8s.io/kustomize/v3/types"
 	"sigs.k8s.io/yaml"
 )
 

plugin/builtin/secretgenerator/SecretGenerator.go

@@ -7,7 +7,7 @@ package main
 import (
 	"sigs.k8s.io/kustomize/v3/kv"
 	"sigs.k8s.io/kustomize/v3/pkg/resmap"
-	"sigs.k8s.io/kustomize/v3/pkg/types"
+	"sigs.k8s.io/kustomize/v3/types"
 	"sigs.k8s.io/yaml"
 )
 

plugin/someteam.example.com/v1/secretsfromdatabase/SecretsFromDatabase.go

@@ -6,7 +6,7 @@ package main
 import (
 	"sigs.k8s.io/kustomize/v3/kv"
 	"sigs.k8s.io/kustomize/v3/pkg/resmap"
-	"sigs.k8s.io/kustomize/v3/pkg/types"
+	"sigs.k8s.io/kustomize/v3/types"
 	"sigs.k8s.io/yaml"
 )
 

plugin/someteam.example.com/v1/someservicegenerator/SomeServiceGenerator.go

@@ -8,7 +8,7 @@ import (
 	"text/template"
 
 	"sigs.k8s.io/kustomize/v3/pkg/resmap"
-	"sigs.k8s.io/kustomize/v3/pkg/types"
+	"sigs.k8s.io/kustomize/v3/types"
 	"sigs.k8s.io/yaml"
 )
 

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

@@ -7,8 +7,8 @@ import (
 	"github.com/pkg/errors"
 	"sigs.k8s.io/kustomize/v3/pkg/resmap"
 	"sigs.k8s.io/kustomize/v3/pkg/transformers/config"
-	"sigs.k8s.io/kustomize/v3/pkg/types"
 	"sigs.k8s.io/kustomize/v3/plugin/builtin"
+	"sigs.k8s.io/kustomize/v3/types"
 	"sigs.k8s.io/yaml"
 )
 

types/genargs_test.go

@@ -6,7 +6,7 @@ package types_test
 import (
 	"testing"
 
-	. "sigs.k8s.io/kustomize/v3/pkg/types"
+	. "sigs.k8s.io/kustomize/v3/types"
 )
 
 func TestGenArgs_String(t *testing.T) {

types/image.go

@@ -1,9 +1,7 @@
 // Copyright 2019 The Kubernetes Authors.
 // SPDX-License-Identifier: Apache-2.0
 
-// Package image provides struct definitions and libraries
+package types
-// for image overwriting of names, tags and digest.
-package image
 
 // Image contains an image name, a new name, a new tag or digest,
 // which will replace the original name and tag.

types/kustomization.go

@@ -4,10 +4,6 @@
 // Package types holds struct definitions that should find a better home.
 package types
 
-import (
-	"sigs.k8s.io/kustomize/v3/pkg/image"
-)
-
 const (
 	KustomizationVersion = "kustomize.config.k8s.io/v1beta1"
 	KustomizationKind    = "Kustomization"
@@ -57,7 +53,7 @@ type Kustomization struct {
 	// Images is a list of (image name, new name, new tag or digest)
 	// for changing image names, tags or digests. This can also be achieved with a
 	// patch, but this operator is simpler to specify.
-	Images []image.Image `json:"images,omitempty" yaml:"images,omitempty"`
+	Images []Image `json:"images,omitempty" yaml:"images,omitempty"`
 
 	// Replicas is a list of {resourcename, count} that allows for simpler replica
 	// specification. This can also be done with a patch.