From 07d2500ee399c952020e4392083fc1892eb0fc03 Mon Sep 17 00:00:00 2001 From: jregan Date: Wed, 16 Oct 2019 16:36:06 -0700 Subject: [PATCH] Make types package public. --- docs/plugins/builtins.md | 18 +++++------ .../configmapandsecret/configmapfactory.go | 2 +- .../configmapfactory_test.go | 2 +- k8sdeps/configmapandsecret/factory.go | 2 +- k8sdeps/configmapandsecret/secretfactory.go | 2 +- .../configmapandsecret/secretfactory_test.go | 2 +- k8sdeps/kunstruct/factory.go | 2 +- .../internal/commands/create/create_test.go | 2 +- .../internal/commands/edit/add/addmetadata.go | 2 +- .../commands/edit/add/addmetadata_test.go | 2 +- .../internal/commands/edit/add/configmap.go | 2 +- .../commands/edit/add/configmap_test.go | 2 +- .../internal/commands/edit/add/secret.go | 2 +- .../internal/commands/edit/add/secret_test.go | 2 +- .../commands/edit/remove/removemetadata.go | 2 +- .../edit/remove/removemetadata_test.go | 2 +- .../internal/commands/edit/set/setimage.go | 14 ++++---- .../internal/commands/edit/set/setreplicas.go | 2 +- .../commands/kustfile/kustomizationfile.go | 2 +- .../kustfile/kustomizationfile_test.go | 2 +- kv/kv.go | 2 +- kv/kv_test.go | 2 +- pkg/accumulator/resaccumulator.go | 2 +- pkg/accumulator/resaccumulator_test.go | 2 +- pkg/ifc/ifc.go | 2 +- pkg/image/deprecatedimage.go | 32 ------------------- pkg/kusttest/kusttestharness.go | 2 +- pkg/patch/strategicmerge.go | 2 +- pkg/patch/strategicmerge_test.go | 2 +- pkg/plugins/config.go | 2 +- pkg/plugins/execplugin.go | 2 +- pkg/plugins/execplugin_test.go | 2 +- pkg/plugins/loader.go | 2 +- pkg/resmap/factory.go | 2 +- pkg/resmap/factory_test.go | 2 +- pkg/resmap/resmap.go | 2 +- pkg/resmap/resmap_test.go | 2 +- pkg/resmap/selector_test.go | 2 +- pkg/resource/factory.go | 2 +- pkg/resource/factory_test.go | 2 +- pkg/resource/resource.go | 2 +- pkg/resource/resource_test.go | 2 +- pkg/target/kusttarget.go | 2 +- pkg/target/kusttarget_configplugin.go | 5 ++- pkg/target/kusttarget_test.go | 2 +- plugin/builtin/ConfigMapGenerator.go | 2 +- plugin/builtin/ImageTagTransformer.go | 6 ++-- plugin/builtin/InventoryTransformer.go | 2 +- plugin/builtin/NamespaceTransformer.go | 2 +- plugin/builtin/PatchJson6902Transformer.go | 2 +- .../builtin/PatchStrategicMergeTransformer.go | 2 +- plugin/builtin/PatchTransformer.go | 2 +- plugin/builtin/ReplicaCountTransformer.go | 2 +- plugin/builtin/SecretGenerator.go | 2 +- .../configmapgenerator/ConfigMapGenerator.go | 2 +- .../ImageTagTransformer.go | 6 ++-- .../InventoryTransformer.go | 2 +- .../NamespaceTransformer.go | 2 +- .../PatchJson6902Transformer.go | 2 +- .../PatchStrategicMergeTransformer.go | 2 +- .../patchtransformer/PatchTransformer.go | 2 +- .../ReplicaCountTransformer.go | 2 +- .../secretgenerator/SecretGenerator.go | 2 +- .../SecretsFromDatabase.go | 2 +- .../SomeServiceGenerator.go | 2 +- .../v1/stringprefixer/StringPrefixer.go | 2 +- {pkg/types => types}/configmapargs.go | 0 {pkg/types => types}/fix.go | 0 {pkg/types => types}/garbagepolicy.go | 0 {pkg/types => types}/garbagepolicy_string.go | 0 {pkg/types => types}/genargs.go | 0 {pkg/types => types}/genargs_test.go | 2 +- {pkg/types => types}/generationbehavior.go | 0 {pkg/types => types}/generatorargs.go | 0 {pkg/types => types}/generatoroptions.go | 0 {pkg/image => types}/image.go | 4 +-- {pkg/types => types}/inventory.go | 0 {pkg/types => types}/kustomization.go | 6 +--- {pkg/types => types}/kvpairsources.go | 0 {pkg/types => types}/objectmeta.go | 0 {pkg/types => types}/pair.go | 0 {pkg/types => types}/patch.go | 0 {pkg/types => types}/patchjson6902.go | 0 {pkg/types => types}/patchstrategicmerge.go | 0 {pkg/types => types}/patchtarget.go | 0 {pkg/types => types}/pluginconfig.go | 0 {pkg/types => types}/replica.go | 0 {pkg/types => types}/secretargs.go | 0 {pkg/types => types}/selector.go | 0 {pkg/types => types}/typemeta.go | 0 {pkg/types => types}/var.go | 0 {pkg/types => types}/var_test.go | 0 92 files changed, 87 insertions(+), 126 deletions(-) delete mode 100644 pkg/image/deprecatedimage.go rename {pkg/types => types}/configmapargs.go (100%) rename {pkg/types => types}/fix.go (100%) rename {pkg/types => types}/garbagepolicy.go (100%) rename {pkg/types => types}/garbagepolicy_string.go (100%) rename {pkg/types => types}/genargs.go (100%) rename {pkg/types => types}/genargs_test.go (94%) rename {pkg/types => types}/generationbehavior.go (100%) rename {pkg/types => types}/generatorargs.go (100%) rename {pkg/types => types}/generatoroptions.go (100%) rename {pkg/image => types}/image.go (85%) rename {pkg/types => types}/inventory.go (100%) rename {pkg/types => types}/kustomization.go (98%) rename {pkg/types => types}/kvpairsources.go (100%) rename {pkg/types => types}/objectmeta.go (100%) rename {pkg/types => types}/pair.go (100%) rename {pkg/types => types}/patch.go (100%) rename {pkg/types => types}/patchjson6902.go (100%) rename {pkg/types => types}/patchstrategicmerge.go (100%) rename {pkg/types => types}/patchtarget.go (100%) rename {pkg/types => types}/pluginconfig.go (100%) rename {pkg/types => types}/replica.go (100%) rename {pkg/types => types}/secretargs.go (100%) rename {pkg/types => types}/selector.go (100%) rename {pkg/types => types}/typemeta.go (100%) rename {pkg/types => types}/var.go (100%) rename {pkg/types => types}/var_test.go (100%) diff --git a/docs/plugins/builtins.md b/docs/plugins/builtins.md index 1e4853261..ff557fbe2 100644 --- a/docs/plugins/builtins.md +++ b/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.SecretArgs]: ../../pkg/types/secretargs.go -[types.ConfigMapArgs]: ../../pkg/types/configmapargs.go +[types.GeneratorOptions]: ../../types/generatoroptions.go +[types.SecretArgs]: ../../types/secretargs.go +[types.ConfigMapArgs]: ../../types/configmapargs.go [config.FieldSpec]: ../../pkg/transformers/config/fieldspec.go -[types.ObjectMeta]: ../../pkg/types/objectmeta.go -[types.Selector]: ../../pkg/types/selector.go -[types.Replica]: ../../pkg/types/replica.go -[types.PatchStrategicMerge]: ../../pkg/types/patchstrategicmerge.go -[types.PatchTarget]: ../../pkg/types/patchtarget.go -[image.Image]: ../../pkg/image/image.go +[types.ObjectMeta]: ../../types/objectmeta.go +[types.Selector]: ../../types/selector.go +[types.Replica]: ../../types/replica.go +[types.PatchStrategicMerge]: ../../types/patchstrategicmerge.go +[types.PatchTarget]: ../../types/patchtarget.go +[image.Image]: ../../types/image.go ## _AnnotationTransformer_ ### Usage via `kustomization.yaml` diff --git a/k8sdeps/configmapandsecret/configmapfactory.go b/k8sdeps/configmapandsecret/configmapfactory.go index 9825186a2..0c834fa63 100644 --- a/k8sdeps/configmapandsecret/configmapfactory.go +++ b/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( diff --git a/k8sdeps/configmapandsecret/configmapfactory_test.go b/k8sdeps/configmapandsecret/configmapfactory_test.go index fcbaa95c3..ca3b33391 100644 --- a/k8sdeps/configmapandsecret/configmapfactory_test.go +++ b/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 { diff --git a/k8sdeps/configmapandsecret/factory.go b/k8sdeps/configmapandsecret/factory.go index 8e3def053..15004afc8 100644 --- a/k8sdeps/configmapandsecret/factory.go +++ b/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. diff --git a/k8sdeps/configmapandsecret/secretfactory.go b/k8sdeps/configmapandsecret/secretfactory.go index bdd2440cd..3ff954e3b 100644 --- a/k8sdeps/configmapandsecret/secretfactory.go +++ b/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( diff --git a/k8sdeps/configmapandsecret/secretfactory_test.go b/k8sdeps/configmapandsecret/secretfactory_test.go index bd0fcbead..929b729d0 100644 --- a/k8sdeps/configmapandsecret/secretfactory_test.go +++ b/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 { diff --git a/k8sdeps/kunstruct/factory.go b/k8sdeps/kunstruct/factory.go index 074fe3ae8..ffb48e9a7 100644 --- a/k8sdeps/kunstruct/factory.go +++ b/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. diff --git a/kustomize/internal/commands/create/create_test.go b/kustomize/internal/commands/create/create_test.go index f13bd8113..81561d6f0 100644 --- a/kustomize/internal/commands/create/create_test.go +++ b/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() diff --git a/kustomize/internal/commands/edit/add/addmetadata.go b/kustomize/internal/commands/edit/add/addmetadata.go index 1a695916b..cd25f7592 100644 --- a/kustomize/internal/commands/edit/add/addmetadata.go +++ b/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 diff --git a/kustomize/internal/commands/edit/add/addmetadata_test.go b/kustomize/internal/commands/edit/add/addmetadata_test.go index 86325e8b2..5f4157795 100644 --- a/kustomize/internal/commands/edit/add/addmetadata_test.go +++ b/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 { diff --git a/kustomize/internal/commands/edit/add/configmap.go b/kustomize/internal/commands/edit/add/configmap.go index f9d09b8a7..ab1fd5bb8 100644 --- a/kustomize/internal/commands/edit/add/configmap.go +++ b/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. diff --git a/kustomize/internal/commands/edit/add/configmap_test.go b/kustomize/internal/commands/edit/add/configmap_test.go index dbb03fc45..090e4dfe2 100644 --- a/kustomize/internal/commands/edit/add/configmap_test.go +++ b/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) { diff --git a/kustomize/internal/commands/edit/add/secret.go b/kustomize/internal/commands/edit/add/secret.go index 41e83a3e4..ff36eb578 100644 --- a/kustomize/internal/commands/edit/add/secret.go +++ b/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. diff --git a/kustomize/internal/commands/edit/add/secret_test.go b/kustomize/internal/commands/edit/add/secret_test.go index 286f42a08..d70df7934 100644 --- a/kustomize/internal/commands/edit/add/secret_test.go +++ b/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) { diff --git a/kustomize/internal/commands/edit/remove/removemetadata.go b/kustomize/internal/commands/edit/remove/removemetadata.go index 77d6cfaa2..5ff2f9752 100644 --- a/kustomize/internal/commands/edit/remove/removemetadata.go +++ b/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 diff --git a/kustomize/internal/commands/edit/remove/removemetadata_test.go b/kustomize/internal/commands/edit/remove/removemetadata_test.go index 2aa528902..c3de106f1 100644 --- a/kustomize/internal/commands/edit/remove/removemetadata_test.go +++ b/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 { diff --git a/kustomize/internal/commands/edit/set/setimage.go b/kustomize/internal/commands/edit/set/setimage.go index ada83085a..0a7303b1a 100644 --- a/kustomize/internal/commands/edit/set/setimage.go +++ b/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 // =<:|@> 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 overwrites // <:|@> p, err := parseOverwrite(arg, false) - return image.Image{ + return types.Image{ Name: p.name, NewTag: p.tag, Digest: p.digest, diff --git a/kustomize/internal/commands/edit/set/setreplicas.go b/kustomize/internal/commands/edit/set/setreplicas.go index 67dc1c8ca..e2ee4b364 100644 --- a/kustomize/internal/commands/edit/set/setreplicas.go +++ b/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 { diff --git a/kustomize/internal/commands/kustfile/kustomizationfile.go b/kustomize/internal/commands/kustfile/kustomizationfile.go index e101244b0..55e85168f 100644 --- a/kustomize/internal/commands/kustfile/kustomizationfile.go +++ b/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" ) diff --git a/kustomize/internal/commands/kustfile/kustomizationfile_test.go b/kustomize/internal/commands/kustfile/kustomizationfile_test.go index f3e68e9f9..05d3f3bcd 100644 --- a/kustomize/internal/commands/kustfile/kustomizationfile_test.go +++ b/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) { diff --git a/kv/kv.go b/kv/kv.go index b3310ff56..973bd4e4d 100644 --- a/kv/kv.go +++ b/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} diff --git a/kv/kv_test.go b/kv/kv_test.go index d755441c1..dba73ce92 100644 --- a/kv/kv_test.go +++ b/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 { diff --git a/pkg/accumulator/resaccumulator.go b/pkg/accumulator/resaccumulator.go index 7ebfc04bd..dc44a3052 100644 --- a/pkg/accumulator/resaccumulator.go +++ b/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 diff --git a/pkg/accumulator/resaccumulator_test.go b/pkg/accumulator/resaccumulator_test.go index 8a79d7ee3..f4492ae44 100644 --- a/pkg/accumulator/resaccumulator_test.go +++ b/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) { diff --git a/pkg/ifc/ifc.go b/pkg/ifc/ifc.go index 6fd18b473..2b802cf71 100644 --- a/pkg/ifc/ifc.go +++ b/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 diff --git a/pkg/image/deprecatedimage.go b/pkg/image/deprecatedimage.go deleted file mode 100644 index 65db4051b..000000000 --- a/pkg/image/deprecatedimage.go +++ /dev/null @@ -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"` -} diff --git a/pkg/kusttest/kusttestharness.go b/pkg/kusttest/kusttestharness.go index b816c4d8f..6a98e056b 100644 --- a/pkg/kusttest/kusttestharness.go +++ b/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. diff --git a/pkg/patch/strategicmerge.go b/pkg/patch/strategicmerge.go index deec8980c..8ef7d64df 100644 --- a/pkg/patch/strategicmerge.go +++ b/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 { diff --git a/pkg/patch/strategicmerge_test.go b/pkg/patch/strategicmerge_test.go index 1cf96d45b..dbd3e33df 100644 --- a/pkg/patch/strategicmerge_test.go +++ b/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 { diff --git a/pkg/plugins/config.go b/pkg/plugins/config.go index 8505df7e2..9f847a7b2 100644 --- a/pkg/plugins/config.go +++ b/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 ( diff --git a/pkg/plugins/execplugin.go b/pkg/plugins/execplugin.go index 0ef16f3cf..15cbe1da1 100644 --- a/pkg/plugins/execplugin.go +++ b/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" ) diff --git a/pkg/plugins/execplugin_test.go b/pkg/plugins/execplugin_test.go index 28eddaca1..0b2722850 100644 --- a/pkg/plugins/execplugin_test.go +++ b/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) { diff --git a/pkg/plugins/loader.go b/pkg/plugins/loader.go index 6f7c45a40..50b4c24c3 100644 --- a/pkg/plugins/loader.go +++ b/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 { diff --git a/pkg/resmap/factory.go b/pkg/resmap/factory.go index 6d1049116..c81d962cb 100644 --- a/pkg/resmap/factory.go +++ b/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. diff --git a/pkg/resmap/factory_test.go b/pkg/resmap/factory_test.go index cd8171123..72b09ac06 100644 --- a/pkg/resmap/factory_test.go +++ b/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) { diff --git a/pkg/resmap/resmap.go b/pkg/resmap/resmap.go index 912239f78..2fda0c622 100644 --- a/pkg/resmap/resmap.go +++ b/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" ) diff --git a/pkg/resmap/resmap_test.go b/pkg/resmap/resmap_test.go index eba29489f..a3617a4c1 100644 --- a/pkg/resmap/resmap_test.go +++ b/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( diff --git a/pkg/resmap/selector_test.go b/pkg/resmap/selector_test.go index 426fa9218..4dd3786bc 100644 --- a/pkg/resmap/selector_test.go +++ b/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 { diff --git a/pkg/resource/factory.go b/pkg/resource/factory.go index c1649b932..1b5986840 100644 --- a/pkg/resource/factory.go +++ b/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. diff --git a/pkg/resource/factory_test.go b/pkg/resource/factory_test.go index 5658a394a..8b0fdd478 100644 --- a/pkg/resource/factory_test.go +++ b/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) { diff --git a/pkg/resource/resource.go b/pkg/resource/resource.go index 01dd4649e..d012d054c 100644 --- a/pkg/resource/resource.go +++ b/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" ) diff --git a/pkg/resource/resource_test.go b/pkg/resource/resource_test.go index 9e34d96c4..21a000acb 100644 --- a/pkg/resource/resource_test.go +++ b/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( diff --git a/pkg/target/kusttarget.go b/pkg/target/kusttarget.go index 6fdbb80cc..efe984f09 100644 --- a/pkg/target/kusttarget.go +++ b/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" ) diff --git a/pkg/target/kusttarget_configplugin.go b/pkg/target/kusttarget_configplugin.go index a4e9d010b..703fded34 100644 --- a/pkg/target/kusttarget_configplugin.go +++ b/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 { diff --git a/pkg/target/kusttarget_test.go b/pkg/target/kusttarget_test.go index 21ce080f1..632490d39 100644 --- a/pkg/target/kusttarget_test.go +++ b/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 ( diff --git a/plugin/builtin/ConfigMapGenerator.go b/plugin/builtin/ConfigMapGenerator.go index ad5d3d72a..36297f56a 100644 --- a/plugin/builtin/ConfigMapGenerator.go +++ b/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" ) diff --git a/plugin/builtin/ImageTagTransformer.go b/plugin/builtin/ImageTagTransformer.go index 2014363f9..3535090f7 100644 --- a/plugin/builtin/ImageTagTransformer.go +++ b/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) } diff --git a/plugin/builtin/InventoryTransformer.go b/plugin/builtin/InventoryTransformer.go index 97f10a39d..69e20166d 100644 --- a/plugin/builtin/InventoryTransformer.go +++ b/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" ) diff --git a/plugin/builtin/NamespaceTransformer.go b/plugin/builtin/NamespaceTransformer.go index 4b400df18..9015cee50 100644 --- a/plugin/builtin/NamespaceTransformer.go +++ b/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" ) diff --git a/plugin/builtin/PatchJson6902Transformer.go b/plugin/builtin/PatchJson6902Transformer.go index 32ba7bb3b..2695a0036 100644 --- a/plugin/builtin/PatchJson6902Transformer.go +++ b/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" ) diff --git a/plugin/builtin/PatchStrategicMergeTransformer.go b/plugin/builtin/PatchStrategicMergeTransformer.go index f35a29e6f..6fb8d5dba 100644 --- a/plugin/builtin/PatchStrategicMergeTransformer.go +++ b/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" ) diff --git a/plugin/builtin/PatchTransformer.go b/plugin/builtin/PatchTransformer.go index ffe99a71c..a6639e844 100644 --- a/plugin/builtin/PatchTransformer.go +++ b/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" ) diff --git a/plugin/builtin/ReplicaCountTransformer.go b/plugin/builtin/ReplicaCountTransformer.go index aaf2a97e5..ab1399b43 100644 --- a/plugin/builtin/ReplicaCountTransformer.go +++ b/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" ) diff --git a/plugin/builtin/SecretGenerator.go b/plugin/builtin/SecretGenerator.go index af9dde280..25bff6b9f 100644 --- a/plugin/builtin/SecretGenerator.go +++ b/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" ) diff --git a/plugin/builtin/configmapgenerator/ConfigMapGenerator.go b/plugin/builtin/configmapgenerator/ConfigMapGenerator.go index 10e28e319..6b5909899 100644 --- a/plugin/builtin/configmapgenerator/ConfigMapGenerator.go +++ b/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" ) diff --git a/plugin/builtin/imagetagtransformer/ImageTagTransformer.go b/plugin/builtin/imagetagtransformer/ImageTagTransformer.go index 510327250..780b197f8 100644 --- a/plugin/builtin/imagetagtransformer/ImageTagTransformer.go +++ b/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) } diff --git a/plugin/builtin/inventorytransformer/InventoryTransformer.go b/plugin/builtin/inventorytransformer/InventoryTransformer.go index 570414edb..7184e532c 100644 --- a/plugin/builtin/inventorytransformer/InventoryTransformer.go +++ b/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" ) diff --git a/plugin/builtin/namespacetransformer/NamespaceTransformer.go b/plugin/builtin/namespacetransformer/NamespaceTransformer.go index b05b06cf5..10895844c 100644 --- a/plugin/builtin/namespacetransformer/NamespaceTransformer.go +++ b/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" ) diff --git a/plugin/builtin/patchjson6902transformer/PatchJson6902Transformer.go b/plugin/builtin/patchjson6902transformer/PatchJson6902Transformer.go index 25f3edffb..675e07243 100644 --- a/plugin/builtin/patchjson6902transformer/PatchJson6902Transformer.go +++ b/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" ) diff --git a/plugin/builtin/patchstrategicmergetransformer/PatchStrategicMergeTransformer.go b/plugin/builtin/patchstrategicmergetransformer/PatchStrategicMergeTransformer.go index 86f53b6c0..1178ee57b 100644 --- a/plugin/builtin/patchstrategicmergetransformer/PatchStrategicMergeTransformer.go +++ b/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" ) diff --git a/plugin/builtin/patchtransformer/PatchTransformer.go b/plugin/builtin/patchtransformer/PatchTransformer.go index 6f381ba95..55c59ab61 100644 --- a/plugin/builtin/patchtransformer/PatchTransformer.go +++ b/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" ) diff --git a/plugin/builtin/replicacounttransformer/ReplicaCountTransformer.go b/plugin/builtin/replicacounttransformer/ReplicaCountTransformer.go index d7e3f0c82..4931c4252 100644 --- a/plugin/builtin/replicacounttransformer/ReplicaCountTransformer.go +++ b/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" ) diff --git a/plugin/builtin/secretgenerator/SecretGenerator.go b/plugin/builtin/secretgenerator/SecretGenerator.go index f4fc5431d..881a427ac 100644 --- a/plugin/builtin/secretgenerator/SecretGenerator.go +++ b/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" ) diff --git a/plugin/someteam.example.com/v1/secretsfromdatabase/SecretsFromDatabase.go b/plugin/someteam.example.com/v1/secretsfromdatabase/SecretsFromDatabase.go index aefa4fd25..08f250d43 100644 --- a/plugin/someteam.example.com/v1/secretsfromdatabase/SecretsFromDatabase.go +++ b/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" ) diff --git a/plugin/someteam.example.com/v1/someservicegenerator/SomeServiceGenerator.go b/plugin/someteam.example.com/v1/someservicegenerator/SomeServiceGenerator.go index 801de58ba..06d9a8dea 100644 --- a/plugin/someteam.example.com/v1/someservicegenerator/SomeServiceGenerator.go +++ b/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" ) diff --git a/plugin/someteam.example.com/v1/stringprefixer/StringPrefixer.go b/plugin/someteam.example.com/v1/stringprefixer/StringPrefixer.go index 859ac8dcb..493521721 100644 --- a/plugin/someteam.example.com/v1/stringprefixer/StringPrefixer.go +++ b/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" ) diff --git a/pkg/types/configmapargs.go b/types/configmapargs.go similarity index 100% rename from pkg/types/configmapargs.go rename to types/configmapargs.go diff --git a/pkg/types/fix.go b/types/fix.go similarity index 100% rename from pkg/types/fix.go rename to types/fix.go diff --git a/pkg/types/garbagepolicy.go b/types/garbagepolicy.go similarity index 100% rename from pkg/types/garbagepolicy.go rename to types/garbagepolicy.go diff --git a/pkg/types/garbagepolicy_string.go b/types/garbagepolicy_string.go similarity index 100% rename from pkg/types/garbagepolicy_string.go rename to types/garbagepolicy_string.go diff --git a/pkg/types/genargs.go b/types/genargs.go similarity index 100% rename from pkg/types/genargs.go rename to types/genargs.go diff --git a/pkg/types/genargs_test.go b/types/genargs_test.go similarity index 94% rename from pkg/types/genargs_test.go rename to types/genargs_test.go index a628f8929..01f316447 100644 --- a/pkg/types/genargs_test.go +++ b/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) { diff --git a/pkg/types/generationbehavior.go b/types/generationbehavior.go similarity index 100% rename from pkg/types/generationbehavior.go rename to types/generationbehavior.go diff --git a/pkg/types/generatorargs.go b/types/generatorargs.go similarity index 100% rename from pkg/types/generatorargs.go rename to types/generatorargs.go diff --git a/pkg/types/generatoroptions.go b/types/generatoroptions.go similarity index 100% rename from pkg/types/generatoroptions.go rename to types/generatoroptions.go diff --git a/pkg/image/image.go b/types/image.go similarity index 85% rename from pkg/image/image.go rename to types/image.go index dbf1ab95b..c7982338f 100644 --- a/pkg/image/image.go +++ b/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 -// for image overwriting of names, tags and digest. -package image +package types // Image contains an image name, a new name, a new tag or digest, // which will replace the original name and tag. diff --git a/pkg/types/inventory.go b/types/inventory.go similarity index 100% rename from pkg/types/inventory.go rename to types/inventory.go diff --git a/pkg/types/kustomization.go b/types/kustomization.go similarity index 98% rename from pkg/types/kustomization.go rename to types/kustomization.go index feb54c4a4..0ec1c64a6 100644 --- a/pkg/types/kustomization.go +++ b/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. diff --git a/pkg/types/kvpairsources.go b/types/kvpairsources.go similarity index 100% rename from pkg/types/kvpairsources.go rename to types/kvpairsources.go diff --git a/pkg/types/objectmeta.go b/types/objectmeta.go similarity index 100% rename from pkg/types/objectmeta.go rename to types/objectmeta.go diff --git a/pkg/types/pair.go b/types/pair.go similarity index 100% rename from pkg/types/pair.go rename to types/pair.go diff --git a/pkg/types/patch.go b/types/patch.go similarity index 100% rename from pkg/types/patch.go rename to types/patch.go diff --git a/pkg/types/patchjson6902.go b/types/patchjson6902.go similarity index 100% rename from pkg/types/patchjson6902.go rename to types/patchjson6902.go diff --git a/pkg/types/patchstrategicmerge.go b/types/patchstrategicmerge.go similarity index 100% rename from pkg/types/patchstrategicmerge.go rename to types/patchstrategicmerge.go diff --git a/pkg/types/patchtarget.go b/types/patchtarget.go similarity index 100% rename from pkg/types/patchtarget.go rename to types/patchtarget.go diff --git a/pkg/types/pluginconfig.go b/types/pluginconfig.go similarity index 100% rename from pkg/types/pluginconfig.go rename to types/pluginconfig.go diff --git a/pkg/types/replica.go b/types/replica.go similarity index 100% rename from pkg/types/replica.go rename to types/replica.go diff --git a/pkg/types/secretargs.go b/types/secretargs.go similarity index 100% rename from pkg/types/secretargs.go rename to types/secretargs.go diff --git a/pkg/types/selector.go b/types/selector.go similarity index 100% rename from pkg/types/selector.go rename to types/selector.go diff --git a/pkg/types/typemeta.go b/types/typemeta.go similarity index 100% rename from pkg/types/typemeta.go rename to types/typemeta.go diff --git a/pkg/types/var.go b/types/var.go similarity index 100% rename from pkg/types/var.go rename to types/var.go diff --git a/pkg/types/var_test.go b/types/var_test.go similarity index 100% rename from pkg/types/var_test.go rename to types/var_test.go