From a7df00c07a26359e77fab5787da145600ed2bdc9 Mon Sep 17 00:00:00 2001 From: jregan Date: Sun, 23 Jun 2019 13:41:15 -0700 Subject: [PATCH] Starting v3 release for plugin developers. [doc]: https://github.com/golang/go/wiki/Modules#releasing-modules-v2-or-higher Per this Go modules [doc] a repo or branch that's already tagged v2 or higher should increment the major version (e.g. go to v3) when releasing their first Go module-based packages. At the moment, the kustomize repo has these top level packages in the sigs.k8s.io/kustomize module: - `cmd` - holds main program for kustomize Conceivably someone can depend on this package for integration tests. - `internal` - intentionally unreleased subpackages - `k8sdeps` - an adapter wrapping k8s dependencies This exists only for use in pre-Go-modules kustomize-into-kubectl integration and won't live much longer (as everything involved is switching to Go modules). - `pkg` - kustomize packages for export This should shrink in later versions, since the surface area is too large, containing sub-packages that should be in 'internal'. - `plugin` - holds main programs for plugins This PR changes the top level go.mod file from ``` module sigs.k8s.io/kustomize ``` to ``` module sigs.k8s.io/kustomize/v3 ``` and adjusts all import statements to reflect the change. --- build/goreleaser.yaml | 2 +- cmd/kustomize/main.go | 2 +- cmd/pluginator/main.go | 4 ++-- docs/FAQ.md | 11 +-------- docs/INSTALL.md | 5 ++-- docs/plugins.md | 4 ++-- docs/zh/INSTALL.md | 2 +- examples/README.md | 2 +- examples/zh/README.md | 2 +- go.mod | 2 +- go.sum | 1 + internal/loadertest/fakeloader.go | 10 ++++---- .../configmapandsecret/configmapfactory.go | 2 +- .../configmapfactory_test.go | 8 +++---- k8sdeps/configmapandsecret/factory.go | 4 ++-- k8sdeps/configmapandsecret/secretfactory.go | 2 +- .../configmapandsecret/secretfactory_test.go | 8 +++---- k8sdeps/kunstruct/factory.go | 6 ++--- k8sdeps/kunstruct/factory_test.go | 2 +- k8sdeps/kunstruct/hasher.go | 4 ++-- k8sdeps/kunstruct/kunstruct.go | 6 ++--- k8sdeps/transformer/factory.go | 6 ++--- k8sdeps/transformer/patch/conflictdetector.go | 2 +- k8sdeps/transformer/patch/transformer.go | 10 ++++---- k8sdeps/transformer/patch/transformer_test.go | 6 ++--- pkg/accumulator/resaccumulator.go | 10 ++++---- pkg/accumulator/resaccumulator_test.go | 16 ++++++------- pkg/commands/build/build.go | 18 +++++++-------- pkg/commands/build/build_test.go | 2 +- pkg/commands/commands.go | 20 ++++++++-------- pkg/commands/edit/add/addbase.go | 4 ++-- pkg/commands/edit/add/addbase_test.go | 4 ++-- pkg/commands/edit/add/addmetadata.go | 8 +++---- pkg/commands/edit/add/addmetadata_test.go | 8 +++---- pkg/commands/edit/add/addpatch.go | 6 ++--- pkg/commands/edit/add/addpatch_test.go | 2 +- pkg/commands/edit/add/addresource.go | 4 ++-- pkg/commands/edit/add/addresource_test.go | 2 +- pkg/commands/edit/add/all.go | 4 ++-- pkg/commands/edit/add/configmap.go | 8 +++---- pkg/commands/edit/add/configmap_test.go | 8 +++---- pkg/commands/edit/add/flagsandargs.go | 2 +- pkg/commands/edit/add/flagsandargs_test.go | 2 +- pkg/commands/edit/add/secret.go | 8 +++---- pkg/commands/edit/add/secret_test.go | 8 +++---- pkg/commands/edit/add/util.go | 2 +- pkg/commands/edit/all.go | 14 +++++------ pkg/commands/edit/fix/fix.go | 4 ++-- pkg/commands/edit/fix/fix_test.go | 2 +- pkg/commands/edit/remove/all.go | 4 ++-- pkg/commands/edit/remove/removemetadata.go | 8 +++---- .../edit/remove/removemetadata_test.go | 8 +++---- pkg/commands/edit/remove/removeresource.go | 4 ++-- .../edit/remove/removeresource_test.go | 2 +- pkg/commands/edit/set/all.go | 4 ++-- pkg/commands/edit/set/set_name_prefix.go | 4 ++-- pkg/commands/edit/set/set_name_prefix_test.go | 2 +- pkg/commands/edit/set/set_name_suffix.go | 4 ++-- pkg/commands/edit/set/set_name_suffix_test.go | 2 +- pkg/commands/edit/set/setimage.go | 6 ++--- pkg/commands/edit/set/setimage_test.go | 2 +- pkg/commands/edit/set/setnamespace.go | 6 ++--- pkg/commands/edit/set/setnamespace_test.go | 4 ++-- pkg/commands/kustfile/kustomizationfile.go | 6 ++--- .../kustfile/kustomizationfile_test.go | 6 ++--- pkg/commands/misc/config.go | 4 ++-- pkg/commands/misc/config_test.go | 2 +- pkg/expansion/expand_test.go | 2 +- pkg/fs/fakefs.go | 2 +- pkg/git/cloner.go | 2 +- pkg/git/repospec.go | 2 +- pkg/hasher/hasher_test.go | 2 +- pkg/ifc/ifc.go | 4 ++-- pkg/ifc/transformer/factory.go | 4 ++-- pkg/inventory/inventory.go | 2 +- pkg/inventory/inventory_test.go | 2 +- pkg/kusttest/kusttestharness.go | 22 +++++++++--------- pkg/loader/fileloader.go | 6 ++--- pkg/loader/fileloader_test.go | 10 ++++---- pkg/loader/kv.go | 4 ++-- pkg/loader/kv_test.go | 6 ++--- pkg/loader/loader.go | 6 ++--- pkg/loader/loadrestrictions.go | 2 +- pkg/loader/loadrestrictions_test.go | 2 +- pkg/patch/strategicmerge.go | 2 +- pkg/patch/transformer/factory.go | 10 ++++---- pkg/patch/transformer/factory_test.go | 10 ++++---- pkg/patch/transformer/patchjson6902json.go | 8 +++---- .../transformer/patchjson6902json_test.go | 10 ++++---- pkg/plugins/compiler.go | 2 +- pkg/plugins/compiler_test.go | 2 +- pkg/plugins/config.go | 4 ++-- {plugin => pkg/plugins}/envfortest.go | 13 +++++------ pkg/plugins/execplugin.go | 6 ++--- pkg/plugins/execplugin_test.go | 8 +++---- pkg/plugins/loader.go | 12 +++++----- pkg/plugins/loader_test.go | 13 +++++------ pkg/resid/resid.go | 2 +- pkg/resid/resid_test.go | 2 +- pkg/resmap/factory.go | 8 +++---- pkg/resmap/factory_test.go | 18 +++++++-------- pkg/resmap/idslice.go | 2 +- pkg/resmap/idslice_test.go | 2 +- pkg/resmap/resmap.go | 6 ++--- pkg/resmap/resmap_test.go | 12 +++++----- pkg/resmaptest/rmbuilder.go | 6 ++--- pkg/resource/factory.go | 6 ++--- pkg/resource/factory_test.go | 6 ++--- pkg/resource/resource.go | 6 ++--- pkg/resource/resource_test.go | 10 ++++---- pkg/target/baseandoverlaymedium_test.go | 2 +- pkg/target/baseandoverlaysmall_test.go | 6 ++--- pkg/target/chartinflatorplugin_test.go | 6 ++--- pkg/target/configmaps_test.go | 2 +- pkg/target/crd_test.go | 2 +- pkg/target/customconfig_test.go | 2 +- pkg/target/generatormergeandreplace_test.go | 2 +- pkg/target/generatoroptions_test.go | 2 +- pkg/target/kusttarget.go | 20 ++++++++-------- pkg/target/kusttarget_configplugin.go | 12 +++++----- pkg/target/kusttarget_test.go | 16 ++++++------- pkg/target/multiplepatch_test.go | 2 +- pkg/target/namespacedgenerators_test.go | 2 +- pkg/target/nullvalues_test.go | 2 +- pkg/target/plugindir_test.go | 23 +++++++++---------- pkg/target/pruneconfigmap_test.go | 2 +- pkg/target/resourceconflict_test.go | 2 +- pkg/target/transformerplugin_test.go | 12 +++++----- pkg/target/transformersarrays_test.go | 2 +- pkg/target/transformersimage_test.go | 2 +- pkg/target/variableref_test.go | 2 +- pkg/transformers/config/factory.go | 2 +- pkg/transformers/config/factory_test.go | 4 ++-- pkg/transformers/config/factorycrd.go | 4 ++-- pkg/transformers/config/factorycrd_test.go | 6 ++--- pkg/transformers/config/fieldspec.go | 2 +- pkg/transformers/config/fieldspec_test.go | 2 +- pkg/transformers/config/namebackreferences.go | 2 +- .../config/namebackreferences_test.go | 2 +- pkg/transformers/config/transformerconfig.go | 2 +- .../config/transformerconfig_test.go | 2 +- pkg/transformers/labelsandannotations.go | 4 ++-- pkg/transformers/labelsandannotations_test.go | 8 +++---- pkg/transformers/multitransformer.go | 2 +- pkg/transformers/mutatefield_test.go | 4 ++-- pkg/transformers/namereference.go | 8 +++---- pkg/transformers/namereference_test.go | 8 +++---- pkg/transformers/nooptransformer.go | 2 +- pkg/transformers/refvars.go | 6 ++--- pkg/transformers/refvars_test.go | 8 +++---- pkg/transformers/transformer.go | 2 +- pkg/types/genargs_test.go | 2 +- pkg/types/kustomization.go | 4 ++-- pkg/types/var.go | 2 +- pkg/types/var_test.go | 2 +- plugin/builtin/AnnotationsTransformer.go | 8 +++---- plugin/builtin/ConfigMapGenerator.go | 6 ++--- plugin/builtin/HashTransformer.go | 4 ++-- plugin/builtin/ImageTagTransformer.go | 10 ++++---- plugin/builtin/InventoryTransformer.go | 14 +++++------ plugin/builtin/LabelTransformer.go | 8 +++---- plugin/builtin/LegacyOrderTransformer.go | 6 ++--- plugin/builtin/NamespaceTransformer.go | 14 +++++------ plugin/builtin/PatchJson6902Transformer.go | 8 +++---- plugin/builtin/PrefixSuffixTransformer.go | 12 +++++----- plugin/builtin/ReplicaCountTransformer.go | 12 +++++----- plugin/builtin/SecretGenerator.go | 6 ++--- .../AnnotationsTransformer.go | 10 ++++---- .../AnnotationsTransformer_test.go | 6 ++--- .../configmapgenerator/ConfigMapGenerator.go | 8 +++---- .../ConfigMapGenerator_test.go | 6 ++--- .../hashtransformer/HashTransformer.go | 6 ++--- .../hashtransformer/HashTransformer_test.go | 6 ++--- .../ImageTagTransformer.go | 12 +++++----- .../ImageTagTransformer_test.go | 6 ++--- .../InventoryTransformer.go | 16 ++++++------- .../InventoryTransformer_test.go | 10 ++++---- .../labeltransformer/LabelTransformer.go | 10 ++++---- .../labeltransformer/LabelTransformer_test.go | 6 ++--- .../LegacyOrderTransformer.go | 8 +++---- .../LegacyOrderTransformer_test.go | 6 ++--- .../NamespaceTransformer.go | 16 ++++++------- .../NamespaceTransformer_test.go | 8 +++---- .../PatchJson6902Transformer.go | 10 ++++---- .../PatchJson6902Transformer_test.go | 6 ++--- .../PrefixSuffixTransformer.go | 14 +++++------ .../PrefixSuffixTransformer_test.go | 8 +++---- .../ReplicaCountTransformer.go | 14 +++++------ .../ReplicaCountTransformer_test.go | 6 ++--- .../secretgenerator/SecretGenerator.go | 8 +++---- .../secretgenerator/SecretGenerator_test.go | 6 ++--- plugin/doc.go | 6 ++--- plugin/generateBuiltins.sh | 6 ++--- .../bashedconfigmap/BashedConfigMap_test.go | 6 ++--- .../v1/chartinflator/ChartInflator_test.go | 6 ++--- .../v1/dateprefixer/DatePrefixer.go | 10 ++++---- .../v1/dateprefixer/DatePrefixer_test.go | 6 ++--- .../v1/printworkdir/PrintWorkDir_test.go | 8 +++---- .../SecretsFromDatabase.go | 6 ++--- .../SecretsFromDatabase_test.go | 6 ++--- .../v1/sedtransformer/SedTransformer_test.go | 6 ++--- .../SomeServiceGenerator.go | 4 ++-- .../SomeServiceGenerator_test.go | 6 ++--- .../v1/stringprefixer/StringPrefixer.go | 10 ++++---- .../v1/stringprefixer/StringPrefixer_test.go | 6 ++--- .../v1/validator/validator_test.go | 8 +++---- travis/pre-commit.sh | 8 +++---- 207 files changed, 626 insertions(+), 638 deletions(-) rename {plugin => pkg/plugins}/envfortest.go (89%) diff --git a/build/goreleaser.yaml b/build/goreleaser.yaml index 0f85602c7..8544b5cb6 100644 --- a/build/goreleaser.yaml +++ b/build/goreleaser.yaml @@ -8,7 +8,7 @@ project_name: kustomize builds: - main: ./cmd/kustomize/main.go binary: kustomize - ldflags: -s -X sigs.k8s.io/kustomize/pkg/commands/misc.kustomizeVersion={{.Version}} -X sigs.k8s.io/kustomize/pkg/commands/misc.gitCommit={{.Commit}} -X sigs.k8s.io/kustomize/pkg/commands/misc.buildDate={{.Date}} + ldflags: -s -X sigs.k8s.io/kustomize/v3/pkg/commands/misc.kustomizeVersion={{.Version}} -X sigs.k8s.io/kustomize/v3/pkg/commands/misc.gitCommit={{.Commit}} -X sigs.k8s.io/kustomize/v3/pkg/commands/misc.buildDate={{.Date}} goos: - darwin - linux diff --git a/cmd/kustomize/main.go b/cmd/kustomize/main.go index 550009e32..9eb90d74e 100644 --- a/cmd/kustomize/main.go +++ b/cmd/kustomize/main.go @@ -6,7 +6,7 @@ package main import ( "os" - "sigs.k8s.io/kustomize/pkg/commands" + "sigs.k8s.io/kustomize/v3/pkg/commands" ) func main() { diff --git a/cmd/pluginator/main.go b/cmd/pluginator/main.go index cd44002cc..4dd4e554c 100644 --- a/cmd/pluginator/main.go +++ b/cmd/pluginator/main.go @@ -12,8 +12,8 @@ import ( "path/filepath" "strings" - "sigs.k8s.io/kustomize/pkg/pgmconfig" - "sigs.k8s.io/kustomize/pkg/plugins" + "sigs.k8s.io/kustomize/v3/pkg/pgmconfig" + "sigs.k8s.io/kustomize/v3/pkg/plugins" ) func main() { diff --git a/docs/FAQ.md b/docs/FAQ.md index 2be9f509c..75ec4fde8 100644 --- a/docs/FAQ.md +++ b/docs/FAQ.md @@ -23,17 +23,8 @@ kustomization file, and refering to this directory as a wants to use it. This encourages modularity and relocatability. -At the moment (in v2.0.3), however, there's no -(released) analogous way to share patch files and other -transformer configuration data between kustomizations. - -As a stop-gap until we add base-like behavior for -transformers, we've added a flag to disable the check: - +To disable this, use v3, and the `load_restrictor` flag: ``` kustomize build --load_restrictor none $target ``` - -This flag is not in v2.0.3, but is available from head -(`go install sigs.k8s.io/kustomize`). diff --git a/docs/INSTALL.md b/docs/INSTALL.md index 31ba5012a..4a75431c4 100644 --- a/docs/INSTALL.md +++ b/docs/INSTALL.md @@ -23,13 +23,13 @@ To install from head with [Go] v1.12 or higher: ``` -go install sigs.k8s.io/kustomize/cmd/kustomize +go install sigs.k8s.io/kustomize/v3/cmd/kustomize ``` ### Other methods #### macOS - + ``` brew install kustomize ``` @@ -44,4 +44,3 @@ For support on the chocolatey package and prior releases, see: - [Choco Package](https://chocolatey.org/packages/kustomize) - [Package Source](https://github.com/kenmaglio/choco-kustomize) - diff --git a/docs/plugins.md b/docs/plugins.md index f7d89569f..44e08a8b5 100644 --- a/docs/plugins.md +++ b/docs/plugins.md @@ -242,8 +242,8 @@ A [Go plugin] for kustomize looks like this: > package main > > import ( -> "sigs.k8s.io/kustomize/pkg/ifc" -> "sigs.k8s.io/kustomize/pkg/resmap" +> "sigs.k8s.io/kustomize/v3/pkg/ifc" +> "sigs.k8s.io/kustomize/v3/pkg/resmap" > ... > ) > diff --git a/docs/zh/INSTALL.md b/docs/zh/INSTALL.md index 16f8a2b87..f5a0bea4c 100644 --- a/docs/zh/INSTALL.md +++ b/docs/zh/INSTALL.md @@ -35,5 +35,5 @@ chmod u+x kustomize ``` -go get sigs.k8s.io/kustomize +go install sigs.k8s.io/kustomize/v3/cmd/kustomize ``` diff --git a/examples/README.md b/examples/README.md index 42b06efb7..37402cfc4 100644 --- a/examples/README.md +++ b/examples/README.md @@ -9,7 +9,7 @@ tests, and should work with HEAD ``` -go get sigs.k8s.io/kustomize/cmd/kustomize +go get sigs.k8s.io/kustomize/v3/cmd/kustomize ``` Basic Usage diff --git a/examples/zh/README.md b/examples/zh/README.md index 6802377ac..092b75fd0 100644 --- a/examples/zh/README.md +++ b/examples/zh/README.md @@ -7,7 +7,7 @@ 这些示例通过了 [pre-commit](../../travis/pre-commit.sh) 测试，并且应该与 HEAD 一起使用。 ``` -go get sigs.k8s.io/kustomize +go get sigs.k8s.io/kustomize/v3/cmd/kustomize ``` 基本用法 diff --git a/go.mod b/go.mod index ba53f718d..51743d9be 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module sigs.k8s.io/kustomize +module sigs.k8s.io/kustomize/v3 go 1.12 diff --git a/go.sum b/go.sum index 0cb2643a3..80af10b71 100644 --- a/go.sum +++ b/go.sum @@ -172,6 +172,7 @@ k8s.io/klog v0.3.3/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc= k8s.io/kube-openapi v0.0.0-20190603182131-db7b694dc208 h1:5sW+fEHvlJI3Ngolx30CmubFulwH28DhKjGf70Xmtco= k8s.io/kube-openapi v0.0.0-20190603182131-db7b694dc208/go.mod h1:nfDlWeOsu3pUf4yWGL+ERqohP4YsZcBJXWMK+gkzOA4= +sigs.k8s.io/kustomize v2.0.3+incompatible h1:JUufWFNlI44MdtnjUqVnvh29rR37PQFzPbLXqhyOyX0= sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI= sigs.k8s.io/yaml v1.1.0 h1:4A07+ZFc2wgJwo8YNlQpr1rVlgUDlxXHhPJciaPY5gs= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= diff --git a/internal/loadertest/fakeloader.go b/internal/loadertest/fakeloader.go index 4accf4574..317ff7e3b 100644 --- a/internal/loadertest/fakeloader.go +++ b/internal/loadertest/fakeloader.go @@ -6,11 +6,11 @@ package loadertest import ( "log" - "sigs.k8s.io/kustomize/pkg/fs" - "sigs.k8s.io/kustomize/pkg/ifc" - "sigs.k8s.io/kustomize/pkg/loader" - "sigs.k8s.io/kustomize/pkg/types" - "sigs.k8s.io/kustomize/pkg/validators" + "sigs.k8s.io/kustomize/v3/pkg/fs" + "sigs.k8s.io/kustomize/v3/pkg/ifc" + "sigs.k8s.io/kustomize/v3/pkg/loader" + "sigs.k8s.io/kustomize/v3/pkg/types" + "sigs.k8s.io/kustomize/v3/pkg/validators" ) // FakeLoader encapsulates the delegate Loader and the fake file system. diff --git a/k8sdeps/configmapandsecret/configmapfactory.go b/k8sdeps/configmapandsecret/configmapfactory.go index 7bb0145c8..d866958a8 100644 --- a/k8sdeps/configmapandsecret/configmapfactory.go +++ b/k8sdeps/configmapandsecret/configmapfactory.go @@ -9,7 +9,7 @@ import ( "unicode/utf8" "k8s.io/api/core/v1" - "sigs.k8s.io/kustomize/pkg/types" + "sigs.k8s.io/kustomize/v3/pkg/types" ) func makeFreshConfigMap( diff --git a/k8sdeps/configmapandsecret/configmapfactory_test.go b/k8sdeps/configmapandsecret/configmapfactory_test.go index 85611caae..e98a5b489 100644 --- a/k8sdeps/configmapandsecret/configmapfactory_test.go +++ b/k8sdeps/configmapandsecret/configmapfactory_test.go @@ -9,10 +9,10 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "sigs.k8s.io/kustomize/pkg/fs" - "sigs.k8s.io/kustomize/pkg/loader" - "sigs.k8s.io/kustomize/pkg/types" - "sigs.k8s.io/kustomize/pkg/validators" + "sigs.k8s.io/kustomize/v3/pkg/fs" + "sigs.k8s.io/kustomize/v3/pkg/loader" + "sigs.k8s.io/kustomize/v3/pkg/types" + "sigs.k8s.io/kustomize/v3/pkg/validators" ) func makeEnvConfigMap(name string) *corev1.ConfigMap { diff --git a/k8sdeps/configmapandsecret/factory.go b/k8sdeps/configmapandsecret/factory.go index c491749ff..9b6e3f885 100644 --- a/k8sdeps/configmapandsecret/factory.go +++ b/k8sdeps/configmapandsecret/factory.go @@ -4,8 +4,8 @@ package configmapandsecret import ( - "sigs.k8s.io/kustomize/pkg/ifc" - "sigs.k8s.io/kustomize/pkg/types" + "sigs.k8s.io/kustomize/v3/pkg/ifc" + "sigs.k8s.io/kustomize/v3/pkg/types" ) // Factory makes ConfigMaps and Secrets. diff --git a/k8sdeps/configmapandsecret/secretfactory.go b/k8sdeps/configmapandsecret/secretfactory.go index 1fe8231f2..7d17fb4df 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/pkg/types" + "sigs.k8s.io/kustomize/v3/pkg/types" ) func makeFreshSecret( diff --git a/k8sdeps/configmapandsecret/secretfactory_test.go b/k8sdeps/configmapandsecret/secretfactory_test.go index 0e88d0615..d10e7552d 100644 --- a/k8sdeps/configmapandsecret/secretfactory_test.go +++ b/k8sdeps/configmapandsecret/secretfactory_test.go @@ -9,10 +9,10 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "sigs.k8s.io/kustomize/pkg/fs" - "sigs.k8s.io/kustomize/pkg/loader" - "sigs.k8s.io/kustomize/pkg/types" - "sigs.k8s.io/kustomize/pkg/validators" + "sigs.k8s.io/kustomize/v3/pkg/fs" + "sigs.k8s.io/kustomize/v3/pkg/loader" + "sigs.k8s.io/kustomize/v3/pkg/types" + "sigs.k8s.io/kustomize/v3/pkg/validators" ) func makeEnvSecret(name string) *corev1.Secret { diff --git a/k8sdeps/kunstruct/factory.go b/k8sdeps/kunstruct/factory.go index 1d7a06adc..e140b4fd0 100644 --- a/k8sdeps/kunstruct/factory.go +++ b/k8sdeps/kunstruct/factory.go @@ -11,9 +11,9 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/util/yaml" - "sigs.k8s.io/kustomize/k8sdeps/configmapandsecret" - "sigs.k8s.io/kustomize/pkg/ifc" - "sigs.k8s.io/kustomize/pkg/types" + "sigs.k8s.io/kustomize/v3/k8sdeps/configmapandsecret" + "sigs.k8s.io/kustomize/v3/pkg/ifc" + "sigs.k8s.io/kustomize/v3/pkg/types" ) // KunstructuredFactoryImpl hides construction using apimachinery types. diff --git a/k8sdeps/kunstruct/factory_test.go b/k8sdeps/kunstruct/factory_test.go index 4fe710934..25a54ad24 100644 --- a/k8sdeps/kunstruct/factory_test.go +++ b/k8sdeps/kunstruct/factory_test.go @@ -20,7 +20,7 @@ import ( "reflect" "testing" - "sigs.k8s.io/kustomize/pkg/ifc" + "sigs.k8s.io/kustomize/v3/pkg/ifc" ) func TestSliceFromBytes(t *testing.T) { diff --git a/k8sdeps/kunstruct/hasher.go b/k8sdeps/kunstruct/hasher.go index 0d708023e..cbbfa47a9 100644 --- a/k8sdeps/kunstruct/hasher.go +++ b/k8sdeps/kunstruct/hasher.go @@ -9,8 +9,8 @@ import ( "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - "sigs.k8s.io/kustomize/pkg/hasher" - "sigs.k8s.io/kustomize/pkg/ifc" + "sigs.k8s.io/kustomize/v3/pkg/hasher" + "sigs.k8s.io/kustomize/v3/pkg/ifc" ) // kustHash computes a hash of an unstructured object. diff --git a/k8sdeps/kunstruct/kunstruct.go b/k8sdeps/kunstruct/kunstruct.go index cb39c1dea..24cad01e1 100644 --- a/k8sdeps/kunstruct/kunstruct.go +++ b/k8sdeps/kunstruct/kunstruct.go @@ -20,13 +20,13 @@ package kunstruct import ( "encoding/json" "fmt" - "sigs.k8s.io/kustomize/pkg/types" + "sigs.k8s.io/kustomize/v3/pkg/types" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" - "sigs.k8s.io/kustomize/pkg/gvk" - "sigs.k8s.io/kustomize/pkg/ifc" + "sigs.k8s.io/kustomize/v3/pkg/gvk" + "sigs.k8s.io/kustomize/v3/pkg/ifc" ) var _ ifc.Kunstructured = &UnstructAdapter{} diff --git a/k8sdeps/transformer/factory.go b/k8sdeps/transformer/factory.go index 0491db864..ce071b157 100644 --- a/k8sdeps/transformer/factory.go +++ b/k8sdeps/transformer/factory.go @@ -5,9 +5,9 @@ package transformer import ( - "sigs.k8s.io/kustomize/k8sdeps/transformer/patch" - "sigs.k8s.io/kustomize/pkg/resource" - "sigs.k8s.io/kustomize/pkg/transformers" + "sigs.k8s.io/kustomize/v3/k8sdeps/transformer/patch" + "sigs.k8s.io/kustomize/v3/pkg/resource" + "sigs.k8s.io/kustomize/v3/pkg/transformers" ) // FactoryImpl makes patch transformer and name hash transformer diff --git a/k8sdeps/transformer/patch/conflictdetector.go b/k8sdeps/transformer/patch/conflictdetector.go index 3c7b11198..42adb3c8e 100644 --- a/k8sdeps/transformer/patch/conflictdetector.go +++ b/k8sdeps/transformer/patch/conflictdetector.go @@ -10,7 +10,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/mergepatch" "k8s.io/apimachinery/pkg/util/strategicpatch" - "sigs.k8s.io/kustomize/pkg/resource" + "sigs.k8s.io/kustomize/v3/pkg/resource" ) type conflictDetector interface { diff --git a/k8sdeps/transformer/patch/transformer.go b/k8sdeps/transformer/patch/transformer.go index ba402149b..2fbc2738a 100644 --- a/k8sdeps/transformer/patch/transformer.go +++ b/k8sdeps/transformer/patch/transformer.go @@ -12,11 +12,11 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/strategicpatch" "k8s.io/client-go/kubernetes/scheme" - "sigs.k8s.io/kustomize/pkg/gvk" - "sigs.k8s.io/kustomize/pkg/resid" - "sigs.k8s.io/kustomize/pkg/resmap" - "sigs.k8s.io/kustomize/pkg/resource" - "sigs.k8s.io/kustomize/pkg/transformers" + "sigs.k8s.io/kustomize/v3/pkg/gvk" + "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/transformers" ) // transformer applies strategic merge patches. diff --git a/k8sdeps/transformer/patch/transformer_test.go b/k8sdeps/transformer/patch/transformer_test.go index aa3541c3e..f258efe1d 100644 --- a/k8sdeps/transformer/patch/transformer_test.go +++ b/k8sdeps/transformer/patch/transformer_test.go @@ -8,9 +8,9 @@ import ( "strings" "testing" - "sigs.k8s.io/kustomize/k8sdeps/kunstruct" - "sigs.k8s.io/kustomize/pkg/resmaptest" - "sigs.k8s.io/kustomize/pkg/resource" + "sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct" + "sigs.k8s.io/kustomize/v3/pkg/resmaptest" + "sigs.k8s.io/kustomize/v3/pkg/resource" ) var rf = resource.NewFactory( diff --git a/pkg/accumulator/resaccumulator.go b/pkg/accumulator/resaccumulator.go index cf01db0c2..cf5825bc9 100644 --- a/pkg/accumulator/resaccumulator.go +++ b/pkg/accumulator/resaccumulator.go @@ -8,11 +8,11 @@ import ( "log" "strings" - "sigs.k8s.io/kustomize/pkg/resid" - "sigs.k8s.io/kustomize/pkg/resmap" - "sigs.k8s.io/kustomize/pkg/transformers" - "sigs.k8s.io/kustomize/pkg/transformers/config" - "sigs.k8s.io/kustomize/pkg/types" + "sigs.k8s.io/kustomize/v3/pkg/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/kustomize/v3/pkg/types" ) // ResAccumulator accumulates resources and the rules diff --git a/pkg/accumulator/resaccumulator_test.go b/pkg/accumulator/resaccumulator_test.go index 1e5915143..70f0cb2da 100644 --- a/pkg/accumulator/resaccumulator_test.go +++ b/pkg/accumulator/resaccumulator_test.go @@ -10,14 +10,14 @@ import ( "strings" "testing" - "sigs.k8s.io/kustomize/k8sdeps/kunstruct" - . "sigs.k8s.io/kustomize/pkg/accumulator" - "sigs.k8s.io/kustomize/pkg/gvk" - "sigs.k8s.io/kustomize/pkg/resmap" - "sigs.k8s.io/kustomize/pkg/resmaptest" - "sigs.k8s.io/kustomize/pkg/resource" - "sigs.k8s.io/kustomize/pkg/transformers/config" - "sigs.k8s.io/kustomize/pkg/types" + "sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct" + . "sigs.k8s.io/kustomize/v3/pkg/accumulator" + "sigs.k8s.io/kustomize/v3/pkg/gvk" + "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" + "sigs.k8s.io/kustomize/v3/pkg/types" ) func makeResAccumulator(t *testing.T) (*ResAccumulator, *resource.Factory) { diff --git a/pkg/commands/build/build.go b/pkg/commands/build/build.go index ca95bef60..3aa6d0e43 100644 --- a/pkg/commands/build/build.go +++ b/pkg/commands/build/build.go @@ -11,15 +11,15 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "sigs.k8s.io/kustomize/pkg/fs" - "sigs.k8s.io/kustomize/pkg/ifc" - "sigs.k8s.io/kustomize/pkg/ifc/transformer" - "sigs.k8s.io/kustomize/pkg/loader" - "sigs.k8s.io/kustomize/pkg/pgmconfig" - "sigs.k8s.io/kustomize/pkg/plugins" - "sigs.k8s.io/kustomize/pkg/resmap" - "sigs.k8s.io/kustomize/pkg/target" - "sigs.k8s.io/kustomize/plugin/builtin" + "sigs.k8s.io/kustomize/v3/pkg/fs" + "sigs.k8s.io/kustomize/v3/pkg/ifc" + "sigs.k8s.io/kustomize/v3/pkg/ifc/transformer" + "sigs.k8s.io/kustomize/v3/pkg/loader" + "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/target" + "sigs.k8s.io/kustomize/v3/plugin/builtin" "sigs.k8s.io/yaml" ) diff --git a/pkg/commands/build/build_test.go b/pkg/commands/build/build_test.go index 02302a1ed..101b66907 100644 --- a/pkg/commands/build/build_test.go +++ b/pkg/commands/build/build_test.go @@ -19,7 +19,7 @@ package build import ( "testing" - "sigs.k8s.io/kustomize/pkg/pgmconfig" + "sigs.k8s.io/kustomize/v3/pkg/pgmconfig" ) func TestNewOptionsToSilenceCodeInspectionError(t *testing.T) { diff --git a/pkg/commands/commands.go b/pkg/commands/commands.go index 0a20bd6ce..51b8f2875 100644 --- a/pkg/commands/commands.go +++ b/pkg/commands/commands.go @@ -9,16 +9,16 @@ import ( "os" "github.com/spf13/cobra" - "sigs.k8s.io/kustomize/k8sdeps/kunstruct" - "sigs.k8s.io/kustomize/k8sdeps/transformer" - "sigs.k8s.io/kustomize/k8sdeps/validator" - "sigs.k8s.io/kustomize/pkg/commands/build" - "sigs.k8s.io/kustomize/pkg/commands/edit" - "sigs.k8s.io/kustomize/pkg/commands/misc" - "sigs.k8s.io/kustomize/pkg/fs" - "sigs.k8s.io/kustomize/pkg/pgmconfig" - "sigs.k8s.io/kustomize/pkg/resmap" - "sigs.k8s.io/kustomize/pkg/resource" + "sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct" + "sigs.k8s.io/kustomize/v3/k8sdeps/transformer" + "sigs.k8s.io/kustomize/v3/k8sdeps/validator" + "sigs.k8s.io/kustomize/v3/pkg/commands/build" + "sigs.k8s.io/kustomize/v3/pkg/commands/edit" + "sigs.k8s.io/kustomize/v3/pkg/commands/misc" + "sigs.k8s.io/kustomize/v3/pkg/fs" + "sigs.k8s.io/kustomize/v3/pkg/pgmconfig" + "sigs.k8s.io/kustomize/v3/pkg/resmap" + "sigs.k8s.io/kustomize/v3/pkg/resource" ) // NewDefaultCommand returns the default (aka root) command for kustomize command. diff --git a/pkg/commands/edit/add/addbase.go b/pkg/commands/edit/add/addbase.go index 01b88c2e3..1d4df575a 100644 --- a/pkg/commands/edit/add/addbase.go +++ b/pkg/commands/edit/add/addbase.go @@ -22,8 +22,8 @@ import ( "strings" "github.com/spf13/cobra" - "sigs.k8s.io/kustomize/pkg/commands/kustfile" - "sigs.k8s.io/kustomize/pkg/fs" + "sigs.k8s.io/kustomize/v3/pkg/commands/kustfile" + "sigs.k8s.io/kustomize/v3/pkg/fs" ) type addBaseOptions struct { diff --git a/pkg/commands/edit/add/addbase_test.go b/pkg/commands/edit/add/addbase_test.go index 03e884c3e..d835cd63b 100644 --- a/pkg/commands/edit/add/addbase_test.go +++ b/pkg/commands/edit/add/addbase_test.go @@ -20,8 +20,8 @@ import ( "strings" "testing" - "sigs.k8s.io/kustomize/pkg/commands/kustfile" - "sigs.k8s.io/kustomize/pkg/fs" + "sigs.k8s.io/kustomize/v3/pkg/commands/kustfile" + "sigs.k8s.io/kustomize/v3/pkg/fs" ) const ( diff --git a/pkg/commands/edit/add/addmetadata.go b/pkg/commands/edit/add/addmetadata.go index c129c1e6d..87099c16f 100644 --- a/pkg/commands/edit/add/addmetadata.go +++ b/pkg/commands/edit/add/addmetadata.go @@ -21,10 +21,10 @@ import ( "strings" "github.com/spf13/cobra" - "sigs.k8s.io/kustomize/pkg/commands/kustfile" - "sigs.k8s.io/kustomize/pkg/fs" - "sigs.k8s.io/kustomize/pkg/pgmconfig" - "sigs.k8s.io/kustomize/pkg/types" + "sigs.k8s.io/kustomize/v3/pkg/commands/kustfile" + "sigs.k8s.io/kustomize/v3/pkg/fs" + "sigs.k8s.io/kustomize/v3/pkg/pgmconfig" + "sigs.k8s.io/kustomize/v3/pkg/types" ) // kindOfAdd is the kind of metadata being added: label or annotation diff --git a/pkg/commands/edit/add/addmetadata_test.go b/pkg/commands/edit/add/addmetadata_test.go index 289d2581f..cee138687 100644 --- a/pkg/commands/edit/add/addmetadata_test.go +++ b/pkg/commands/edit/add/addmetadata_test.go @@ -20,10 +20,10 @@ import ( "reflect" "testing" - "sigs.k8s.io/kustomize/pkg/commands/kustfile" - "sigs.k8s.io/kustomize/pkg/fs" - "sigs.k8s.io/kustomize/pkg/types" - "sigs.k8s.io/kustomize/pkg/validators" + "sigs.k8s.io/kustomize/v3/pkg/commands/kustfile" + "sigs.k8s.io/kustomize/v3/pkg/fs" + "sigs.k8s.io/kustomize/v3/pkg/types" + "sigs.k8s.io/kustomize/v3/pkg/validators" ) func makeKustomization(t *testing.T) *types.Kustomization { diff --git a/pkg/commands/edit/add/addpatch.go b/pkg/commands/edit/add/addpatch.go index 01af65499..abd8c4826 100644 --- a/pkg/commands/edit/add/addpatch.go +++ b/pkg/commands/edit/add/addpatch.go @@ -21,9 +21,9 @@ import ( "log" "github.com/spf13/cobra" - "sigs.k8s.io/kustomize/pkg/commands/kustfile" - "sigs.k8s.io/kustomize/pkg/fs" - "sigs.k8s.io/kustomize/pkg/patch" + "sigs.k8s.io/kustomize/v3/pkg/commands/kustfile" + "sigs.k8s.io/kustomize/v3/pkg/fs" + "sigs.k8s.io/kustomize/v3/pkg/patch" ) type addPatchOptions struct { diff --git a/pkg/commands/edit/add/addpatch_test.go b/pkg/commands/edit/add/addpatch_test.go index 71ec98403..8d54e9f14 100644 --- a/pkg/commands/edit/add/addpatch_test.go +++ b/pkg/commands/edit/add/addpatch_test.go @@ -21,7 +21,7 @@ import ( "strings" - "sigs.k8s.io/kustomize/pkg/fs" + "sigs.k8s.io/kustomize/v3/pkg/fs" ) const ( diff --git a/pkg/commands/edit/add/addresource.go b/pkg/commands/edit/add/addresource.go index febac6af5..6b9964475 100644 --- a/pkg/commands/edit/add/addresource.go +++ b/pkg/commands/edit/add/addresource.go @@ -21,8 +21,8 @@ import ( "log" "github.com/spf13/cobra" - "sigs.k8s.io/kustomize/pkg/commands/kustfile" - "sigs.k8s.io/kustomize/pkg/fs" + "sigs.k8s.io/kustomize/v3/pkg/commands/kustfile" + "sigs.k8s.io/kustomize/v3/pkg/fs" ) type addResourceOptions struct { diff --git a/pkg/commands/edit/add/addresource_test.go b/pkg/commands/edit/add/addresource_test.go index 303f92a57..17b4d049c 100644 --- a/pkg/commands/edit/add/addresource_test.go +++ b/pkg/commands/edit/add/addresource_test.go @@ -20,7 +20,7 @@ import ( "strings" "testing" - "sigs.k8s.io/kustomize/pkg/fs" + "sigs.k8s.io/kustomize/v3/pkg/fs" ) const ( diff --git a/pkg/commands/edit/add/all.go b/pkg/commands/edit/add/all.go index ce34f72e4..e9c65e28d 100644 --- a/pkg/commands/edit/add/all.go +++ b/pkg/commands/edit/add/all.go @@ -5,8 +5,8 @@ package add import ( "github.com/spf13/cobra" - "sigs.k8s.io/kustomize/pkg/fs" - "sigs.k8s.io/kustomize/pkg/ifc" + "sigs.k8s.io/kustomize/v3/pkg/fs" + "sigs.k8s.io/kustomize/v3/pkg/ifc" ) // NewCmdAdd returns an instance of 'add' subcommand. diff --git a/pkg/commands/edit/add/configmap.go b/pkg/commands/edit/add/configmap.go index f46b5d591..e27cc1592 100644 --- a/pkg/commands/edit/add/configmap.go +++ b/pkg/commands/edit/add/configmap.go @@ -5,10 +5,10 @@ package add import ( "github.com/spf13/cobra" - "sigs.k8s.io/kustomize/pkg/commands/kustfile" - "sigs.k8s.io/kustomize/pkg/fs" - "sigs.k8s.io/kustomize/pkg/ifc" - "sigs.k8s.io/kustomize/pkg/types" + "sigs.k8s.io/kustomize/v3/pkg/commands/kustfile" + "sigs.k8s.io/kustomize/v3/pkg/fs" + "sigs.k8s.io/kustomize/v3/pkg/ifc" + "sigs.k8s.io/kustomize/v3/pkg/types" ) // newCmdAddConfigMap returns a new command. diff --git a/pkg/commands/edit/add/configmap_test.go b/pkg/commands/edit/add/configmap_test.go index 46479dbb4..6d5f7b638 100644 --- a/pkg/commands/edit/add/configmap_test.go +++ b/pkg/commands/edit/add/configmap_test.go @@ -6,10 +6,10 @@ package add import ( "testing" - "sigs.k8s.io/kustomize/pkg/fs" - "sigs.k8s.io/kustomize/pkg/loader" - "sigs.k8s.io/kustomize/pkg/types" - "sigs.k8s.io/kustomize/pkg/validators" + "sigs.k8s.io/kustomize/v3/pkg/fs" + "sigs.k8s.io/kustomize/v3/pkg/loader" + "sigs.k8s.io/kustomize/v3/pkg/types" + "sigs.k8s.io/kustomize/v3/pkg/validators" ) func TestNewAddConfigMapIsNotNil(t *testing.T) { diff --git a/pkg/commands/edit/add/flagsandargs.go b/pkg/commands/edit/add/flagsandargs.go index 1cfc7d8dc..75fbb4f6e 100644 --- a/pkg/commands/edit/add/flagsandargs.go +++ b/pkg/commands/edit/add/flagsandargs.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "sigs.k8s.io/kustomize/pkg/fs" + "sigs.k8s.io/kustomize/v3/pkg/fs" ) // flagsAndArgs encapsulates the options for add secret/configmap commands. diff --git a/pkg/commands/edit/add/flagsandargs_test.go b/pkg/commands/edit/add/flagsandargs_test.go index 797a4639e..67d8c193c 100644 --- a/pkg/commands/edit/add/flagsandargs_test.go +++ b/pkg/commands/edit/add/flagsandargs_test.go @@ -20,7 +20,7 @@ import ( "reflect" "testing" - "sigs.k8s.io/kustomize/pkg/fs" + "sigs.k8s.io/kustomize/v3/pkg/fs" ) func TestDataValidation_NoName(t *testing.T) { diff --git a/pkg/commands/edit/add/secret.go b/pkg/commands/edit/add/secret.go index c5272c1ba..c76ca4c13 100644 --- a/pkg/commands/edit/add/secret.go +++ b/pkg/commands/edit/add/secret.go @@ -5,10 +5,10 @@ package add import ( "github.com/spf13/cobra" - "sigs.k8s.io/kustomize/pkg/commands/kustfile" - "sigs.k8s.io/kustomize/pkg/fs" - "sigs.k8s.io/kustomize/pkg/ifc" - "sigs.k8s.io/kustomize/pkg/types" + "sigs.k8s.io/kustomize/v3/pkg/commands/kustfile" + "sigs.k8s.io/kustomize/v3/pkg/fs" + "sigs.k8s.io/kustomize/v3/pkg/ifc" + "sigs.k8s.io/kustomize/v3/pkg/types" ) // newCmdAddSecret returns a new command. diff --git a/pkg/commands/edit/add/secret_test.go b/pkg/commands/edit/add/secret_test.go index 93577a106..a04fe5095 100644 --- a/pkg/commands/edit/add/secret_test.go +++ b/pkg/commands/edit/add/secret_test.go @@ -6,10 +6,10 @@ package add import ( "testing" - "sigs.k8s.io/kustomize/pkg/fs" - "sigs.k8s.io/kustomize/pkg/loader" - "sigs.k8s.io/kustomize/pkg/types" - "sigs.k8s.io/kustomize/pkg/validators" + "sigs.k8s.io/kustomize/v3/pkg/fs" + "sigs.k8s.io/kustomize/v3/pkg/loader" + "sigs.k8s.io/kustomize/v3/pkg/types" + "sigs.k8s.io/kustomize/v3/pkg/validators" ) func TestNewCmdAddSecretIsNotNil(t *testing.T) { diff --git a/pkg/commands/edit/add/util.go b/pkg/commands/edit/add/util.go index 684439d9a..56cafa95b 100644 --- a/pkg/commands/edit/add/util.go +++ b/pkg/commands/edit/add/util.go @@ -19,7 +19,7 @@ package add import ( "log" - "sigs.k8s.io/kustomize/pkg/fs" + "sigs.k8s.io/kustomize/v3/pkg/fs" ) func globPatterns(fsys fs.FileSystem, patterns []string) ([]string, error) { diff --git a/pkg/commands/edit/all.go b/pkg/commands/edit/all.go index ecba55f73..b78c6851d 100644 --- a/pkg/commands/edit/all.go +++ b/pkg/commands/edit/all.go @@ -5,13 +5,13 @@ package edit import ( "github.com/spf13/cobra" - "sigs.k8s.io/kustomize/pkg/commands/edit/add" - "sigs.k8s.io/kustomize/pkg/commands/edit/fix" - "sigs.k8s.io/kustomize/pkg/commands/edit/remove" - "sigs.k8s.io/kustomize/pkg/commands/edit/set" - "sigs.k8s.io/kustomize/pkg/fs" - "sigs.k8s.io/kustomize/pkg/ifc" - "sigs.k8s.io/kustomize/pkg/loader" + "sigs.k8s.io/kustomize/v3/pkg/commands/edit/add" + "sigs.k8s.io/kustomize/v3/pkg/commands/edit/fix" + "sigs.k8s.io/kustomize/v3/pkg/commands/edit/remove" + "sigs.k8s.io/kustomize/v3/pkg/commands/edit/set" + "sigs.k8s.io/kustomize/v3/pkg/fs" + "sigs.k8s.io/kustomize/v3/pkg/ifc" + "sigs.k8s.io/kustomize/v3/pkg/loader" ) // NewCmdEdit returns an instance of 'edit' subcommand. diff --git a/pkg/commands/edit/fix/fix.go b/pkg/commands/edit/fix/fix.go index c0b01b991..c6e064992 100644 --- a/pkg/commands/edit/fix/fix.go +++ b/pkg/commands/edit/fix/fix.go @@ -18,8 +18,8 @@ package fix import ( "github.com/spf13/cobra" - "sigs.k8s.io/kustomize/pkg/commands/kustfile" - "sigs.k8s.io/kustomize/pkg/fs" + "sigs.k8s.io/kustomize/v3/pkg/commands/kustfile" + "sigs.k8s.io/kustomize/v3/pkg/fs" ) // NewCmdFix returns an instance of 'fix' subcommand. diff --git a/pkg/commands/edit/fix/fix_test.go b/pkg/commands/edit/fix/fix_test.go index e34f34fc6..6499539a4 100644 --- a/pkg/commands/edit/fix/fix_test.go +++ b/pkg/commands/edit/fix/fix_test.go @@ -20,7 +20,7 @@ import ( "strings" "testing" - "sigs.k8s.io/kustomize/pkg/fs" + "sigs.k8s.io/kustomize/v3/pkg/fs" ) func TestFix(t *testing.T) { diff --git a/pkg/commands/edit/remove/all.go b/pkg/commands/edit/remove/all.go index 7a425d081..eb258a3d4 100644 --- a/pkg/commands/edit/remove/all.go +++ b/pkg/commands/edit/remove/all.go @@ -18,8 +18,8 @@ package remove import ( "github.com/spf13/cobra" - "sigs.k8s.io/kustomize/pkg/fs" - "sigs.k8s.io/kustomize/pkg/ifc" + "sigs.k8s.io/kustomize/v3/pkg/fs" + "sigs.k8s.io/kustomize/v3/pkg/ifc" ) // NewCmdRemove returns an instance of 'remove' subcommand. diff --git a/pkg/commands/edit/remove/removemetadata.go b/pkg/commands/edit/remove/removemetadata.go index 6229951ca..1fd213deb 100644 --- a/pkg/commands/edit/remove/removemetadata.go +++ b/pkg/commands/edit/remove/removemetadata.go @@ -19,10 +19,10 @@ package remove import ( "fmt" "github.com/spf13/cobra" - "sigs.k8s.io/kustomize/pkg/commands/kustfile" - "sigs.k8s.io/kustomize/pkg/fs" - "sigs.k8s.io/kustomize/pkg/pgmconfig" - "sigs.k8s.io/kustomize/pkg/types" + "sigs.k8s.io/kustomize/v3/pkg/commands/kustfile" + "sigs.k8s.io/kustomize/v3/pkg/fs" + "sigs.k8s.io/kustomize/v3/pkg/pgmconfig" + "sigs.k8s.io/kustomize/v3/pkg/types" "strings" ) diff --git a/pkg/commands/edit/remove/removemetadata_test.go b/pkg/commands/edit/remove/removemetadata_test.go index f431ae49b..589af5e99 100644 --- a/pkg/commands/edit/remove/removemetadata_test.go +++ b/pkg/commands/edit/remove/removemetadata_test.go @@ -18,10 +18,10 @@ package remove import ( "fmt" - "sigs.k8s.io/kustomize/pkg/commands/kustfile" - "sigs.k8s.io/kustomize/pkg/fs" - "sigs.k8s.io/kustomize/pkg/types" - "sigs.k8s.io/kustomize/pkg/validators" + "sigs.k8s.io/kustomize/v3/pkg/commands/kustfile" + "sigs.k8s.io/kustomize/v3/pkg/fs" + "sigs.k8s.io/kustomize/v3/pkg/types" + "sigs.k8s.io/kustomize/v3/pkg/validators" "strings" "testing" ) diff --git a/pkg/commands/edit/remove/removeresource.go b/pkg/commands/edit/remove/removeresource.go index 08565ad0b..d0eab20ec 100644 --- a/pkg/commands/edit/remove/removeresource.go +++ b/pkg/commands/edit/remove/removeresource.go @@ -21,8 +21,8 @@ import ( "path/filepath" "github.com/spf13/cobra" - "sigs.k8s.io/kustomize/pkg/commands/kustfile" - "sigs.k8s.io/kustomize/pkg/fs" + "sigs.k8s.io/kustomize/v3/pkg/commands/kustfile" + "sigs.k8s.io/kustomize/v3/pkg/fs" ) type removeResourceOptions struct { diff --git a/pkg/commands/edit/remove/removeresource_test.go b/pkg/commands/edit/remove/removeresource_test.go index 8ce014ccc..bfa72fdfb 100644 --- a/pkg/commands/edit/remove/removeresource_test.go +++ b/pkg/commands/edit/remove/removeresource_test.go @@ -22,7 +22,7 @@ import ( "strings" "testing" - "sigs.k8s.io/kustomize/pkg/fs" + "sigs.k8s.io/kustomize/v3/pkg/fs" ) func TestRemoveResources(t *testing.T) { diff --git a/pkg/commands/edit/set/all.go b/pkg/commands/edit/set/all.go index 0ac085711..014aa3f08 100644 --- a/pkg/commands/edit/set/all.go +++ b/pkg/commands/edit/set/all.go @@ -18,8 +18,8 @@ package set import ( "github.com/spf13/cobra" - "sigs.k8s.io/kustomize/pkg/fs" - "sigs.k8s.io/kustomize/pkg/ifc" + "sigs.k8s.io/kustomize/v3/pkg/fs" + "sigs.k8s.io/kustomize/v3/pkg/ifc" ) // NewCmdSet returns an instance of 'set' subcommand. diff --git a/pkg/commands/edit/set/set_name_prefix.go b/pkg/commands/edit/set/set_name_prefix.go index 6407f9485..2bd462adb 100644 --- a/pkg/commands/edit/set/set_name_prefix.go +++ b/pkg/commands/edit/set/set_name_prefix.go @@ -20,8 +20,8 @@ import ( "errors" "github.com/spf13/cobra" - "sigs.k8s.io/kustomize/pkg/commands/kustfile" - "sigs.k8s.io/kustomize/pkg/fs" + "sigs.k8s.io/kustomize/v3/pkg/commands/kustfile" + "sigs.k8s.io/kustomize/v3/pkg/fs" ) type setNamePrefixOptions struct { diff --git a/pkg/commands/edit/set/set_name_prefix_test.go b/pkg/commands/edit/set/set_name_prefix_test.go index 2e27f84e2..0e77c332a 100644 --- a/pkg/commands/edit/set/set_name_prefix_test.go +++ b/pkg/commands/edit/set/set_name_prefix_test.go @@ -20,7 +20,7 @@ import ( "strings" "testing" - "sigs.k8s.io/kustomize/pkg/fs" + "sigs.k8s.io/kustomize/v3/pkg/fs" ) const ( diff --git a/pkg/commands/edit/set/set_name_suffix.go b/pkg/commands/edit/set/set_name_suffix.go index 25ecafe35..abb3164ff 100644 --- a/pkg/commands/edit/set/set_name_suffix.go +++ b/pkg/commands/edit/set/set_name_suffix.go @@ -20,8 +20,8 @@ import ( "errors" "github.com/spf13/cobra" - "sigs.k8s.io/kustomize/pkg/commands/kustfile" - "sigs.k8s.io/kustomize/pkg/fs" + "sigs.k8s.io/kustomize/v3/pkg/commands/kustfile" + "sigs.k8s.io/kustomize/v3/pkg/fs" ) type setNameSuffixOptions struct { diff --git a/pkg/commands/edit/set/set_name_suffix_test.go b/pkg/commands/edit/set/set_name_suffix_test.go index 9e18e7dc6..61fdab0d5 100644 --- a/pkg/commands/edit/set/set_name_suffix_test.go +++ b/pkg/commands/edit/set/set_name_suffix_test.go @@ -20,7 +20,7 @@ import ( "strings" "testing" - "sigs.k8s.io/kustomize/pkg/fs" + "sigs.k8s.io/kustomize/v3/pkg/fs" ) const ( diff --git a/pkg/commands/edit/set/setimage.go b/pkg/commands/edit/set/setimage.go index 59eb26b91..fc50467c4 100644 --- a/pkg/commands/edit/set/setimage.go +++ b/pkg/commands/edit/set/setimage.go @@ -23,9 +23,9 @@ import ( "strings" "github.com/spf13/cobra" - "sigs.k8s.io/kustomize/pkg/commands/kustfile" - "sigs.k8s.io/kustomize/pkg/fs" - "sigs.k8s.io/kustomize/pkg/image" + "sigs.k8s.io/kustomize/v3/pkg/commands/kustfile" + "sigs.k8s.io/kustomize/v3/pkg/fs" + "sigs.k8s.io/kustomize/v3/pkg/image" ) type setImageOptions struct { diff --git a/pkg/commands/edit/set/setimage_test.go b/pkg/commands/edit/set/setimage_test.go index a48accf3b..40bc93f93 100644 --- a/pkg/commands/edit/set/setimage_test.go +++ b/pkg/commands/edit/set/setimage_test.go @@ -21,7 +21,7 @@ import ( "strings" "testing" - "sigs.k8s.io/kustomize/pkg/fs" + "sigs.k8s.io/kustomize/v3/pkg/fs" ) func TestSetImage(t *testing.T) { diff --git a/pkg/commands/edit/set/setnamespace.go b/pkg/commands/edit/set/setnamespace.go index 520292fda..0ebf048dc 100644 --- a/pkg/commands/edit/set/setnamespace.go +++ b/pkg/commands/edit/set/setnamespace.go @@ -22,9 +22,9 @@ import ( "strings" "github.com/spf13/cobra" - "sigs.k8s.io/kustomize/pkg/commands/kustfile" - "sigs.k8s.io/kustomize/pkg/fs" - "sigs.k8s.io/kustomize/pkg/ifc" + "sigs.k8s.io/kustomize/v3/pkg/commands/kustfile" + "sigs.k8s.io/kustomize/v3/pkg/fs" + "sigs.k8s.io/kustomize/v3/pkg/ifc" ) type setNamespaceOptions struct { diff --git a/pkg/commands/edit/set/setnamespace_test.go b/pkg/commands/edit/set/setnamespace_test.go index 99b239ce0..4d6a0f885 100644 --- a/pkg/commands/edit/set/setnamespace_test.go +++ b/pkg/commands/edit/set/setnamespace_test.go @@ -21,8 +21,8 @@ import ( "strings" "testing" - "sigs.k8s.io/kustomize/pkg/fs" - "sigs.k8s.io/kustomize/pkg/validators" + "sigs.k8s.io/kustomize/v3/pkg/fs" + "sigs.k8s.io/kustomize/v3/pkg/validators" ) const ( diff --git a/pkg/commands/kustfile/kustomizationfile.go b/pkg/commands/kustfile/kustomizationfile.go index f6287eb4c..07451a044 100644 --- a/pkg/commands/kustfile/kustomizationfile.go +++ b/pkg/commands/kustfile/kustomizationfile.go @@ -26,9 +26,9 @@ import ( "regexp" "strings" - "sigs.k8s.io/kustomize/pkg/fs" - "sigs.k8s.io/kustomize/pkg/pgmconfig" - "sigs.k8s.io/kustomize/pkg/types" + "sigs.k8s.io/kustomize/v3/pkg/fs" + "sigs.k8s.io/kustomize/v3/pkg/pgmconfig" + "sigs.k8s.io/kustomize/v3/pkg/types" "sigs.k8s.io/yaml" ) diff --git a/pkg/commands/kustfile/kustomizationfile_test.go b/pkg/commands/kustfile/kustomizationfile_test.go index 26936e258..0e4d7a2d3 100644 --- a/pkg/commands/kustfile/kustomizationfile_test.go +++ b/pkg/commands/kustfile/kustomizationfile_test.go @@ -21,9 +21,9 @@ import ( "strings" "testing" - "sigs.k8s.io/kustomize/pkg/fs" - "sigs.k8s.io/kustomize/pkg/pgmconfig" - "sigs.k8s.io/kustomize/pkg/types" + "sigs.k8s.io/kustomize/v3/pkg/fs" + "sigs.k8s.io/kustomize/v3/pkg/pgmconfig" + "sigs.k8s.io/kustomize/v3/pkg/types" ) func TestFieldOrder(t *testing.T) { diff --git a/pkg/commands/misc/config.go b/pkg/commands/misc/config.go index fc18e27b2..f2c0f8927 100644 --- a/pkg/commands/misc/config.go +++ b/pkg/commands/misc/config.go @@ -22,8 +22,8 @@ import ( "github.com/spf13/cobra" - "sigs.k8s.io/kustomize/pkg/fs" - "sigs.k8s.io/kustomize/pkg/transformers/config/defaultconfig" + "sigs.k8s.io/kustomize/v3/pkg/fs" + "sigs.k8s.io/kustomize/v3/pkg/transformers/config/defaultconfig" ) // NewCmdConfig returns an instance of 'config' subcommand. diff --git a/pkg/commands/misc/config_test.go b/pkg/commands/misc/config_test.go index 46b74c98d..bfb935551 100644 --- a/pkg/commands/misc/config_test.go +++ b/pkg/commands/misc/config_test.go @@ -22,7 +22,7 @@ import ( "strings" "testing" - "sigs.k8s.io/kustomize/pkg/fs" + "sigs.k8s.io/kustomize/v3/pkg/fs" ) func TestValidate(t *testing.T) { diff --git a/pkg/expansion/expand_test.go b/pkg/expansion/expand_test.go index fbec78a1d..59b02791b 100644 --- a/pkg/expansion/expand_test.go +++ b/pkg/expansion/expand_test.go @@ -20,7 +20,7 @@ import ( "fmt" "testing" - . "sigs.k8s.io/kustomize/pkg/expansion" + . "sigs.k8s.io/kustomize/v3/pkg/expansion" ) type expected struct { diff --git a/pkg/fs/fakefs.go b/pkg/fs/fakefs.go index 0f2a4eedf..05d124b72 100644 --- a/pkg/fs/fakefs.go +++ b/pkg/fs/fakefs.go @@ -22,7 +22,7 @@ import ( "sort" "strings" - "sigs.k8s.io/kustomize/pkg/pgmconfig" + "sigs.k8s.io/kustomize/v3/pkg/pgmconfig" ) var _ FileSystem = &fakeFs{} diff --git a/pkg/git/cloner.go b/pkg/git/cloner.go index f5d92418f..f99a3fc72 100644 --- a/pkg/git/cloner.go +++ b/pkg/git/cloner.go @@ -21,7 +21,7 @@ import ( "os/exec" "github.com/pkg/errors" - "sigs.k8s.io/kustomize/pkg/fs" + "sigs.k8s.io/kustomize/v3/pkg/fs" ) // Cloner is a function that can clone a git repo. diff --git a/pkg/git/repospec.go b/pkg/git/repospec.go index b3251f653..2a1fc2731 100644 --- a/pkg/git/repospec.go +++ b/pkg/git/repospec.go @@ -21,7 +21,7 @@ import ( "path/filepath" "strings" - "sigs.k8s.io/kustomize/pkg/fs" + "sigs.k8s.io/kustomize/v3/pkg/fs" ) // Used as a temporary non-empty occupant of the cloneDir diff --git a/pkg/hasher/hasher_test.go b/pkg/hasher/hasher_test.go index 970fb4968..6d214830d 100644 --- a/pkg/hasher/hasher_test.go +++ b/pkg/hasher/hasher_test.go @@ -6,7 +6,7 @@ package hasher_test import ( "testing" - . "sigs.k8s.io/kustomize/pkg/hasher" + . "sigs.k8s.io/kustomize/v3/pkg/hasher" ) func TestSortArrayAndComputeHash(t *testing.T) { diff --git a/pkg/ifc/ifc.go b/pkg/ifc/ifc.go index 550d488e9..190d77aaa 100644 --- a/pkg/ifc/ifc.go +++ b/pkg/ifc/ifc.go @@ -5,8 +5,8 @@ package ifc import ( - "sigs.k8s.io/kustomize/pkg/gvk" - "sigs.k8s.io/kustomize/pkg/types" + "sigs.k8s.io/kustomize/v3/pkg/gvk" + "sigs.k8s.io/kustomize/v3/pkg/types" ) // Validator provides functions to validate annotations and labels diff --git a/pkg/ifc/transformer/factory.go b/pkg/ifc/transformer/factory.go index da8a640f5..9d303e335 100644 --- a/pkg/ifc/transformer/factory.go +++ b/pkg/ifc/transformer/factory.go @@ -5,8 +5,8 @@ package transformer import ( - "sigs.k8s.io/kustomize/pkg/resource" - "sigs.k8s.io/kustomize/pkg/transformers" + "sigs.k8s.io/kustomize/v3/pkg/resource" + "sigs.k8s.io/kustomize/v3/pkg/transformers" ) // Factory makes transformers that require k8sdeps. diff --git a/pkg/inventory/inventory.go b/pkg/inventory/inventory.go index ee1fedf9f..4e76a3534 100644 --- a/pkg/inventory/inventory.go +++ b/pkg/inventory/inventory.go @@ -6,7 +6,7 @@ package inventory import ( "encoding/json" - "sigs.k8s.io/kustomize/pkg/resid" + "sigs.k8s.io/kustomize/v3/pkg/resid" ) //Refs is a reference map. Each key is the id diff --git a/pkg/inventory/inventory_test.go b/pkg/inventory/inventory_test.go index 9fcaf28a9..37fc71e97 100644 --- a/pkg/inventory/inventory_test.go +++ b/pkg/inventory/inventory_test.go @@ -19,7 +19,7 @@ package inventory import ( "testing" - "sigs.k8s.io/kustomize/pkg/resid" + "sigs.k8s.io/kustomize/v3/pkg/resid" ) func makeRefs() (Refs, Refs) { diff --git a/pkg/kusttest/kusttestharness.go b/pkg/kusttest/kusttestharness.go index 0b46d94b2..ac5445d39 100644 --- a/pkg/kusttest/kusttestharness.go +++ b/pkg/kusttest/kusttestharness.go @@ -9,17 +9,17 @@ import ( "strings" "testing" - "sigs.k8s.io/kustomize/internal/loadertest" - "sigs.k8s.io/kustomize/k8sdeps/kunstruct" - "sigs.k8s.io/kustomize/k8sdeps/transformer" - "sigs.k8s.io/kustomize/pkg/loader" - "sigs.k8s.io/kustomize/pkg/pgmconfig" - "sigs.k8s.io/kustomize/pkg/plugins" - "sigs.k8s.io/kustomize/pkg/resmap" - "sigs.k8s.io/kustomize/pkg/resource" - "sigs.k8s.io/kustomize/pkg/target" - "sigs.k8s.io/kustomize/pkg/transformers/config/defaultconfig" - "sigs.k8s.io/kustomize/pkg/types" + "sigs.k8s.io/kustomize/v3/internal/loadertest" + "sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct" + "sigs.k8s.io/kustomize/v3/k8sdeps/transformer" + "sigs.k8s.io/kustomize/v3/pkg/loader" + "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/resource" + "sigs.k8s.io/kustomize/v3/pkg/target" + "sigs.k8s.io/kustomize/v3/pkg/transformers/config/defaultconfig" + "sigs.k8s.io/kustomize/v3/pkg/types" ) // KustTestHarness helps test kustomization generation and transformation. diff --git a/pkg/loader/fileloader.go b/pkg/loader/fileloader.go index e46b7fe7c..f474f2546 100644 --- a/pkg/loader/fileloader.go +++ b/pkg/loader/fileloader.go @@ -9,9 +9,9 @@ import ( "path/filepath" "strings" - "sigs.k8s.io/kustomize/pkg/fs" - "sigs.k8s.io/kustomize/pkg/git" - "sigs.k8s.io/kustomize/pkg/ifc" + "sigs.k8s.io/kustomize/v3/pkg/fs" + "sigs.k8s.io/kustomize/v3/pkg/git" + "sigs.k8s.io/kustomize/v3/pkg/ifc" ) // fileLoader is a kustomization's interface to files. diff --git a/pkg/loader/fileloader_test.go b/pkg/loader/fileloader_test.go index ce126496e..ff08f01e0 100644 --- a/pkg/loader/fileloader_test.go +++ b/pkg/loader/fileloader_test.go @@ -25,11 +25,11 @@ import ( "strings" "testing" - "sigs.k8s.io/kustomize/pkg/fs" - "sigs.k8s.io/kustomize/pkg/git" - "sigs.k8s.io/kustomize/pkg/ifc" - "sigs.k8s.io/kustomize/pkg/pgmconfig" - "sigs.k8s.io/kustomize/pkg/validators" + "sigs.k8s.io/kustomize/v3/pkg/fs" + "sigs.k8s.io/kustomize/v3/pkg/git" + "sigs.k8s.io/kustomize/v3/pkg/ifc" + "sigs.k8s.io/kustomize/v3/pkg/pgmconfig" + "sigs.k8s.io/kustomize/v3/pkg/validators" ) type testData struct { diff --git a/pkg/loader/kv.go b/pkg/loader/kv.go index 2638f46af..a6952dc44 100644 --- a/pkg/loader/kv.go +++ b/pkg/loader/kv.go @@ -14,8 +14,8 @@ import ( "unicode/utf8" "github.com/pkg/errors" - "sigs.k8s.io/kustomize/pkg/ifc" - "sigs.k8s.io/kustomize/pkg/types" + "sigs.k8s.io/kustomize/v3/pkg/ifc" + "sigs.k8s.io/kustomize/v3/pkg/types" ) var utf8bom = []byte{0xEF, 0xBB, 0xBF} diff --git a/pkg/loader/kv_test.go b/pkg/loader/kv_test.go index 388b3f3ce..9ee2a8978 100644 --- a/pkg/loader/kv_test.go +++ b/pkg/loader/kv_test.go @@ -7,9 +7,9 @@ import ( "reflect" "testing" - "sigs.k8s.io/kustomize/pkg/fs" - "sigs.k8s.io/kustomize/pkg/types" - "sigs.k8s.io/kustomize/pkg/validators" + "sigs.k8s.io/kustomize/v3/pkg/fs" + "sigs.k8s.io/kustomize/v3/pkg/types" + "sigs.k8s.io/kustomize/v3/pkg/validators" ) func TestKeyValuesFromLines(t *testing.T) { diff --git a/pkg/loader/loader.go b/pkg/loader/loader.go index c2dfb5218..7d63ea926 100644 --- a/pkg/loader/loader.go +++ b/pkg/loader/loader.go @@ -18,9 +18,9 @@ limitations under the License. package loader import ( - "sigs.k8s.io/kustomize/pkg/fs" - "sigs.k8s.io/kustomize/pkg/git" - "sigs.k8s.io/kustomize/pkg/ifc" + "sigs.k8s.io/kustomize/v3/pkg/fs" + "sigs.k8s.io/kustomize/v3/pkg/git" + "sigs.k8s.io/kustomize/v3/pkg/ifc" ) // NewLoader returns a Loader pointed at the given target. diff --git a/pkg/loader/loadrestrictions.go b/pkg/loader/loadrestrictions.go index a797b3c95..168b8c4d0 100644 --- a/pkg/loader/loadrestrictions.go +++ b/pkg/loader/loadrestrictions.go @@ -20,7 +20,7 @@ import ( "fmt" "github.com/spf13/pflag" - "sigs.k8s.io/kustomize/pkg/fs" + "sigs.k8s.io/kustomize/v3/pkg/fs" ) //go:generate stringer -type=loadRestrictions diff --git a/pkg/loader/loadrestrictions_test.go b/pkg/loader/loadrestrictions_test.go index d76f5cb56..58ed0583e 100644 --- a/pkg/loader/loadrestrictions_test.go +++ b/pkg/loader/loadrestrictions_test.go @@ -20,7 +20,7 @@ import ( "strings" "testing" - "sigs.k8s.io/kustomize/pkg/fs" + "sigs.k8s.io/kustomize/v3/pkg/fs" ) func TestRestrictionNone(t *testing.T) { diff --git a/pkg/patch/strategicmerge.go b/pkg/patch/strategicmerge.go index 113319821..9042eb844 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/pkg/types" +import "sigs.k8s.io/kustomize/v3/pkg/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/transformer/factory.go b/pkg/patch/transformer/factory.go index 581f8176a..69aff144d 100644 --- a/pkg/patch/transformer/factory.go +++ b/pkg/patch/transformer/factory.go @@ -19,11 +19,11 @@ package transformer import ( "fmt" - "sigs.k8s.io/kustomize/pkg/gvk" - "sigs.k8s.io/kustomize/pkg/ifc" - "sigs.k8s.io/kustomize/pkg/resid" - "sigs.k8s.io/kustomize/pkg/transformers" - "sigs.k8s.io/kustomize/pkg/types" + "sigs.k8s.io/kustomize/v3/pkg/gvk" + "sigs.k8s.io/kustomize/v3/pkg/ifc" + "sigs.k8s.io/kustomize/v3/pkg/resid" + "sigs.k8s.io/kustomize/v3/pkg/transformers" + "sigs.k8s.io/kustomize/v3/pkg/types" ) // PatchJson6902Factory makes PatchJson6902 transformers diff --git a/pkg/patch/transformer/factory_test.go b/pkg/patch/transformer/factory_test.go index 19eeec01e..256d7b125 100644 --- a/pkg/patch/transformer/factory_test.go +++ b/pkg/patch/transformer/factory_test.go @@ -22,11 +22,11 @@ import ( "testing" "gopkg.in/yaml.v2" - "sigs.k8s.io/kustomize/internal/loadertest" - "sigs.k8s.io/kustomize/k8sdeps/kunstruct" - "sigs.k8s.io/kustomize/pkg/resmaptest" - "sigs.k8s.io/kustomize/pkg/resource" - "sigs.k8s.io/kustomize/pkg/types" + "sigs.k8s.io/kustomize/v3/internal/loadertest" + "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/types" ) var rf = resource.NewFactory( diff --git a/pkg/patch/transformer/patchjson6902json.go b/pkg/patch/transformer/patchjson6902json.go index 5ecd36791..8a76952f1 100644 --- a/pkg/patch/transformer/patchjson6902json.go +++ b/pkg/patch/transformer/patchjson6902json.go @@ -21,10 +21,10 @@ import ( jsonpatch "github.com/evanphx/json-patch" "github.com/pkg/errors" - "sigs.k8s.io/kustomize/pkg/resid" - "sigs.k8s.io/kustomize/pkg/resmap" - "sigs.k8s.io/kustomize/pkg/resource" - "sigs.k8s.io/kustomize/pkg/transformers" + "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/transformers" "sigs.k8s.io/yaml" ) diff --git a/pkg/patch/transformer/patchjson6902json_test.go b/pkg/patch/transformer/patchjson6902json_test.go index 3c2cb8e40..132ca9c13 100644 --- a/pkg/patch/transformer/patchjson6902json_test.go +++ b/pkg/patch/transformer/patchjson6902json_test.go @@ -21,11 +21,11 @@ import ( "strings" "testing" - "sigs.k8s.io/kustomize/k8sdeps/kunstruct" - "sigs.k8s.io/kustomize/pkg/gvk" - "sigs.k8s.io/kustomize/pkg/resid" - "sigs.k8s.io/kustomize/pkg/resmaptest" - "sigs.k8s.io/kustomize/pkg/resource" + "sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct" + "sigs.k8s.io/kustomize/v3/pkg/gvk" + "sigs.k8s.io/kustomize/v3/pkg/resid" + "sigs.k8s.io/kustomize/v3/pkg/resmaptest" + "sigs.k8s.io/kustomize/v3/pkg/resource" ) var deploy = gvk.Gvk{Group: "apps", Version: "v1", Kind: "Deployment"} diff --git a/pkg/plugins/compiler.go b/pkg/plugins/compiler.go index 515618a81..9efd7c91e 100644 --- a/pkg/plugins/compiler.go +++ b/pkg/plugins/compiler.go @@ -25,7 +25,7 @@ import ( "strings" "time" - "sigs.k8s.io/kustomize/pkg/pgmconfig" + "sigs.k8s.io/kustomize/v3/pkg/pgmconfig" ) // Compiler creates Go plugin object files. diff --git a/pkg/plugins/compiler_test.go b/pkg/plugins/compiler_test.go index 3d67b1269..e1483cf89 100644 --- a/pkg/plugins/compiler_test.go +++ b/pkg/plugins/compiler_test.go @@ -22,7 +22,7 @@ import ( "path/filepath" "testing" - . "sigs.k8s.io/kustomize/pkg/plugins" + . "sigs.k8s.io/kustomize/v3/pkg/plugins" ) // Regression coverage over compiler behavior. diff --git a/pkg/plugins/config.go b/pkg/plugins/config.go index 3100adc32..80d82ecc5 100644 --- a/pkg/plugins/config.go +++ b/pkg/plugins/config.go @@ -7,8 +7,8 @@ import ( "fmt" "github.com/spf13/pflag" "path/filepath" - "sigs.k8s.io/kustomize/pkg/pgmconfig" - "sigs.k8s.io/kustomize/pkg/types" + "sigs.k8s.io/kustomize/v3/pkg/pgmconfig" + "sigs.k8s.io/kustomize/v3/pkg/types" ) const ( diff --git a/plugin/envfortest.go b/pkg/plugins/envfortest.go similarity index 89% rename from plugin/envfortest.go rename to pkg/plugins/envfortest.go index 25639a1a3..928d32646 100644 --- a/plugin/envfortest.go +++ b/pkg/plugins/envfortest.go @@ -1,7 +1,7 @@ // Copyright 2019 The Kubernetes Authors. // SPDX-License-Identifier: Apache-2.0 -package plugin +package plugins import ( "io/ioutil" @@ -11,15 +11,14 @@ import ( "strings" "testing" - "sigs.k8s.io/kustomize/pkg/pgmconfig" - "sigs.k8s.io/kustomize/pkg/plugins" + "sigs.k8s.io/kustomize/v3/pkg/pgmconfig" ) // EnvForTest manages the plugin test environment. // It sets/resets XDG_CONFIG_HOME, makes/removes a temp objRoot. type EnvForTest struct { t *testing.T - compiler *plugins.Compiler + compiler *Compiler workDir string oldXdg string wasSet bool @@ -62,7 +61,7 @@ func (x *EnvForTest) BuildExecPlugin(g, v, k string) { } } -func (x *EnvForTest) makeCompiler() *plugins.Compiler { +func (x *EnvForTest) makeCompiler() *Compiler { // The plugin loader wants to find object code under // $XDG_CONFIG_HOME/kustomize/plugins // and the compiler writes object code to @@ -74,11 +73,11 @@ func (x *EnvForTest) makeCompiler() *plugins.Compiler { if err != nil { x.t.Error(err) } - srcRoot, err := plugins.DefaultSrcRoot() + srcRoot, err := DefaultSrcRoot() if err != nil { x.t.Error(err) } - return plugins.NewCompiler(srcRoot, objRoot) + return NewCompiler(srcRoot, objRoot) } func (x *EnvForTest) createWorkDir() { diff --git a/pkg/plugins/execplugin.go b/pkg/plugins/execplugin.go index 5bf4187b9..21421ff06 100644 --- a/pkg/plugins/execplugin.go +++ b/pkg/plugins/execplugin.go @@ -25,9 +25,9 @@ import ( "strings" "syscall" - "sigs.k8s.io/kustomize/pkg/ifc" - "sigs.k8s.io/kustomize/pkg/resid" - "sigs.k8s.io/kustomize/pkg/resmap" + "sigs.k8s.io/kustomize/v3/pkg/ifc" + "sigs.k8s.io/kustomize/v3/pkg/resid" + "sigs.k8s.io/kustomize/v3/pkg/resmap" "sigs.k8s.io/yaml" ) diff --git a/pkg/plugins/execplugin_test.go b/pkg/plugins/execplugin_test.go index 2c1093120..e9dfedf07 100644 --- a/pkg/plugins/execplugin_test.go +++ b/pkg/plugins/execplugin_test.go @@ -20,10 +20,10 @@ import ( "strings" "testing" - "sigs.k8s.io/kustomize/internal/loadertest" - "sigs.k8s.io/kustomize/k8sdeps/kunstruct" - "sigs.k8s.io/kustomize/pkg/resmap" - "sigs.k8s.io/kustomize/pkg/resource" + "sigs.k8s.io/kustomize/v3/internal/loadertest" + "sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct" + "sigs.k8s.io/kustomize/v3/pkg/resmap" + "sigs.k8s.io/kustomize/v3/pkg/resource" ) func TestExecPluginConfig(t *testing.T) { diff --git a/pkg/plugins/loader.go b/pkg/plugins/loader.go index 5f84614f1..49d4671fe 100644 --- a/pkg/plugins/loader.go +++ b/pkg/plugins/loader.go @@ -10,12 +10,12 @@ import ( "strings" "github.com/pkg/errors" - "sigs.k8s.io/kustomize/pkg/ifc" - "sigs.k8s.io/kustomize/pkg/resid" - "sigs.k8s.io/kustomize/pkg/resmap" - "sigs.k8s.io/kustomize/pkg/resource" - "sigs.k8s.io/kustomize/pkg/transformers" - "sigs.k8s.io/kustomize/pkg/types" + "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/resource" + "sigs.k8s.io/kustomize/v3/pkg/transformers" + "sigs.k8s.io/kustomize/v3/pkg/types" ) type Configurable interface { diff --git a/pkg/plugins/loader_test.go b/pkg/plugins/loader_test.go index 89b30fbf2..7fd5ec9d1 100644 --- a/pkg/plugins/loader_test.go +++ b/pkg/plugins/loader_test.go @@ -6,12 +6,11 @@ package plugins_test import ( "testing" - "sigs.k8s.io/kustomize/internal/loadertest" - "sigs.k8s.io/kustomize/k8sdeps/kunstruct" - . "sigs.k8s.io/kustomize/pkg/plugins" - "sigs.k8s.io/kustomize/pkg/resmap" - "sigs.k8s.io/kustomize/pkg/resource" - "sigs.k8s.io/kustomize/plugin" + "sigs.k8s.io/kustomize/v3/internal/loadertest" + "sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct" + . "sigs.k8s.io/kustomize/v3/pkg/plugins" + "sigs.k8s.io/kustomize/v3/pkg/resmap" + "sigs.k8s.io/kustomize/v3/pkg/resource" ) const ( @@ -42,7 +41,7 @@ port: "12345" ) func TestLoader(t *testing.T) { - tc := plugin.NewEnvForTest(t).Set() + tc := NewEnvForTest(t).Set() defer tc.Reset() tc.BuildGoPlugin( diff --git a/pkg/resid/resid.go b/pkg/resid/resid.go index 1f5ed0ebd..264f8fa4e 100644 --- a/pkg/resid/resid.go +++ b/pkg/resid/resid.go @@ -6,7 +6,7 @@ package resid import ( "strings" - "sigs.k8s.io/kustomize/pkg/gvk" + "sigs.k8s.io/kustomize/v3/pkg/gvk" ) // ResId is an identifier of a k8s resource object. diff --git a/pkg/resid/resid_test.go b/pkg/resid/resid_test.go index c91f8273f..f74c4e130 100644 --- a/pkg/resid/resid_test.go +++ b/pkg/resid/resid_test.go @@ -6,7 +6,7 @@ package resid import ( "testing" - "sigs.k8s.io/kustomize/pkg/gvk" + "sigs.k8s.io/kustomize/v3/pkg/gvk" ) var stringTests = []struct { diff --git a/pkg/resmap/factory.go b/pkg/resmap/factory.go index e5bcaa42a..fb80aa935 100644 --- a/pkg/resmap/factory.go +++ b/pkg/resmap/factory.go @@ -5,10 +5,10 @@ package resmap import ( "github.com/pkg/errors" - "sigs.k8s.io/kustomize/internal/kusterr" - "sigs.k8s.io/kustomize/pkg/ifc" - "sigs.k8s.io/kustomize/pkg/resource" - "sigs.k8s.io/kustomize/pkg/types" + "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" ) // Factory makes instances of ResMap. diff --git a/pkg/resmap/factory_test.go b/pkg/resmap/factory_test.go index 308464f19..67c147128 100644 --- a/pkg/resmap/factory_test.go +++ b/pkg/resmap/factory_test.go @@ -8,15 +8,15 @@ import ( "reflect" "testing" - "sigs.k8s.io/kustomize/internal/loadertest" - "sigs.k8s.io/kustomize/pkg/fs" - "sigs.k8s.io/kustomize/pkg/gvk" - "sigs.k8s.io/kustomize/pkg/ifc" - "sigs.k8s.io/kustomize/pkg/loader" - . "sigs.k8s.io/kustomize/pkg/resmap" - "sigs.k8s.io/kustomize/pkg/resmaptest" - "sigs.k8s.io/kustomize/pkg/types" - "sigs.k8s.io/kustomize/pkg/validators" + "sigs.k8s.io/kustomize/v3/internal/loadertest" + "sigs.k8s.io/kustomize/v3/pkg/fs" + "sigs.k8s.io/kustomize/v3/pkg/gvk" + "sigs.k8s.io/kustomize/v3/pkg/ifc" + "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" ) func TestFromFile(t *testing.T) { diff --git a/pkg/resmap/idslice.go b/pkg/resmap/idslice.go index 50b834baf..c273250f8 100644 --- a/pkg/resmap/idslice.go +++ b/pkg/resmap/idslice.go @@ -19,7 +19,7 @@ package resmap import ( "sort" - "sigs.k8s.io/kustomize/pkg/resid" + "sigs.k8s.io/kustomize/v3/pkg/resid" ) // IdSlice implements the sort interface. diff --git a/pkg/resmap/idslice_test.go b/pkg/resmap/idslice_test.go index 884f32b92..015edf2fa 100644 --- a/pkg/resmap/idslice_test.go +++ b/pkg/resmap/idslice_test.go @@ -21,7 +21,7 @@ import ( "sort" "testing" - "sigs.k8s.io/kustomize/pkg/resid" + "sigs.k8s.io/kustomize/v3/pkg/resid" ) func TestLess(t *testing.T) { diff --git a/pkg/resmap/resmap.go b/pkg/resmap/resmap.go index f9b453871..f2e2d4a79 100644 --- a/pkg/resmap/resmap.go +++ b/pkg/resmap/resmap.go @@ -10,9 +10,9 @@ import ( "fmt" "github.com/pkg/errors" - "sigs.k8s.io/kustomize/pkg/resid" - "sigs.k8s.io/kustomize/pkg/resource" - "sigs.k8s.io/kustomize/pkg/types" + "sigs.k8s.io/kustomize/v3/pkg/resid" + "sigs.k8s.io/kustomize/v3/pkg/resource" + "sigs.k8s.io/kustomize/v3/pkg/types" "sigs.k8s.io/yaml" ) diff --git a/pkg/resmap/resmap_test.go b/pkg/resmap/resmap_test.go index 9adacc200..babe8cb20 100644 --- a/pkg/resmap/resmap_test.go +++ b/pkg/resmap/resmap_test.go @@ -8,12 +8,12 @@ import ( "reflect" "testing" - "sigs.k8s.io/kustomize/k8sdeps/kunstruct" - "sigs.k8s.io/kustomize/pkg/resid" - . "sigs.k8s.io/kustomize/pkg/resmap" - "sigs.k8s.io/kustomize/pkg/resmaptest" - "sigs.k8s.io/kustomize/pkg/resource" - "sigs.k8s.io/kustomize/pkg/types" + "sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct" + "sigs.k8s.io/kustomize/v3/pkg/resid" + . "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" ) var rf = resource.NewFactory( diff --git a/pkg/resmaptest/rmbuilder.go b/pkg/resmaptest/rmbuilder.go index 6d2f55247..638267bc1 100644 --- a/pkg/resmaptest/rmbuilder.go +++ b/pkg/resmaptest/rmbuilder.go @@ -6,9 +6,9 @@ package resmaptest_test import ( "testing" - "sigs.k8s.io/kustomize/pkg/resid" - "sigs.k8s.io/kustomize/pkg/resmap" - "sigs.k8s.io/kustomize/pkg/resource" + "sigs.k8s.io/kustomize/v3/pkg/resid" + "sigs.k8s.io/kustomize/v3/pkg/resmap" + "sigs.k8s.io/kustomize/v3/pkg/resource" ) // Builds ResMaps for tests, with test-aware error handling. diff --git a/pkg/resource/factory.go b/pkg/resource/factory.go index 651e6c9e8..eb8bbbba7 100644 --- a/pkg/resource/factory.go +++ b/pkg/resource/factory.go @@ -9,9 +9,9 @@ import ( "log" "strings" - "sigs.k8s.io/kustomize/internal/kusterr" - "sigs.k8s.io/kustomize/pkg/ifc" - "sigs.k8s.io/kustomize/pkg/types" + "sigs.k8s.io/kustomize/v3/internal/kusterr" + "sigs.k8s.io/kustomize/v3/pkg/ifc" + "sigs.k8s.io/kustomize/v3/pkg/types" ) // Factory makes instances of Resource. diff --git a/pkg/resource/factory_test.go b/pkg/resource/factory_test.go index aa5b7b274..5658a394a 100644 --- a/pkg/resource/factory_test.go +++ b/pkg/resource/factory_test.go @@ -20,9 +20,9 @@ import ( "reflect" "testing" - "sigs.k8s.io/kustomize/internal/loadertest" - . "sigs.k8s.io/kustomize/pkg/resource" - "sigs.k8s.io/kustomize/pkg/types" + "sigs.k8s.io/kustomize/v3/internal/loadertest" + . "sigs.k8s.io/kustomize/v3/pkg/resource" + "sigs.k8s.io/kustomize/v3/pkg/types" ) func TestSliceFromPatches(t *testing.T) { diff --git a/pkg/resource/resource.go b/pkg/resource/resource.go index a059ef6f3..fb3eeeac4 100644 --- a/pkg/resource/resource.go +++ b/pkg/resource/resource.go @@ -8,9 +8,9 @@ import ( "reflect" "strings" - "sigs.k8s.io/kustomize/pkg/ifc" - "sigs.k8s.io/kustomize/pkg/resid" - "sigs.k8s.io/kustomize/pkg/types" + "sigs.k8s.io/kustomize/v3/pkg/ifc" + "sigs.k8s.io/kustomize/v3/pkg/resid" + "sigs.k8s.io/kustomize/v3/pkg/types" "sigs.k8s.io/yaml" ) diff --git a/pkg/resource/resource_test.go b/pkg/resource/resource_test.go index abc233e5c..9e34d96c4 100644 --- a/pkg/resource/resource_test.go +++ b/pkg/resource/resource_test.go @@ -20,11 +20,11 @@ import ( "reflect" "testing" - "sigs.k8s.io/kustomize/k8sdeps/kunstruct" - "sigs.k8s.io/kustomize/pkg/gvk" - "sigs.k8s.io/kustomize/pkg/resid" - . "sigs.k8s.io/kustomize/pkg/resource" - "sigs.k8s.io/kustomize/pkg/types" + "sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct" + "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" ) var factory = NewFactory( diff --git a/pkg/target/baseandoverlaymedium_test.go b/pkg/target/baseandoverlaymedium_test.go index d8de8fc61..9b614e31c 100644 --- a/pkg/target/baseandoverlaymedium_test.go +++ b/pkg/target/baseandoverlaymedium_test.go @@ -19,7 +19,7 @@ package target_test import ( "testing" - "sigs.k8s.io/kustomize/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/pkg/kusttest" ) func writeMediumBase(th *kusttest_test.KustTestHarness) { diff --git a/pkg/target/baseandoverlaysmall_test.go b/pkg/target/baseandoverlaysmall_test.go index a8f1d0a55..3bc99b75f 100644 --- a/pkg/target/baseandoverlaysmall_test.go +++ b/pkg/target/baseandoverlaysmall_test.go @@ -20,9 +20,9 @@ import ( "strings" "testing" - "sigs.k8s.io/kustomize/pkg/kusttest" - "sigs.k8s.io/kustomize/pkg/loader" - "sigs.k8s.io/kustomize/pkg/plugins" + "sigs.k8s.io/kustomize/v3/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/pkg/loader" + "sigs.k8s.io/kustomize/v3/pkg/plugins" ) func TestOrderPreserved(t *testing.T) { diff --git a/pkg/target/chartinflatorplugin_test.go b/pkg/target/chartinflatorplugin_test.go index f2264a931..2124f0887 100644 --- a/pkg/target/chartinflatorplugin_test.go +++ b/pkg/target/chartinflatorplugin_test.go @@ -8,10 +8,10 @@ package target_test import ( + "sigs.k8s.io/kustomize/v3/pkg/plugins" "testing" - "sigs.k8s.io/kustomize/pkg/kusttest" - "sigs.k8s.io/kustomize/plugin" + "sigs.k8s.io/kustomize/v3/pkg/kusttest" ) // This is an example of using a helm chart as a base, @@ -28,7 +28,7 @@ import ( // TODO: Download and inflate the chart, and check that // in for the test. func TestChartInflatorPlugin(t *testing.T) { - tc := plugin.NewEnvForTest(t).Set() + tc := plugins.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildExecPlugin( diff --git a/pkg/target/configmaps_test.go b/pkg/target/configmaps_test.go index 8692cd096..18d4a9a0f 100644 --- a/pkg/target/configmaps_test.go +++ b/pkg/target/configmaps_test.go @@ -19,7 +19,7 @@ package target_test import ( "testing" - "sigs.k8s.io/kustomize/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/pkg/kusttest" ) // Generate a Secret and a ConfigMap from the same data diff --git a/pkg/target/crd_test.go b/pkg/target/crd_test.go index 2c638a75e..fed98588f 100644 --- a/pkg/target/crd_test.go +++ b/pkg/target/crd_test.go @@ -19,7 +19,7 @@ package target_test import ( "testing" - "sigs.k8s.io/kustomize/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/pkg/kusttest" ) func writeBaseWithCrd(th *kusttest_test.KustTestHarness) { diff --git a/pkg/target/customconfig_test.go b/pkg/target/customconfig_test.go index 2fa2ade44..8a6fd0cf1 100644 --- a/pkg/target/customconfig_test.go +++ b/pkg/target/customconfig_test.go @@ -19,7 +19,7 @@ package target_test import ( "testing" - "sigs.k8s.io/kustomize/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/pkg/kusttest" ) func makeBaseReferencingCustomConfig(th *kusttest_test.KustTestHarness) { diff --git a/pkg/target/generatormergeandreplace_test.go b/pkg/target/generatormergeandreplace_test.go index 30a12b201..d3afdcbb0 100644 --- a/pkg/target/generatormergeandreplace_test.go +++ b/pkg/target/generatormergeandreplace_test.go @@ -20,7 +20,7 @@ import ( "strings" "testing" - "sigs.k8s.io/kustomize/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/pkg/kusttest" ) func TestSimpleBase(t *testing.T) { diff --git a/pkg/target/generatoroptions_test.go b/pkg/target/generatoroptions_test.go index b4b5325a2..8d8e09bd5 100644 --- a/pkg/target/generatoroptions_test.go +++ b/pkg/target/generatoroptions_test.go @@ -19,7 +19,7 @@ package target_test import ( "testing" - "sigs.k8s.io/kustomize/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/pkg/kusttest" ) func TestSecretGenerator(t *testing.T) { diff --git a/pkg/target/kusttarget.go b/pkg/target/kusttarget.go index a26fdce6b..3005acee7 100644 --- a/pkg/target/kusttarget.go +++ b/pkg/target/kusttarget.go @@ -12,16 +12,16 @@ import ( "strings" "github.com/pkg/errors" - "sigs.k8s.io/kustomize/pkg/accumulator" - "sigs.k8s.io/kustomize/pkg/ifc" - "sigs.k8s.io/kustomize/pkg/ifc/transformer" - "sigs.k8s.io/kustomize/pkg/pgmconfig" - "sigs.k8s.io/kustomize/pkg/plugins" - "sigs.k8s.io/kustomize/pkg/resmap" - "sigs.k8s.io/kustomize/pkg/transformers" - "sigs.k8s.io/kustomize/pkg/transformers/config" - "sigs.k8s.io/kustomize/pkg/types" - "sigs.k8s.io/kustomize/plugin/builtin" + "sigs.k8s.io/kustomize/v3/pkg/accumulator" + "sigs.k8s.io/kustomize/v3/pkg/ifc" + "sigs.k8s.io/kustomize/v3/pkg/ifc/transformer" + "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/pkg/types" + "sigs.k8s.io/kustomize/v3/plugin/builtin" "sigs.k8s.io/yaml" ) diff --git a/pkg/target/kusttarget_configplugin.go b/pkg/target/kusttarget_configplugin.go index 7a72472f0..1cf9e143f 100644 --- a/pkg/target/kusttarget_configplugin.go +++ b/pkg/target/kusttarget_configplugin.go @@ -5,12 +5,12 @@ package target import ( "github.com/pkg/errors" - "sigs.k8s.io/kustomize/pkg/image" - "sigs.k8s.io/kustomize/pkg/plugins" - "sigs.k8s.io/kustomize/pkg/transformers" - "sigs.k8s.io/kustomize/pkg/transformers/config" - "sigs.k8s.io/kustomize/pkg/types" - "sigs.k8s.io/kustomize/plugin/builtin" + "sigs.k8s.io/kustomize/v3/pkg/image" + "sigs.k8s.io/kustomize/v3/pkg/plugins" + "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/yaml" ) diff --git a/pkg/target/kusttarget_test.go b/pkg/target/kusttarget_test.go index cc1643c9a..f3fb4cc7d 100644 --- a/pkg/target/kusttarget_test.go +++ b/pkg/target/kusttarget_test.go @@ -10,14 +10,14 @@ import ( "strings" "testing" - "sigs.k8s.io/kustomize/internal/loadertest" - "sigs.k8s.io/kustomize/pkg/gvk" - "sigs.k8s.io/kustomize/pkg/ifc" - "sigs.k8s.io/kustomize/pkg/kusttest" - "sigs.k8s.io/kustomize/pkg/resmap" - "sigs.k8s.io/kustomize/pkg/resource" - . "sigs.k8s.io/kustomize/pkg/target" - "sigs.k8s.io/kustomize/pkg/types" + "sigs.k8s.io/kustomize/v3/internal/loadertest" + "sigs.k8s.io/kustomize/v3/pkg/gvk" + "sigs.k8s.io/kustomize/v3/pkg/ifc" + "sigs.k8s.io/kustomize/v3/pkg/kusttest" + "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" ) const ( diff --git a/pkg/target/multiplepatch_test.go b/pkg/target/multiplepatch_test.go index c14b0173d..631b19b74 100644 --- a/pkg/target/multiplepatch_test.go +++ b/pkg/target/multiplepatch_test.go @@ -20,7 +20,7 @@ import ( "strings" "testing" - "sigs.k8s.io/kustomize/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/pkg/kusttest" ) func makeCommonFileForMultiplePatchTest(th *kusttest_test.KustTestHarness) { diff --git a/pkg/target/namespacedgenerators_test.go b/pkg/target/namespacedgenerators_test.go index f62325f44..6d8e7a742 100644 --- a/pkg/target/namespacedgenerators_test.go +++ b/pkg/target/namespacedgenerators_test.go @@ -19,7 +19,7 @@ package target_test import ( "testing" - "sigs.k8s.io/kustomize/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/pkg/kusttest" ) func TestNamespacedGenerator(t *testing.T) { diff --git a/pkg/target/nullvalues_test.go b/pkg/target/nullvalues_test.go index f77cdaf96..09e4fee08 100644 --- a/pkg/target/nullvalues_test.go +++ b/pkg/target/nullvalues_test.go @@ -19,7 +19,7 @@ package target_test import ( "testing" - "sigs.k8s.io/kustomize/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/pkg/kusttest" ) func TestNullValues(t *testing.T) { diff --git a/pkg/target/plugindir_test.go b/pkg/target/plugindir_test.go index ec1c0cf0d..5e55884aa 100644 --- a/pkg/target/plugindir_test.go +++ b/pkg/target/plugindir_test.go @@ -9,21 +9,20 @@ import ( "path/filepath" "testing" - "sigs.k8s.io/kustomize/k8sdeps/kunstruct" - "sigs.k8s.io/kustomize/k8sdeps/transformer" - "sigs.k8s.io/kustomize/pkg/fs" - "sigs.k8s.io/kustomize/pkg/kusttest" - "sigs.k8s.io/kustomize/pkg/loader" - "sigs.k8s.io/kustomize/pkg/plugins" - "sigs.k8s.io/kustomize/pkg/resmap" - "sigs.k8s.io/kustomize/pkg/resource" - "sigs.k8s.io/kustomize/pkg/target" - "sigs.k8s.io/kustomize/pkg/validators" - "sigs.k8s.io/kustomize/plugin" + "sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct" + "sigs.k8s.io/kustomize/v3/k8sdeps/transformer" + "sigs.k8s.io/kustomize/v3/pkg/fs" + "sigs.k8s.io/kustomize/v3/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/pkg/loader" + "sigs.k8s.io/kustomize/v3/pkg/plugins" + "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/validators" ) func TestPluginDir(t *testing.T) { - tc := plugin.NewEnvForTest(t).Set() + tc := plugins.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildExecPlugin( diff --git a/pkg/target/pruneconfigmap_test.go b/pkg/target/pruneconfigmap_test.go index f44ebf051..c96d02f92 100644 --- a/pkg/target/pruneconfigmap_test.go +++ b/pkg/target/pruneconfigmap_test.go @@ -19,7 +19,7 @@ package target_test import ( "testing" - "sigs.k8s.io/kustomize/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/pkg/kusttest" ) func TestPruneConfigMap(t *testing.T) { diff --git a/pkg/target/resourceconflict_test.go b/pkg/target/resourceconflict_test.go index 87efd2ccd..0f1f8108c 100644 --- a/pkg/target/resourceconflict_test.go +++ b/pkg/target/resourceconflict_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "sigs.k8s.io/kustomize/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/pkg/kusttest" ) func writeBase(th *kusttest_test.KustTestHarness) { diff --git a/pkg/target/transformerplugin_test.go b/pkg/target/transformerplugin_test.go index e5750ae19..9b7e8f94f 100644 --- a/pkg/target/transformerplugin_test.go +++ b/pkg/target/transformerplugin_test.go @@ -4,11 +4,11 @@ package target_test import ( + "sigs.k8s.io/kustomize/v3/pkg/plugins" "strings" "testing" - "sigs.k8s.io/kustomize/pkg/kusttest" - "sigs.k8s.io/kustomize/plugin" + "sigs.k8s.io/kustomize/v3/pkg/kusttest" ) func writeDeployment(th *kusttest_test.KustTestHarness, path string) { @@ -50,7 +50,7 @@ metadata: } func TestOrderedTransformers(t *testing.T) { - tc := plugin.NewEnvForTest(t).Set() + tc := plugins.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildGoPlugin( @@ -98,7 +98,7 @@ spec: } func TestPluginsNotEnabled(t *testing.T) { - tc := plugin.NewEnvForTest(t).Set() + tc := plugins.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildGoPlugin( @@ -121,7 +121,7 @@ transformers: } func TestSedTransformer(t *testing.T) { - tc := plugin.NewEnvForTest(t).Set() + tc := plugins.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildExecPlugin( @@ -189,7 +189,7 @@ metadata: } func TestTransformedTransformers(t *testing.T) { - tc := plugin.NewEnvForTest(t).Set() + tc := plugins.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildGoPlugin( diff --git a/pkg/target/transformersarrays_test.go b/pkg/target/transformersarrays_test.go index ddd3d2484..eaa88445e 100644 --- a/pkg/target/transformersarrays_test.go +++ b/pkg/target/transformersarrays_test.go @@ -6,7 +6,7 @@ package target_test import ( "testing" - kusttest_test "sigs.k8s.io/kustomize/pkg/kusttest" + kusttest_test "sigs.k8s.io/kustomize/v3/pkg/kusttest" ) func makeStatefulSetKustomization(th *kusttest_test.KustTestHarness) { diff --git a/pkg/target/transformersimage_test.go b/pkg/target/transformersimage_test.go index ead15f27d..900900117 100644 --- a/pkg/target/transformersimage_test.go +++ b/pkg/target/transformersimage_test.go @@ -19,7 +19,7 @@ package target_test import ( "testing" - "sigs.k8s.io/kustomize/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/pkg/kusttest" ) func makeTransfomersImageBase(th *kusttest_test.KustTestHarness) { diff --git a/pkg/target/variableref_test.go b/pkg/target/variableref_test.go index 0091a6960..e4ba55aa4 100644 --- a/pkg/target/variableref_test.go +++ b/pkg/target/variableref_test.go @@ -20,7 +20,7 @@ import ( "strings" "testing" - "sigs.k8s.io/kustomize/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/pkg/kusttest" ) func TestBasicVariableRef(t *testing.T) { diff --git a/pkg/transformers/config/factory.go b/pkg/transformers/config/factory.go index e46407822..c384f6bdc 100644 --- a/pkg/transformers/config/factory.go +++ b/pkg/transformers/config/factory.go @@ -19,7 +19,7 @@ package config import ( "log" - "sigs.k8s.io/kustomize/pkg/ifc" + "sigs.k8s.io/kustomize/v3/pkg/ifc" "sigs.k8s.io/yaml" ) diff --git a/pkg/transformers/config/factory_test.go b/pkg/transformers/config/factory_test.go index a3d797ba5..656c9ea05 100644 --- a/pkg/transformers/config/factory_test.go +++ b/pkg/transformers/config/factory_test.go @@ -7,8 +7,8 @@ import ( "reflect" "testing" - "sigs.k8s.io/kustomize/internal/loadertest" - "sigs.k8s.io/kustomize/pkg/gvk" + "sigs.k8s.io/kustomize/v3/internal/loadertest" + "sigs.k8s.io/kustomize/v3/pkg/gvk" ) func TestMakeDefaultConfig(t *testing.T) { diff --git a/pkg/transformers/config/factorycrd.go b/pkg/transformers/config/factorycrd.go index e5e26541d..248e1e799 100644 --- a/pkg/transformers/config/factorycrd.go +++ b/pkg/transformers/config/factorycrd.go @@ -23,8 +23,8 @@ import ( "github.com/go-openapi/spec" "github.com/pkg/errors" "k8s.io/kube-openapi/pkg/common" - "sigs.k8s.io/kustomize/pkg/gvk" - "sigs.k8s.io/kustomize/pkg/ifc" + "sigs.k8s.io/kustomize/v3/pkg/gvk" + "sigs.k8s.io/kustomize/v3/pkg/ifc" "sigs.k8s.io/yaml" ) diff --git a/pkg/transformers/config/factorycrd_test.go b/pkg/transformers/config/factorycrd_test.go index b7db200d3..17aaec9e9 100644 --- a/pkg/transformers/config/factorycrd_test.go +++ b/pkg/transformers/config/factorycrd_test.go @@ -20,9 +20,9 @@ import ( "reflect" "testing" - "sigs.k8s.io/kustomize/internal/loadertest" - "sigs.k8s.io/kustomize/pkg/gvk" - "sigs.k8s.io/kustomize/pkg/ifc" + "sigs.k8s.io/kustomize/v3/internal/loadertest" + "sigs.k8s.io/kustomize/v3/pkg/gvk" + "sigs.k8s.io/kustomize/v3/pkg/ifc" ) // This defines two CRD's: Bee and MyKind. diff --git a/pkg/transformers/config/fieldspec.go b/pkg/transformers/config/fieldspec.go index 5b0f6ee33..e746f889a 100644 --- a/pkg/transformers/config/fieldspec.go +++ b/pkg/transformers/config/fieldspec.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "sigs.k8s.io/kustomize/pkg/gvk" + "sigs.k8s.io/kustomize/v3/pkg/gvk" ) // FieldSpec completely specifies a kustomizable field in diff --git a/pkg/transformers/config/fieldspec_test.go b/pkg/transformers/config/fieldspec_test.go index 7279e0abe..a7029fb87 100644 --- a/pkg/transformers/config/fieldspec_test.go +++ b/pkg/transformers/config/fieldspec_test.go @@ -22,7 +22,7 @@ import ( "strings" "testing" - "sigs.k8s.io/kustomize/pkg/gvk" + "sigs.k8s.io/kustomize/v3/pkg/gvk" ) func TestPathSlice(t *testing.T) { diff --git a/pkg/transformers/config/namebackreferences.go b/pkg/transformers/config/namebackreferences.go index 172e4b3ca..c27674bd4 100644 --- a/pkg/transformers/config/namebackreferences.go +++ b/pkg/transformers/config/namebackreferences.go @@ -19,7 +19,7 @@ package config import ( "strings" - "sigs.k8s.io/kustomize/pkg/gvk" + "sigs.k8s.io/kustomize/v3/pkg/gvk" ) // NameBackReferences is an association between a gvk.GVK and a list diff --git a/pkg/transformers/config/namebackreferences_test.go b/pkg/transformers/config/namebackreferences_test.go index a872a74d9..9ccd306a4 100644 --- a/pkg/transformers/config/namebackreferences_test.go +++ b/pkg/transformers/config/namebackreferences_test.go @@ -18,7 +18,7 @@ package config import ( "reflect" - "sigs.k8s.io/kustomize/pkg/gvk" + "sigs.k8s.io/kustomize/v3/pkg/gvk" "testing" ) diff --git a/pkg/transformers/config/transformerconfig.go b/pkg/transformers/config/transformerconfig.go index bede48b72..94cf2118a 100644 --- a/pkg/transformers/config/transformerconfig.go +++ b/pkg/transformers/config/transformerconfig.go @@ -22,7 +22,7 @@ import ( "log" "sort" - "sigs.k8s.io/kustomize/pkg/transformers/config/defaultconfig" + "sigs.k8s.io/kustomize/v3/pkg/transformers/config/defaultconfig" ) // TransformerConfig holds the data needed to perform transformations. diff --git a/pkg/transformers/config/transformerconfig_test.go b/pkg/transformers/config/transformerconfig_test.go index 40d8b05e4..00e9ee497 100644 --- a/pkg/transformers/config/transformerconfig_test.go +++ b/pkg/transformers/config/transformerconfig_test.go @@ -21,7 +21,7 @@ import ( "reflect" - "sigs.k8s.io/kustomize/pkg/gvk" + "sigs.k8s.io/kustomize/v3/pkg/gvk" ) func TestAddNamereferenceFieldSpec(t *testing.T) { diff --git a/pkg/transformers/labelsandannotations.go b/pkg/transformers/labelsandannotations.go index b76651a3b..52f7db5fc 100644 --- a/pkg/transformers/labelsandannotations.go +++ b/pkg/transformers/labelsandannotations.go @@ -20,8 +20,8 @@ import ( "errors" "fmt" - "sigs.k8s.io/kustomize/pkg/resmap" - "sigs.k8s.io/kustomize/pkg/transformers/config" + "sigs.k8s.io/kustomize/v3/pkg/resmap" + "sigs.k8s.io/kustomize/v3/pkg/transformers/config" ) // mapTransformer applies a string->string map to fieldSpecs. diff --git a/pkg/transformers/labelsandannotations_test.go b/pkg/transformers/labelsandannotations_test.go index fd3ef0fb9..a8f221da1 100644 --- a/pkg/transformers/labelsandannotations_test.go +++ b/pkg/transformers/labelsandannotations_test.go @@ -6,10 +6,10 @@ package transformers import ( "testing" - "sigs.k8s.io/kustomize/k8sdeps/kunstruct" - "sigs.k8s.io/kustomize/pkg/resmaptest" - "sigs.k8s.io/kustomize/pkg/resource" - "sigs.k8s.io/kustomize/pkg/transformers/config" + "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()) diff --git a/pkg/transformers/multitransformer.go b/pkg/transformers/multitransformer.go index cd78e3802..954dad5dd 100644 --- a/pkg/transformers/multitransformer.go +++ b/pkg/transformers/multitransformer.go @@ -19,7 +19,7 @@ package transformers import ( "fmt" - "sigs.k8s.io/kustomize/pkg/resmap" + "sigs.k8s.io/kustomize/v3/pkg/resmap" ) // multiTransformer contains a list of transformers. diff --git a/pkg/transformers/mutatefield_test.go b/pkg/transformers/mutatefield_test.go index 528c0cb34..ee62cbf7c 100644 --- a/pkg/transformers/mutatefield_test.go +++ b/pkg/transformers/mutatefield_test.go @@ -18,8 +18,8 @@ package transformers import ( "fmt" - "sigs.k8s.io/kustomize/k8sdeps/kunstruct" - "sigs.k8s.io/kustomize/pkg/ifc" + "sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct" + "sigs.k8s.io/kustomize/v3/pkg/ifc" "testing" ) diff --git a/pkg/transformers/namereference.go b/pkg/transformers/namereference.go index ef8c48b95..3982423e4 100644 --- a/pkg/transformers/namereference.go +++ b/pkg/transformers/namereference.go @@ -7,11 +7,11 @@ import ( "fmt" "log" - "sigs.k8s.io/kustomize/pkg/resource" + "sigs.k8s.io/kustomize/v3/pkg/resource" - "sigs.k8s.io/kustomize/pkg/gvk" - "sigs.k8s.io/kustomize/pkg/resmap" - "sigs.k8s.io/kustomize/pkg/transformers/config" + "sigs.k8s.io/kustomize/v3/pkg/gvk" + "sigs.k8s.io/kustomize/v3/pkg/resmap" + "sigs.k8s.io/kustomize/v3/pkg/transformers/config" ) type nameReferenceTransformer struct { diff --git a/pkg/transformers/namereference_test.go b/pkg/transformers/namereference_test.go index 668da6d2a..fe931cfd6 100644 --- a/pkg/transformers/namereference_test.go +++ b/pkg/transformers/namereference_test.go @@ -7,10 +7,10 @@ import ( "strings" "testing" - "sigs.k8s.io/kustomize/k8sdeps/kunstruct" - "sigs.k8s.io/kustomize/pkg/resmap" - "sigs.k8s.io/kustomize/pkg/resmaptest" - "sigs.k8s.io/kustomize/pkg/resource" + "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/resource" ) func TestNameReferenceHappyRun(t *testing.T) { diff --git a/pkg/transformers/nooptransformer.go b/pkg/transformers/nooptransformer.go index c07389b31..066d23022 100644 --- a/pkg/transformers/nooptransformer.go +++ b/pkg/transformers/nooptransformer.go @@ -16,7 +16,7 @@ limitations under the License. package transformers -import "sigs.k8s.io/kustomize/pkg/resmap" +import "sigs.k8s.io/kustomize/v3/pkg/resmap" // noOpTransformer contains a no-op transformer. type noOpTransformer struct{} diff --git a/pkg/transformers/refvars.go b/pkg/transformers/refvars.go index 57cb71507..083807e90 100644 --- a/pkg/transformers/refvars.go +++ b/pkg/transformers/refvars.go @@ -18,9 +18,9 @@ package transformers import ( "fmt" - "sigs.k8s.io/kustomize/pkg/expansion" - "sigs.k8s.io/kustomize/pkg/resmap" - "sigs.k8s.io/kustomize/pkg/transformers/config" + "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 { diff --git a/pkg/transformers/refvars_test.go b/pkg/transformers/refvars_test.go index f82597023..120f9ec4b 100644 --- a/pkg/transformers/refvars_test.go +++ b/pkg/transformers/refvars_test.go @@ -7,10 +7,10 @@ import ( "reflect" "testing" - "sigs.k8s.io/kustomize/pkg/gvk" - "sigs.k8s.io/kustomize/pkg/resmap" - "sigs.k8s.io/kustomize/pkg/resmaptest" - "sigs.k8s.io/kustomize/pkg/transformers/config" + "sigs.k8s.io/kustomize/v3/pkg/gvk" + "sigs.k8s.io/kustomize/v3/pkg/resmap" + "sigs.k8s.io/kustomize/v3/pkg/resmaptest" + "sigs.k8s.io/kustomize/v3/pkg/transformers/config" ) func TestVarRef(t *testing.T) { diff --git a/pkg/transformers/transformer.go b/pkg/transformers/transformer.go index 301fdf7bf..cf088cddd 100644 --- a/pkg/transformers/transformer.go +++ b/pkg/transformers/transformer.go @@ -18,7 +18,7 @@ limitations under the License. package transformers import ( - "sigs.k8s.io/kustomize/pkg/resmap" + "sigs.k8s.io/kustomize/v3/pkg/resmap" ) // A Transformer modifies an instance of resmap.ResMap. diff --git a/pkg/types/genargs_test.go b/pkg/types/genargs_test.go index a613aaa8c..53af4bfca 100644 --- a/pkg/types/genargs_test.go +++ b/pkg/types/genargs_test.go @@ -19,7 +19,7 @@ package types_test import ( "testing" - . "sigs.k8s.io/kustomize/pkg/types" + . "sigs.k8s.io/kustomize/v3/pkg/types" ) func TestGenArgs_String(t *testing.T) { diff --git a/pkg/types/kustomization.go b/pkg/types/kustomization.go index 67192bd84..0568eba12 100644 --- a/pkg/types/kustomization.go +++ b/pkg/types/kustomization.go @@ -20,8 +20,8 @@ package types import ( "regexp" - "sigs.k8s.io/kustomize/pkg/gvk" - "sigs.k8s.io/kustomize/pkg/image" + "sigs.k8s.io/kustomize/v3/pkg/gvk" + "sigs.k8s.io/kustomize/v3/pkg/image" ) const ( diff --git a/pkg/types/var.go b/pkg/types/var.go index d86e8deec..4b70caf7f 100644 --- a/pkg/types/var.go +++ b/pkg/types/var.go @@ -21,7 +21,7 @@ import ( "sort" "strings" - "sigs.k8s.io/kustomize/pkg/gvk" + "sigs.k8s.io/kustomize/v3/pkg/gvk" ) const defaultFieldPath = "metadata.name" diff --git a/pkg/types/var_test.go b/pkg/types/var_test.go index e2c9cc1fb..95f799e02 100644 --- a/pkg/types/var_test.go +++ b/pkg/types/var_test.go @@ -22,7 +22,7 @@ import ( "testing" "gopkg.in/yaml.v2" - "sigs.k8s.io/kustomize/pkg/gvk" + "sigs.k8s.io/kustomize/v3/pkg/gvk" ) func TestGVK(t *testing.T) { diff --git a/plugin/builtin/AnnotationsTransformer.go b/plugin/builtin/AnnotationsTransformer.go index ec23eeb38..64f63740d 100644 --- a/plugin/builtin/AnnotationsTransformer.go +++ b/plugin/builtin/AnnotationsTransformer.go @@ -2,10 +2,10 @@ package builtin import ( - "sigs.k8s.io/kustomize/pkg/ifc" - "sigs.k8s.io/kustomize/pkg/resmap" - "sigs.k8s.io/kustomize/pkg/transformers" - "sigs.k8s.io/kustomize/pkg/transformers/config" + "sigs.k8s.io/kustomize/v3/pkg/ifc" + "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" ) diff --git a/plugin/builtin/ConfigMapGenerator.go b/plugin/builtin/ConfigMapGenerator.go index 73504a61b..b737a4eda 100644 --- a/plugin/builtin/ConfigMapGenerator.go +++ b/plugin/builtin/ConfigMapGenerator.go @@ -2,9 +2,9 @@ package builtin import ( - "sigs.k8s.io/kustomize/pkg/ifc" - "sigs.k8s.io/kustomize/pkg/resmap" - "sigs.k8s.io/kustomize/pkg/types" + "sigs.k8s.io/kustomize/v3/pkg/ifc" + "sigs.k8s.io/kustomize/v3/pkg/resmap" + "sigs.k8s.io/kustomize/v3/pkg/types" "sigs.k8s.io/yaml" ) diff --git a/plugin/builtin/HashTransformer.go b/plugin/builtin/HashTransformer.go index c577a2751..fe1f0075a 100644 --- a/plugin/builtin/HashTransformer.go +++ b/plugin/builtin/HashTransformer.go @@ -4,8 +4,8 @@ package builtin import ( "fmt" - "sigs.k8s.io/kustomize/pkg/ifc" - "sigs.k8s.io/kustomize/pkg/resmap" + "sigs.k8s.io/kustomize/v3/pkg/ifc" + "sigs.k8s.io/kustomize/v3/pkg/resmap" ) type HashTransformerPlugin struct { diff --git a/plugin/builtin/ImageTagTransformer.go b/plugin/builtin/ImageTagTransformer.go index a2ae13e43..35021733d 100644 --- a/plugin/builtin/ImageTagTransformer.go +++ b/plugin/builtin/ImageTagTransformer.go @@ -6,11 +6,11 @@ import ( "regexp" "strings" - "sigs.k8s.io/kustomize/pkg/ifc" - "sigs.k8s.io/kustomize/pkg/image" - "sigs.k8s.io/kustomize/pkg/resmap" - "sigs.k8s.io/kustomize/pkg/transformers" - "sigs.k8s.io/kustomize/pkg/transformers/config" + "sigs.k8s.io/kustomize/v3/pkg/ifc" + "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" "sigs.k8s.io/yaml" ) diff --git a/plugin/builtin/InventoryTransformer.go b/plugin/builtin/InventoryTransformer.go index 579d43837..fdc455108 100644 --- a/plugin/builtin/InventoryTransformer.go +++ b/plugin/builtin/InventoryTransformer.go @@ -4,14 +4,14 @@ package builtin import ( "fmt" - "sigs.k8s.io/kustomize/pkg/resource" + "sigs.k8s.io/kustomize/v3/pkg/resource" - "sigs.k8s.io/kustomize/pkg/hasher" - "sigs.k8s.io/kustomize/pkg/ifc" - "sigs.k8s.io/kustomize/pkg/inventory" - "sigs.k8s.io/kustomize/pkg/resid" - "sigs.k8s.io/kustomize/pkg/resmap" - "sigs.k8s.io/kustomize/pkg/types" + "sigs.k8s.io/kustomize/v3/pkg/hasher" + "sigs.k8s.io/kustomize/v3/pkg/ifc" + "sigs.k8s.io/kustomize/v3/pkg/inventory" + "sigs.k8s.io/kustomize/v3/pkg/resid" + "sigs.k8s.io/kustomize/v3/pkg/resmap" + "sigs.k8s.io/kustomize/v3/pkg/types" "sigs.k8s.io/yaml" ) diff --git a/plugin/builtin/LabelTransformer.go b/plugin/builtin/LabelTransformer.go index bf7eb9f18..6865826b5 100644 --- a/plugin/builtin/LabelTransformer.go +++ b/plugin/builtin/LabelTransformer.go @@ -2,10 +2,10 @@ package builtin import ( - "sigs.k8s.io/kustomize/pkg/ifc" - "sigs.k8s.io/kustomize/pkg/resmap" - "sigs.k8s.io/kustomize/pkg/transformers" - "sigs.k8s.io/kustomize/pkg/transformers/config" + "sigs.k8s.io/kustomize/v3/pkg/ifc" + "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" ) diff --git a/plugin/builtin/LegacyOrderTransformer.go b/plugin/builtin/LegacyOrderTransformer.go index 168ed04eb..4a8278df8 100644 --- a/plugin/builtin/LegacyOrderTransformer.go +++ b/plugin/builtin/LegacyOrderTransformer.go @@ -3,9 +3,9 @@ package builtin import ( "github.com/pkg/errors" - "sigs.k8s.io/kustomize/pkg/ifc" - "sigs.k8s.io/kustomize/pkg/resmap" - "sigs.k8s.io/kustomize/pkg/resource" + "sigs.k8s.io/kustomize/v3/pkg/ifc" + "sigs.k8s.io/kustomize/v3/pkg/resmap" + "sigs.k8s.io/kustomize/v3/pkg/resource" "sort" ) diff --git a/plugin/builtin/NamespaceTransformer.go b/plugin/builtin/NamespaceTransformer.go index 66e83d760..d73094e1a 100644 --- a/plugin/builtin/NamespaceTransformer.go +++ b/plugin/builtin/NamespaceTransformer.go @@ -2,13 +2,13 @@ package builtin import ( - "sigs.k8s.io/kustomize/pkg/gvk" - "sigs.k8s.io/kustomize/pkg/ifc" - "sigs.k8s.io/kustomize/pkg/resid" - "sigs.k8s.io/kustomize/pkg/resmap" - "sigs.k8s.io/kustomize/pkg/resource" - "sigs.k8s.io/kustomize/pkg/transformers" - "sigs.k8s.io/kustomize/pkg/transformers/config" + "sigs.k8s.io/kustomize/v3/pkg/gvk" + "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/resource" + "sigs.k8s.io/kustomize/v3/pkg/transformers" + "sigs.k8s.io/kustomize/v3/pkg/transformers/config" "sigs.k8s.io/yaml" ) diff --git a/plugin/builtin/PatchJson6902Transformer.go b/plugin/builtin/PatchJson6902Transformer.go index 7fa22a32b..fc8214020 100644 --- a/plugin/builtin/PatchJson6902Transformer.go +++ b/plugin/builtin/PatchJson6902Transformer.go @@ -2,10 +2,10 @@ package builtin import ( - "sigs.k8s.io/kustomize/pkg/ifc" - "sigs.k8s.io/kustomize/pkg/patch/transformer" - "sigs.k8s.io/kustomize/pkg/resmap" - "sigs.k8s.io/kustomize/pkg/types" + "sigs.k8s.io/kustomize/v3/pkg/ifc" + "sigs.k8s.io/kustomize/v3/pkg/patch/transformer" + "sigs.k8s.io/kustomize/v3/pkg/resmap" + "sigs.k8s.io/kustomize/v3/pkg/types" "sigs.k8s.io/yaml" ) diff --git a/plugin/builtin/PrefixSuffixTransformer.go b/plugin/builtin/PrefixSuffixTransformer.go index 85c960a21..3ea0f159a 100644 --- a/plugin/builtin/PrefixSuffixTransformer.go +++ b/plugin/builtin/PrefixSuffixTransformer.go @@ -5,12 +5,12 @@ import ( "errors" "fmt" - "sigs.k8s.io/kustomize/pkg/gvk" - "sigs.k8s.io/kustomize/pkg/ifc" - "sigs.k8s.io/kustomize/pkg/resid" - "sigs.k8s.io/kustomize/pkg/resmap" - "sigs.k8s.io/kustomize/pkg/transformers" - "sigs.k8s.io/kustomize/pkg/transformers/config" + "sigs.k8s.io/kustomize/v3/pkg/gvk" + "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/transformers" + "sigs.k8s.io/kustomize/v3/pkg/transformers/config" "sigs.k8s.io/yaml" ) diff --git a/plugin/builtin/ReplicaCountTransformer.go b/plugin/builtin/ReplicaCountTransformer.go index 6bc6a1ac2..1918fb677 100644 --- a/plugin/builtin/ReplicaCountTransformer.go +++ b/plugin/builtin/ReplicaCountTransformer.go @@ -4,12 +4,12 @@ package builtin import ( "fmt" - "sigs.k8s.io/kustomize/pkg/ifc" - "sigs.k8s.io/kustomize/pkg/resid" - "sigs.k8s.io/kustomize/pkg/resmap" - "sigs.k8s.io/kustomize/pkg/transformers" - "sigs.k8s.io/kustomize/pkg/transformers/config" - "sigs.k8s.io/kustomize/pkg/types" + "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/transformers" + "sigs.k8s.io/kustomize/v3/pkg/transformers/config" + "sigs.k8s.io/kustomize/v3/pkg/types" "sigs.k8s.io/yaml" ) diff --git a/plugin/builtin/SecretGenerator.go b/plugin/builtin/SecretGenerator.go index 9815bb454..48910e830 100644 --- a/plugin/builtin/SecretGenerator.go +++ b/plugin/builtin/SecretGenerator.go @@ -2,9 +2,9 @@ package builtin import ( - "sigs.k8s.io/kustomize/pkg/ifc" - "sigs.k8s.io/kustomize/pkg/resmap" - "sigs.k8s.io/kustomize/pkg/types" + "sigs.k8s.io/kustomize/v3/pkg/ifc" + "sigs.k8s.io/kustomize/v3/pkg/resmap" + "sigs.k8s.io/kustomize/v3/pkg/types" "sigs.k8s.io/yaml" ) diff --git a/plugin/builtin/annotationstransformer/AnnotationsTransformer.go b/plugin/builtin/annotationstransformer/AnnotationsTransformer.go index 9bc4a89ae..b82579210 100644 --- a/plugin/builtin/annotationstransformer/AnnotationsTransformer.go +++ b/plugin/builtin/annotationstransformer/AnnotationsTransformer.go @@ -1,14 +1,14 @@ // Copyright 2019 The Kubernetes Authors. // SPDX-License-Identifier: Apache-2.0 -//go:generate go run sigs.k8s.io/kustomize/cmd/pluginator +//go:generate go run sigs.k8s.io/kustomize/v3/cmd/pluginator package main import ( - "sigs.k8s.io/kustomize/pkg/ifc" - "sigs.k8s.io/kustomize/pkg/resmap" - "sigs.k8s.io/kustomize/pkg/transformers" - "sigs.k8s.io/kustomize/pkg/transformers/config" + "sigs.k8s.io/kustomize/v3/pkg/ifc" + "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" ) diff --git a/plugin/builtin/annotationstransformer/AnnotationsTransformer_test.go b/plugin/builtin/annotationstransformer/AnnotationsTransformer_test.go index 156ff7fcf..3bc732c24 100644 --- a/plugin/builtin/annotationstransformer/AnnotationsTransformer_test.go +++ b/plugin/builtin/annotationstransformer/AnnotationsTransformer_test.go @@ -6,12 +6,12 @@ package main_test import ( "testing" - "sigs.k8s.io/kustomize/pkg/kusttest" - "sigs.k8s.io/kustomize/plugin" + "sigs.k8s.io/kustomize/v3/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/pkg/plugins" ) func TestAnnotationsTransformer(t *testing.T) { - tc := plugin.NewEnvForTest(t).Set() + tc := plugins.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildGoPlugin( diff --git a/plugin/builtin/configmapgenerator/ConfigMapGenerator.go b/plugin/builtin/configmapgenerator/ConfigMapGenerator.go index 880186715..721f4bb9f 100644 --- a/plugin/builtin/configmapgenerator/ConfigMapGenerator.go +++ b/plugin/builtin/configmapgenerator/ConfigMapGenerator.go @@ -1,13 +1,13 @@ // Copyright 2019 The Kubernetes Authors. // SPDX-License-Identifier: Apache-2.0 -//go:generate go run sigs.k8s.io/kustomize/cmd/pluginator +//go:generate go run sigs.k8s.io/kustomize/v3/cmd/pluginator package main import ( - "sigs.k8s.io/kustomize/pkg/ifc" - "sigs.k8s.io/kustomize/pkg/resmap" - "sigs.k8s.io/kustomize/pkg/types" + "sigs.k8s.io/kustomize/v3/pkg/ifc" + "sigs.k8s.io/kustomize/v3/pkg/resmap" + "sigs.k8s.io/kustomize/v3/pkg/types" "sigs.k8s.io/yaml" ) diff --git a/plugin/builtin/configmapgenerator/ConfigMapGenerator_test.go b/plugin/builtin/configmapgenerator/ConfigMapGenerator_test.go index 051499ddb..2848e1b50 100644 --- a/plugin/builtin/configmapgenerator/ConfigMapGenerator_test.go +++ b/plugin/builtin/configmapgenerator/ConfigMapGenerator_test.go @@ -6,12 +6,12 @@ package main_test import ( "testing" - "sigs.k8s.io/kustomize/pkg/kusttest" - "sigs.k8s.io/kustomize/plugin" + "sigs.k8s.io/kustomize/v3/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/pkg/plugins" ) func TestConfigMapGenerator(t *testing.T) { - tc := plugin.NewEnvForTest(t).Set() + tc := plugins.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildGoPlugin( diff --git a/plugin/builtin/hashtransformer/HashTransformer.go b/plugin/builtin/hashtransformer/HashTransformer.go index bb8231355..e77e515ff 100644 --- a/plugin/builtin/hashtransformer/HashTransformer.go +++ b/plugin/builtin/hashtransformer/HashTransformer.go @@ -1,14 +1,14 @@ // Copyright 2019 The Kubernetes Authors. // SPDX-License-Identifier: Apache-2.0 -//go:generate go run sigs.k8s.io/kustomize/cmd/pluginator +//go:generate go run sigs.k8s.io/kustomize/v3/cmd/pluginator package main import ( "fmt" - "sigs.k8s.io/kustomize/pkg/ifc" - "sigs.k8s.io/kustomize/pkg/resmap" + "sigs.k8s.io/kustomize/v3/pkg/ifc" + "sigs.k8s.io/kustomize/v3/pkg/resmap" ) type plugin struct { diff --git a/plugin/builtin/hashtransformer/HashTransformer_test.go b/plugin/builtin/hashtransformer/HashTransformer_test.go index fd209e7fb..7595520db 100644 --- a/plugin/builtin/hashtransformer/HashTransformer_test.go +++ b/plugin/builtin/hashtransformer/HashTransformer_test.go @@ -6,12 +6,12 @@ package main_test import ( "testing" - "sigs.k8s.io/kustomize/pkg/kusttest" - "sigs.k8s.io/kustomize/plugin" + "sigs.k8s.io/kustomize/v3/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/pkg/plugins" ) func TestHashTransformer(t *testing.T) { - tc := plugin.NewEnvForTest(t).Set() + tc := plugins.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildGoPlugin( diff --git a/plugin/builtin/imagetagtransformer/ImageTagTransformer.go b/plugin/builtin/imagetagtransformer/ImageTagTransformer.go index b3e46773d..4f8532ec4 100644 --- a/plugin/builtin/imagetagtransformer/ImageTagTransformer.go +++ b/plugin/builtin/imagetagtransformer/ImageTagTransformer.go @@ -1,7 +1,7 @@ // Copyright 2019 The Kubernetes Authors. // SPDX-License-Identifier: Apache-2.0 -//go:generate go run sigs.k8s.io/kustomize/cmd/pluginator +//go:generate go run sigs.k8s.io/kustomize/v3/cmd/pluginator package main import ( @@ -9,11 +9,11 @@ import ( "regexp" "strings" - "sigs.k8s.io/kustomize/pkg/ifc" - "sigs.k8s.io/kustomize/pkg/image" - "sigs.k8s.io/kustomize/pkg/resmap" - "sigs.k8s.io/kustomize/pkg/transformers" - "sigs.k8s.io/kustomize/pkg/transformers/config" + "sigs.k8s.io/kustomize/v3/pkg/ifc" + "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" "sigs.k8s.io/yaml" ) diff --git a/plugin/builtin/imagetagtransformer/ImageTagTransformer_test.go b/plugin/builtin/imagetagtransformer/ImageTagTransformer_test.go index afc7dbec3..cb895aa3f 100644 --- a/plugin/builtin/imagetagtransformer/ImageTagTransformer_test.go +++ b/plugin/builtin/imagetagtransformer/ImageTagTransformer_test.go @@ -6,12 +6,12 @@ package main_test import ( "testing" - "sigs.k8s.io/kustomize/pkg/kusttest" - "sigs.k8s.io/kustomize/plugin" + "sigs.k8s.io/kustomize/v3/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/pkg/plugins" ) func TestImageTagTransformer(t *testing.T) { - tc := plugin.NewEnvForTest(t).Set() + tc := plugins.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildGoPlugin( diff --git a/plugin/builtin/inventorytransformer/InventoryTransformer.go b/plugin/builtin/inventorytransformer/InventoryTransformer.go index d7af26b65..a5e0cb892 100644 --- a/plugin/builtin/inventorytransformer/InventoryTransformer.go +++ b/plugin/builtin/inventorytransformer/InventoryTransformer.go @@ -1,20 +1,20 @@ // Copyright 2019 The Kubernetes Authors. // SPDX-License-Identifier: Apache-2.0 -//go:generate go run sigs.k8s.io/kustomize/cmd/pluginator +//go:generate go run sigs.k8s.io/kustomize/v3/cmd/pluginator package main import ( "fmt" - "sigs.k8s.io/kustomize/pkg/resource" + "sigs.k8s.io/kustomize/v3/pkg/resource" - "sigs.k8s.io/kustomize/pkg/hasher" - "sigs.k8s.io/kustomize/pkg/ifc" - "sigs.k8s.io/kustomize/pkg/inventory" - "sigs.k8s.io/kustomize/pkg/resid" - "sigs.k8s.io/kustomize/pkg/resmap" - "sigs.k8s.io/kustomize/pkg/types" + "sigs.k8s.io/kustomize/v3/pkg/hasher" + "sigs.k8s.io/kustomize/v3/pkg/ifc" + "sigs.k8s.io/kustomize/v3/pkg/inventory" + "sigs.k8s.io/kustomize/v3/pkg/resid" + "sigs.k8s.io/kustomize/v3/pkg/resmap" + "sigs.k8s.io/kustomize/v3/pkg/types" "sigs.k8s.io/yaml" ) diff --git a/plugin/builtin/inventorytransformer/InventoryTransformer_test.go b/plugin/builtin/inventorytransformer/InventoryTransformer_test.go index 6510bc342..a73692e81 100644 --- a/plugin/builtin/inventorytransformer/InventoryTransformer_test.go +++ b/plugin/builtin/inventorytransformer/InventoryTransformer_test.go @@ -6,8 +6,8 @@ package main_test import ( "testing" - "sigs.k8s.io/kustomize/pkg/kusttest" - "sigs.k8s.io/kustomize/plugin" + "sigs.k8s.io/kustomize/v3/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/pkg/plugins" ) const ( @@ -59,7 +59,7 @@ metadata: ) func TestInventoryTransformerCollect(t *testing.T) { - tc := plugin.NewEnvForTest(t).Set() + tc := plugins.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildGoPlugin( @@ -81,7 +81,7 @@ namespace: default } func TestInventoryTransformerIgnore(t *testing.T) { - tc := plugin.NewEnvForTest(t).Set() + tc := plugins.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildGoPlugin( @@ -103,7 +103,7 @@ namespace: default } func TestInventoryTransformerDefaultPolicy(t *testing.T) { - tc := plugin.NewEnvForTest(t).Set() + tc := plugins.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildGoPlugin( diff --git a/plugin/builtin/labeltransformer/LabelTransformer.go b/plugin/builtin/labeltransformer/LabelTransformer.go index 804930d0c..655d263b0 100644 --- a/plugin/builtin/labeltransformer/LabelTransformer.go +++ b/plugin/builtin/labeltransformer/LabelTransformer.go @@ -1,14 +1,14 @@ // Copyright 2019 The Kubernetes Authors. // SPDX-License-Identifier: Apache-2.0 -//go:generate go run sigs.k8s.io/kustomize/cmd/pluginator +//go:generate go run sigs.k8s.io/kustomize/v3/cmd/pluginator package main import ( - "sigs.k8s.io/kustomize/pkg/ifc" - "sigs.k8s.io/kustomize/pkg/resmap" - "sigs.k8s.io/kustomize/pkg/transformers" - "sigs.k8s.io/kustomize/pkg/transformers/config" + "sigs.k8s.io/kustomize/v3/pkg/ifc" + "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" ) diff --git a/plugin/builtin/labeltransformer/LabelTransformer_test.go b/plugin/builtin/labeltransformer/LabelTransformer_test.go index 46339cf16..3f67a2ae4 100644 --- a/plugin/builtin/labeltransformer/LabelTransformer_test.go +++ b/plugin/builtin/labeltransformer/LabelTransformer_test.go @@ -6,12 +6,12 @@ package main_test import ( "testing" - "sigs.k8s.io/kustomize/pkg/kusttest" - "sigs.k8s.io/kustomize/plugin" + "sigs.k8s.io/kustomize/v3/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/pkg/plugins" ) func TestLabelTransformer(t *testing.T) { - tc := plugin.NewEnvForTest(t).Set() + tc := plugins.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildGoPlugin( diff --git a/plugin/builtin/legacyordertransformer/LegacyOrderTransformer.go b/plugin/builtin/legacyordertransformer/LegacyOrderTransformer.go index 6e0ec7184..ea2ff2ef9 100644 --- a/plugin/builtin/legacyordertransformer/LegacyOrderTransformer.go +++ b/plugin/builtin/legacyordertransformer/LegacyOrderTransformer.go @@ -1,14 +1,14 @@ // Copyright 2019 The Kubernetes Authors. // SPDX-License-Identifier: Apache-2.0 -//go:generate go run sigs.k8s.io/kustomize/cmd/pluginator +//go:generate go run sigs.k8s.io/kustomize/v3/cmd/pluginator package main import ( "github.com/pkg/errors" - "sigs.k8s.io/kustomize/pkg/ifc" - "sigs.k8s.io/kustomize/pkg/resmap" - "sigs.k8s.io/kustomize/pkg/resource" + "sigs.k8s.io/kustomize/v3/pkg/ifc" + "sigs.k8s.io/kustomize/v3/pkg/resmap" + "sigs.k8s.io/kustomize/v3/pkg/resource" "sort" ) diff --git a/plugin/builtin/legacyordertransformer/LegacyOrderTransformer_test.go b/plugin/builtin/legacyordertransformer/LegacyOrderTransformer_test.go index 680537653..e58a75089 100644 --- a/plugin/builtin/legacyordertransformer/LegacyOrderTransformer_test.go +++ b/plugin/builtin/legacyordertransformer/LegacyOrderTransformer_test.go @@ -6,12 +6,12 @@ package main_test import ( "testing" - "sigs.k8s.io/kustomize/pkg/kusttest" - "sigs.k8s.io/kustomize/plugin" + "sigs.k8s.io/kustomize/v3/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/pkg/plugins" ) func TestLegacyOrderTransformer(t *testing.T) { - tc := plugin.NewEnvForTest(t).Set() + tc := plugins.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildGoPlugin( diff --git a/plugin/builtin/namespacetransformer/NamespaceTransformer.go b/plugin/builtin/namespacetransformer/NamespaceTransformer.go index 99806adad..ff44bda6c 100644 --- a/plugin/builtin/namespacetransformer/NamespaceTransformer.go +++ b/plugin/builtin/namespacetransformer/NamespaceTransformer.go @@ -1,17 +1,17 @@ // Copyright 2019 The Kubernetes Authors. // SPDX-License-Identifier: Apache-2.0 -//go:generate go run sigs.k8s.io/kustomize/cmd/pluginator +//go:generate go run sigs.k8s.io/kustomize/v3/cmd/pluginator package main import ( - "sigs.k8s.io/kustomize/pkg/gvk" - "sigs.k8s.io/kustomize/pkg/ifc" - "sigs.k8s.io/kustomize/pkg/resid" - "sigs.k8s.io/kustomize/pkg/resmap" - "sigs.k8s.io/kustomize/pkg/resource" - "sigs.k8s.io/kustomize/pkg/transformers" - "sigs.k8s.io/kustomize/pkg/transformers/config" + "sigs.k8s.io/kustomize/v3/pkg/gvk" + "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/resource" + "sigs.k8s.io/kustomize/v3/pkg/transformers" + "sigs.k8s.io/kustomize/v3/pkg/transformers/config" "sigs.k8s.io/yaml" ) diff --git a/plugin/builtin/namespacetransformer/NamespaceTransformer_test.go b/plugin/builtin/namespacetransformer/NamespaceTransformer_test.go index 612c8dfd8..4aa1b608f 100644 --- a/plugin/builtin/namespacetransformer/NamespaceTransformer_test.go +++ b/plugin/builtin/namespacetransformer/NamespaceTransformer_test.go @@ -6,12 +6,12 @@ package main_test import ( "testing" - "sigs.k8s.io/kustomize/pkg/kusttest" - "sigs.k8s.io/kustomize/plugin" + "sigs.k8s.io/kustomize/v3/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/pkg/plugins" ) func TestNamespaceTransformer1(t *testing.T) { - tc := plugin.NewEnvForTest(t).Set() + tc := plugins.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildGoPlugin( @@ -131,7 +131,7 @@ metadata: } func TestNamespaceTransformerClusterLevelKinds(t *testing.T) { - tc := plugin.NewEnvForTest(t).Set() + tc := plugins.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildGoPlugin( diff --git a/plugin/builtin/patchjson6902transformer/PatchJson6902Transformer.go b/plugin/builtin/patchjson6902transformer/PatchJson6902Transformer.go index 24ea388ad..b22562980 100644 --- a/plugin/builtin/patchjson6902transformer/PatchJson6902Transformer.go +++ b/plugin/builtin/patchjson6902transformer/PatchJson6902Transformer.go @@ -1,14 +1,14 @@ // Copyright 2019 The Kubernetes Authors. // SPDX-License-Identifier: Apache-2.0 -//go:generate go run sigs.k8s.io/kustomize/cmd/pluginator +//go:generate go run sigs.k8s.io/kustomize/v3/cmd/pluginator package main import ( - "sigs.k8s.io/kustomize/pkg/ifc" - "sigs.k8s.io/kustomize/pkg/patch/transformer" - "sigs.k8s.io/kustomize/pkg/resmap" - "sigs.k8s.io/kustomize/pkg/types" + "sigs.k8s.io/kustomize/v3/pkg/ifc" + "sigs.k8s.io/kustomize/v3/pkg/patch/transformer" + "sigs.k8s.io/kustomize/v3/pkg/resmap" + "sigs.k8s.io/kustomize/v3/pkg/types" "sigs.k8s.io/yaml" ) diff --git a/plugin/builtin/patchjson6902transformer/PatchJson6902Transformer_test.go b/plugin/builtin/patchjson6902transformer/PatchJson6902Transformer_test.go index df5268817..8ebdba540 100644 --- a/plugin/builtin/patchjson6902transformer/PatchJson6902Transformer_test.go +++ b/plugin/builtin/patchjson6902transformer/PatchJson6902Transformer_test.go @@ -6,12 +6,12 @@ package main_test import ( "testing" - "sigs.k8s.io/kustomize/pkg/kusttest" - "sigs.k8s.io/kustomize/plugin" + "sigs.k8s.io/kustomize/v3/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/pkg/plugins" ) func TestPatchJson6902Transformer(t *testing.T) { - tc := plugin.NewEnvForTest(t).Set() + tc := plugins.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildGoPlugin( diff --git a/plugin/builtin/prefixsuffixtransformer/PrefixSuffixTransformer.go b/plugin/builtin/prefixsuffixtransformer/PrefixSuffixTransformer.go index 4e490ef45..20a9ac9ce 100644 --- a/plugin/builtin/prefixsuffixtransformer/PrefixSuffixTransformer.go +++ b/plugin/builtin/prefixsuffixtransformer/PrefixSuffixTransformer.go @@ -1,19 +1,19 @@ // Copyright 2019 The Kubernetes Authors. // SPDX-License-Identifier: Apache-2.0 -//go:generate go run sigs.k8s.io/kustomize/cmd/pluginator +//go:generate go run sigs.k8s.io/kustomize/v3/cmd/pluginator package main import ( "errors" "fmt" - "sigs.k8s.io/kustomize/pkg/gvk" - "sigs.k8s.io/kustomize/pkg/ifc" - "sigs.k8s.io/kustomize/pkg/resid" - "sigs.k8s.io/kustomize/pkg/resmap" - "sigs.k8s.io/kustomize/pkg/transformers" - "sigs.k8s.io/kustomize/pkg/transformers/config" + "sigs.k8s.io/kustomize/v3/pkg/gvk" + "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/transformers" + "sigs.k8s.io/kustomize/v3/pkg/transformers/config" "sigs.k8s.io/yaml" ) diff --git a/plugin/builtin/prefixsuffixtransformer/PrefixSuffixTransformer_test.go b/plugin/builtin/prefixsuffixtransformer/PrefixSuffixTransformer_test.go index a52f55b1f..2e9fe90b9 100644 --- a/plugin/builtin/prefixsuffixtransformer/PrefixSuffixTransformer_test.go +++ b/plugin/builtin/prefixsuffixtransformer/PrefixSuffixTransformer_test.go @@ -6,12 +6,12 @@ package main_test import ( "testing" - "sigs.k8s.io/kustomize/pkg/kusttest" - "sigs.k8s.io/kustomize/plugin" + "sigs.k8s.io/kustomize/v3/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/pkg/plugins" ) func TestPrefixSuffixTransformer(t *testing.T) { - tc := plugin.NewEnvForTest(t).Set() + tc := plugins.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildGoPlugin( @@ -67,7 +67,7 @@ metadata: name: baked-cm-pie `) - rm = th.LoadAndRunTransformer(` + rm = th.LoadAndRunTransformer(` apiVersion: builtin kind: PrefixSuffixTransformer metadata: diff --git a/plugin/builtin/replicacounttransformer/ReplicaCountTransformer.go b/plugin/builtin/replicacounttransformer/ReplicaCountTransformer.go index b03062399..50589b274 100644 --- a/plugin/builtin/replicacounttransformer/ReplicaCountTransformer.go +++ b/plugin/builtin/replicacounttransformer/ReplicaCountTransformer.go @@ -1,18 +1,18 @@ // Copyright 2019 The Kubernetes Authors. // SPDX-License-Identifier: Apache-2.0 -//go:generate go run sigs.k8s.io/kustomize/cmd/pluginator +//go:generate go run sigs.k8s.io/kustomize/v3/cmd/pluginator package main import ( "fmt" - "sigs.k8s.io/kustomize/pkg/ifc" - "sigs.k8s.io/kustomize/pkg/resid" - "sigs.k8s.io/kustomize/pkg/resmap" - "sigs.k8s.io/kustomize/pkg/transformers" - "sigs.k8s.io/kustomize/pkg/transformers/config" - "sigs.k8s.io/kustomize/pkg/types" + "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/transformers" + "sigs.k8s.io/kustomize/v3/pkg/transformers/config" + "sigs.k8s.io/kustomize/v3/pkg/types" "sigs.k8s.io/yaml" ) diff --git a/plugin/builtin/replicacounttransformer/ReplicaCountTransformer_test.go b/plugin/builtin/replicacounttransformer/ReplicaCountTransformer_test.go index 451b56e58..f7e947e58 100644 --- a/plugin/builtin/replicacounttransformer/ReplicaCountTransformer_test.go +++ b/plugin/builtin/replicacounttransformer/ReplicaCountTransformer_test.go @@ -6,12 +6,12 @@ package main_test import ( "testing" - "sigs.k8s.io/kustomize/pkg/kusttest" - "sigs.k8s.io/kustomize/plugin" + "sigs.k8s.io/kustomize/v3/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/pkg/plugins" ) func TestReplicaCountTransformer(t *testing.T) { - tc := plugin.NewEnvForTest(t).Set() + tc := plugins.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildGoPlugin( diff --git a/plugin/builtin/secretgenerator/SecretGenerator.go b/plugin/builtin/secretgenerator/SecretGenerator.go index 4512dc8ad..61c5b5020 100644 --- a/plugin/builtin/secretgenerator/SecretGenerator.go +++ b/plugin/builtin/secretgenerator/SecretGenerator.go @@ -1,13 +1,13 @@ // Copyright 2019 The Kubernetes Authors. // SPDX-License-Identifier: Apache-2.0 -//go:generate go run sigs.k8s.io/kustomize/cmd/pluginator +//go:generate go run sigs.k8s.io/kustomize/v3/cmd/pluginator package main import ( - "sigs.k8s.io/kustomize/pkg/ifc" - "sigs.k8s.io/kustomize/pkg/resmap" - "sigs.k8s.io/kustomize/pkg/types" + "sigs.k8s.io/kustomize/v3/pkg/ifc" + "sigs.k8s.io/kustomize/v3/pkg/resmap" + "sigs.k8s.io/kustomize/v3/pkg/types" "sigs.k8s.io/yaml" ) diff --git a/plugin/builtin/secretgenerator/SecretGenerator_test.go b/plugin/builtin/secretgenerator/SecretGenerator_test.go index fa603213f..78c450c90 100644 --- a/plugin/builtin/secretgenerator/SecretGenerator_test.go +++ b/plugin/builtin/secretgenerator/SecretGenerator_test.go @@ -6,12 +6,12 @@ package main_test import ( "testing" - "sigs.k8s.io/kustomize/pkg/kusttest" - "sigs.k8s.io/kustomize/plugin" + "sigs.k8s.io/kustomize/v3/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/pkg/plugins" ) func TestSecretGenerator(t *testing.T) { - tc := plugin.NewEnvForTest(t).Set() + tc := plugins.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildGoPlugin( diff --git a/plugin/doc.go b/plugin/doc.go index e79bfaaf8..e1733fb98 100644 --- a/plugin/doc.go +++ b/plugin/doc.go @@ -92,7 +92,7 @@ The kind is the CamelCase name of the plugin. The source for a builtin plugin must be at: repo=$GOPATH/src/sigs.k8s.io/kustomize - ${repo}/plugin/builtin/LOWERCASE(${kind})/${kind} + ${repo}/v3/plugin/builtin/LOWERCASE(${kind})/${kind} k8s wants 'kind' values to follow CamelCase, while Go style doesn't like but does allow such names. @@ -156,7 +156,7 @@ code, hence this program. TO GENERATE CODE repo=$GOPATH/src/sigs.k8s.io/kustomize - cd $repo/plugin/builtin + cd $repo/v3/plugin/builtin go generate ./... This creates @@ -168,7 +168,7 @@ etc. Generated plugins are used in kustomize via package whatever - import "sigs.k8s.io/kustomize/plugin/builtin + import "sigs.k8s.io/kustomize/v3/plugin/builtin ... g := builtin.NewSecretGenerator() g.Config(l, rf, k) diff --git a/plugin/generateBuiltins.sh b/plugin/generateBuiltins.sh index 4ab12eed5..d51d79e5f 100755 --- a/plugin/generateBuiltins.sh +++ b/plugin/generateBuiltins.sh @@ -3,7 +3,7 @@ # Generate the Go code for the generator and # transformer factory functions in # -# sigs.k8s.io/kustomize/plugin/builtin +# sigs.k8s.io/kustomize/v3/plugin/builtin # # from the raw plugin directories found _below_ # that directory. @@ -32,9 +32,9 @@ echo Generating linkable plugins... pushd $dir >& /dev/null GOPATH=$myGoPath go generate \ - sigs.k8s.io/kustomize/plugin/builtin/... + sigs.k8s.io/kustomize/v3/plugin/builtin/... GOPATH=$myGoPath go fmt \ - sigs.k8s.io/kustomize/plugin/builtin + sigs.k8s.io/kustomize/v3/plugin/builtin popd >& /dev/null diff --git a/plugin/someteam.example.com/v1/bashedconfigmap/BashedConfigMap_test.go b/plugin/someteam.example.com/v1/bashedconfigmap/BashedConfigMap_test.go index 486cada80..efacc7db0 100644 --- a/plugin/someteam.example.com/v1/bashedconfigmap/BashedConfigMap_test.go +++ b/plugin/someteam.example.com/v1/bashedconfigmap/BashedConfigMap_test.go @@ -6,12 +6,12 @@ package main_test import ( "testing" - "sigs.k8s.io/kustomize/pkg/kusttest" - "sigs.k8s.io/kustomize/plugin" + "sigs.k8s.io/kustomize/v3/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/pkg/plugins" ) func TestBashedConfigMapPlugin(t *testing.T) { - tc := plugin.NewEnvForTest(t).Set() + tc := plugins.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildExecPlugin( diff --git a/plugin/someteam.example.com/v1/chartinflator/ChartInflator_test.go b/plugin/someteam.example.com/v1/chartinflator/ChartInflator_test.go index f2dff3588..3dbaff303 100644 --- a/plugin/someteam.example.com/v1/chartinflator/ChartInflator_test.go +++ b/plugin/someteam.example.com/v1/chartinflator/ChartInflator_test.go @@ -10,8 +10,8 @@ package main_test import ( "testing" - "sigs.k8s.io/kustomize/pkg/kusttest" - "sigs.k8s.io/kustomize/plugin" + "sigs.k8s.io/kustomize/v3/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/pkg/plugins" ) // This test requires having the helm binary on the PATH. @@ -19,7 +19,7 @@ import ( // TODO: Download and inflate the chart, and check that // in for the test. func TestChartInflator(t *testing.T) { - tc := plugin.NewEnvForTest(t).Set() + tc := plugins.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildExecPlugin( diff --git a/plugin/someteam.example.com/v1/dateprefixer/DatePrefixer.go b/plugin/someteam.example.com/v1/dateprefixer/DatePrefixer.go index 7bc3bddaa..9088d48fc 100644 --- a/plugin/someteam.example.com/v1/dateprefixer/DatePrefixer.go +++ b/plugin/someteam.example.com/v1/dateprefixer/DatePrefixer.go @@ -5,11 +5,11 @@ package main import ( "github.com/pkg/errors" - "sigs.k8s.io/kustomize/pkg/ifc" - "sigs.k8s.io/kustomize/pkg/resmap" - "sigs.k8s.io/kustomize/pkg/transformers" - "sigs.k8s.io/kustomize/pkg/transformers/config" - "sigs.k8s.io/kustomize/plugin/builtin" + "sigs.k8s.io/kustomize/v3/pkg/ifc" + "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" ) diff --git a/plugin/someteam.example.com/v1/dateprefixer/DatePrefixer_test.go b/plugin/someteam.example.com/v1/dateprefixer/DatePrefixer_test.go index 9771d9812..8942da7df 100644 --- a/plugin/someteam.example.com/v1/dateprefixer/DatePrefixer_test.go +++ b/plugin/someteam.example.com/v1/dateprefixer/DatePrefixer_test.go @@ -6,12 +6,12 @@ package main_test import ( "testing" - "sigs.k8s.io/kustomize/pkg/kusttest" - "sigs.k8s.io/kustomize/plugin" + "sigs.k8s.io/kustomize/v3/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/pkg/plugins" ) func TestDatePrefixerPlugin(t *testing.T) { - tc := plugin.NewEnvForTest(t).Set() + tc := plugins.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildGoPlugin( diff --git a/plugin/someteam.example.com/v1/printworkdir/PrintWorkDir_test.go b/plugin/someteam.example.com/v1/printworkdir/PrintWorkDir_test.go index 64c2cfd5b..119ea120b 100644 --- a/plugin/someteam.example.com/v1/printworkdir/PrintWorkDir_test.go +++ b/plugin/someteam.example.com/v1/printworkdir/PrintWorkDir_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "sigs.k8s.io/kustomize/pkg/kusttest" - "sigs.k8s.io/kustomize/plugin" + "sigs.k8s.io/kustomize/v3/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/pkg/plugins" ) func shouldContain(t *testing.T, s []byte, x string) { @@ -18,7 +18,7 @@ func shouldContain(t *testing.T, s []byte, x string) { } func TestPrintWorkDirPlugin(t *testing.T) { - tc := plugin.NewEnvForTest(t).Set() + tc := plugins.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildExecPlugin( @@ -37,5 +37,5 @@ metadata: t.Error(err) } shouldContain(t, a, "path: /theAppRoot") - shouldContain(t, a, "sigs.k8s.io/kustomize/plugin/someteam.example.com/v1/printworkdir") + shouldContain(t, a, "plugin/someteam.example.com/v1/printworkdir") } diff --git a/plugin/someteam.example.com/v1/secretsfromdatabase/SecretsFromDatabase.go b/plugin/someteam.example.com/v1/secretsfromdatabase/SecretsFromDatabase.go index be5525d10..1c0320e94 100644 --- a/plugin/someteam.example.com/v1/secretsfromdatabase/SecretsFromDatabase.go +++ b/plugin/someteam.example.com/v1/secretsfromdatabase/SecretsFromDatabase.go @@ -4,9 +4,9 @@ package main import ( - "sigs.k8s.io/kustomize/pkg/ifc" - "sigs.k8s.io/kustomize/pkg/resmap" - "sigs.k8s.io/kustomize/pkg/types" + "sigs.k8s.io/kustomize/v3/pkg/ifc" + "sigs.k8s.io/kustomize/v3/pkg/resmap" + "sigs.k8s.io/kustomize/v3/pkg/types" "sigs.k8s.io/yaml" ) diff --git a/plugin/someteam.example.com/v1/secretsfromdatabase/SecretsFromDatabase_test.go b/plugin/someteam.example.com/v1/secretsfromdatabase/SecretsFromDatabase_test.go index 2a4c467cc..8d87bc4b9 100644 --- a/plugin/someteam.example.com/v1/secretsfromdatabase/SecretsFromDatabase_test.go +++ b/plugin/someteam.example.com/v1/secretsfromdatabase/SecretsFromDatabase_test.go @@ -6,12 +6,12 @@ package main_test import ( "testing" - "sigs.k8s.io/kustomize/pkg/kusttest" - "sigs.k8s.io/kustomize/plugin" + "sigs.k8s.io/kustomize/v3/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/pkg/plugins" ) func TestSecretsFromDatabasePlugin(t *testing.T) { - tc := plugin.NewEnvForTest(t).Set() + tc := plugins.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildGoPlugin( diff --git a/plugin/someteam.example.com/v1/sedtransformer/SedTransformer_test.go b/plugin/someteam.example.com/v1/sedtransformer/SedTransformer_test.go index 76ca03785..dcb6e3829 100644 --- a/plugin/someteam.example.com/v1/sedtransformer/SedTransformer_test.go +++ b/plugin/someteam.example.com/v1/sedtransformer/SedTransformer_test.go @@ -6,12 +6,12 @@ package main_test import ( "testing" - "sigs.k8s.io/kustomize/pkg/kusttest" - "sigs.k8s.io/kustomize/plugin" + "sigs.k8s.io/kustomize/v3/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/pkg/plugins" ) func TestSedTransformer(t *testing.T) { - tc := plugin.NewEnvForTest(t).Set() + tc := plugins.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildExecPlugin("someteam.example.com", "v1", "SedTransformer") diff --git a/plugin/someteam.example.com/v1/someservicegenerator/SomeServiceGenerator.go b/plugin/someteam.example.com/v1/someservicegenerator/SomeServiceGenerator.go index a5c9bc35c..362713cf2 100644 --- a/plugin/someteam.example.com/v1/someservicegenerator/SomeServiceGenerator.go +++ b/plugin/someteam.example.com/v1/someservicegenerator/SomeServiceGenerator.go @@ -7,8 +7,8 @@ import ( "bytes" "text/template" - "sigs.k8s.io/kustomize/pkg/ifc" - "sigs.k8s.io/kustomize/pkg/resmap" + "sigs.k8s.io/kustomize/v3/pkg/ifc" + "sigs.k8s.io/kustomize/v3/pkg/resmap" "sigs.k8s.io/yaml" ) diff --git a/plugin/someteam.example.com/v1/someservicegenerator/SomeServiceGenerator_test.go b/plugin/someteam.example.com/v1/someservicegenerator/SomeServiceGenerator_test.go index d68e2fe2f..91a0d0bba 100644 --- a/plugin/someteam.example.com/v1/someservicegenerator/SomeServiceGenerator_test.go +++ b/plugin/someteam.example.com/v1/someservicegenerator/SomeServiceGenerator_test.go @@ -6,12 +6,12 @@ package main_test import ( "testing" - "sigs.k8s.io/kustomize/pkg/kusttest" - "sigs.k8s.io/kustomize/plugin" + "sigs.k8s.io/kustomize/v3/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/pkg/plugins" ) func TestSomeServiceGeneratorPlugin(t *testing.T) { - tc := plugin.NewEnvForTest(t).Set() + tc := plugins.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildGoPlugin( diff --git a/plugin/someteam.example.com/v1/stringprefixer/StringPrefixer.go b/plugin/someteam.example.com/v1/stringprefixer/StringPrefixer.go index 8b0cefab4..ab8a669e1 100644 --- a/plugin/someteam.example.com/v1/stringprefixer/StringPrefixer.go +++ b/plugin/someteam.example.com/v1/stringprefixer/StringPrefixer.go @@ -5,11 +5,11 @@ package main import ( "github.com/pkg/errors" - "sigs.k8s.io/kustomize/pkg/ifc" - "sigs.k8s.io/kustomize/pkg/resmap" - "sigs.k8s.io/kustomize/pkg/transformers" - "sigs.k8s.io/kustomize/pkg/transformers/config" - "sigs.k8s.io/kustomize/plugin/builtin" + "sigs.k8s.io/kustomize/v3/pkg/ifc" + "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" ) diff --git a/plugin/someteam.example.com/v1/stringprefixer/StringPrefixer_test.go b/plugin/someteam.example.com/v1/stringprefixer/StringPrefixer_test.go index 687a0e142..612e95425 100644 --- a/plugin/someteam.example.com/v1/stringprefixer/StringPrefixer_test.go +++ b/plugin/someteam.example.com/v1/stringprefixer/StringPrefixer_test.go @@ -6,12 +6,12 @@ package main_test import ( "testing" - "sigs.k8s.io/kustomize/pkg/kusttest" - "sigs.k8s.io/kustomize/plugin" + "sigs.k8s.io/kustomize/v3/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/pkg/plugins" ) func TestStringPrefixerPlugin(t *testing.T) { - tc := plugin.NewEnvForTest(t).Set() + tc := plugins.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildGoPlugin( diff --git a/plugin/someteam.example.com/v1/validator/validator_test.go b/plugin/someteam.example.com/v1/validator/validator_test.go index c3cc89140..8b7d79eda 100644 --- a/plugin/someteam.example.com/v1/validator/validator_test.go +++ b/plugin/someteam.example.com/v1/validator/validator_test.go @@ -9,12 +9,12 @@ import ( "strings" "testing" - "sigs.k8s.io/kustomize/pkg/kusttest" - "sigs.k8s.io/kustomize/plugin" + "sigs.k8s.io/kustomize/v3/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/pkg/plugins" ) func TestValidatorHappy(t *testing.T) { - tc := plugin.NewEnvForTest(t).Set() + tc := plugins.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildExecPlugin("someteam.example.com", "v1", "Validator") @@ -49,7 +49,7 @@ metadata: } func TestValidatorUnHappy(t *testing.T) { - tc := plugin.NewEnvForTest(t).Set() + tc := plugins.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildExecPlugin("someteam.example.com", "v1", "Validator") diff --git a/travis/pre-commit.sh b/travis/pre-commit.sh index 09c7295e1..ba34d5723 100755 --- a/travis/pre-commit.sh +++ b/travis/pre-commit.sh @@ -35,14 +35,14 @@ function testGoTest { # These tests require the helm program, and at the moment # we're not asking travis to install helm. function testNoTravisGoTest { - go test -v sigs.k8s.io/kustomize/pkg/target \ + go test -v sigs.k8s.io/kustomize/v3/pkg/target \ -run TestChartInflatorPlugin -tags=notravis - go test -v sigs.k8s.io/kustomize/plugin/someteam.example.com/v1/chartinflator/... \ + go test -v sigs.k8s.io/kustomize/v3/plugin/someteam.example.com/v1/chartinflator/... \ -run TestChartInflator -tags=notravis mdrip --mode test --label helmtest README.md ./examples/chart.md - go test -v sigs.k8s.io/kustomize/plugin/someteam.example.com/v1/validator/... \ + go test -v sigs.k8s.io/kustomize/v3/plugin/someteam.example.com/v1/validator/... \ -run TestValidatorHappy -tags=notravis - go test -v sigs.k8s.io/kustomize/plugin/someteam.example.com/v1/validator/... \ + go test -v sigs.k8s.io/kustomize/v3/plugin/someteam.example.com/v1/validator/... \ -run TestValidatorUnHappy -tags=notravis }