From 1c3832f897bcce4a4eee20d761134c2fbce71b18 Mon Sep 17 00:00:00 2001 From: monopole Date: Fri, 12 Feb 2021 13:26:41 -0800 Subject: [PATCH] Increment major version from v3 to v4 --- kustomize/commands/commands.go | 10 +++++----- kustomize/commands/create/create.go | 4 ++-- kustomize/commands/create/create_test.go | 2 +- kustomize/commands/edit/add/addbase.go | 2 +- kustomize/commands/edit/add/addbase_test.go | 4 ++-- kustomize/commands/edit/add/addcomponent.go | 4 ++-- kustomize/commands/edit/add/addcomponent_test.go | 2 +- kustomize/commands/edit/add/addmetadata.go | 4 ++-- kustomize/commands/edit/add/addmetadata_test.go | 4 ++-- kustomize/commands/edit/add/addpatch.go | 2 +- kustomize/commands/edit/add/addpatch_test.go | 2 +- kustomize/commands/edit/add/addresource.go | 4 ++-- kustomize/commands/edit/add/addresource_test.go | 2 +- kustomize/commands/edit/add/addtransformer.go | 4 ++-- kustomize/commands/edit/add/addtransformer_test.go | 4 ++-- kustomize/commands/edit/add/configmap.go | 2 +- kustomize/commands/edit/add/flagsandargs.go | 2 +- kustomize/commands/edit/add/secret.go | 2 +- kustomize/commands/edit/all.go | 10 +++++----- kustomize/commands/edit/fix/fix.go | 2 +- kustomize/commands/edit/fix/fix_test.go | 2 +- kustomize/commands/edit/remove/removemetadata.go | 2 +- kustomize/commands/edit/remove/removemetadata_test.go | 4 ++-- kustomize/commands/edit/remove/removepatch.go | 2 +- kustomize/commands/edit/remove/removepatch_test.go | 2 +- kustomize/commands/edit/remove/removeresource.go | 2 +- kustomize/commands/edit/remove/removeresource_test.go | 2 +- kustomize/commands/edit/remove/removetransformer.go | 2 +- .../commands/edit/remove/removetransformer_test.go | 2 +- kustomize/commands/edit/remove_test/removetest.go | 2 +- kustomize/commands/edit/set/set_name_prefix.go | 2 +- kustomize/commands/edit/set/set_name_prefix_test.go | 2 +- kustomize/commands/edit/set/set_name_suffix.go | 2 +- kustomize/commands/edit/set/set_name_suffix_test.go | 2 +- kustomize/commands/edit/set/setimage.go | 2 +- kustomize/commands/edit/set/setimage_test.go | 2 +- kustomize/commands/edit/set/setlabel.go | 4 ++-- kustomize/commands/edit/set/setlabel_test.go | 4 ++-- kustomize/commands/edit/set/setnamespace.go | 2 +- kustomize/commands/edit/set/setnamespace_test.go | 2 +- kustomize/commands/edit/set/setreplicas.go | 2 +- kustomize/commands/edit/set/setreplicas_test.go | 2 +- .../internal/kustfile/kustomizationfile_test.go | 2 +- kustomize/commands/openapi/openapi.go | 2 +- kustomize/go.mod | 2 +- kustomize/main.go | 2 +- 46 files changed, 65 insertions(+), 65 deletions(-) diff --git a/kustomize/commands/commands.go b/kustomize/commands/commands.go index 0a75f556b..944e26398 100644 --- a/kustomize/commands/commands.go +++ b/kustomize/commands/commands.go @@ -14,11 +14,11 @@ import ( "sigs.k8s.io/kustomize/api/provider" "sigs.k8s.io/kustomize/cmd/config/completion" "sigs.k8s.io/kustomize/cmd/config/configcobra" - "sigs.k8s.io/kustomize/kustomize/v3/commands/build" - "sigs.k8s.io/kustomize/kustomize/v3/commands/create" - "sigs.k8s.io/kustomize/kustomize/v3/commands/edit" - "sigs.k8s.io/kustomize/kustomize/v3/commands/openapi" - "sigs.k8s.io/kustomize/kustomize/v3/commands/version" + "sigs.k8s.io/kustomize/kustomize/v4/commands/build" + "sigs.k8s.io/kustomize/kustomize/v4/commands/create" + "sigs.k8s.io/kustomize/kustomize/v4/commands/edit" + "sigs.k8s.io/kustomize/kustomize/v4/commands/openapi" + "sigs.k8s.io/kustomize/kustomize/v4/commands/version" ) // NewDefaultCommand returns the default (aka root) command for kustomize command. diff --git a/kustomize/commands/create/create.go b/kustomize/commands/create/create.go index 6763f0871..2a6969e0b 100644 --- a/kustomize/commands/create/create.go +++ b/kustomize/commands/create/create.go @@ -14,8 +14,8 @@ import ( "sigs.k8s.io/kustomize/api/ifc" "sigs.k8s.io/kustomize/api/konfig" "sigs.k8s.io/kustomize/api/loader" - "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile" - "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/util" + "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile" + "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/util" ) type createFlags struct { diff --git a/kustomize/commands/create/create_test.go b/kustomize/commands/create/create_test.go index 4b9f05897..44af5592e 100644 --- a/kustomize/commands/create/create_test.go +++ b/kustomize/commands/create/create_test.go @@ -10,7 +10,7 @@ import ( "sigs.k8s.io/kustomize/api/filesys" "sigs.k8s.io/kustomize/api/provider" "sigs.k8s.io/kustomize/api/types" - "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile" + "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile" ) var factory = provider.NewDefaultDepProvider().GetKunstructuredFactory() diff --git a/kustomize/commands/edit/add/addbase.go b/kustomize/commands/edit/add/addbase.go index 486e7a1dc..3560dab9e 100644 --- a/kustomize/commands/edit/add/addbase.go +++ b/kustomize/commands/edit/add/addbase.go @@ -10,7 +10,7 @@ import ( "github.com/spf13/cobra" "sigs.k8s.io/kustomize/api/filesys" - "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile" + "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile" ) type addBaseOptions struct { diff --git a/kustomize/commands/edit/add/addbase_test.go b/kustomize/commands/edit/add/addbase_test.go index f4d31c1cb..b6808733f 100644 --- a/kustomize/commands/edit/add/addbase_test.go +++ b/kustomize/commands/edit/add/addbase_test.go @@ -8,8 +8,8 @@ import ( "testing" "sigs.k8s.io/kustomize/api/filesys" - "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile" - testutils_test "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/testutils" + "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile" + testutils_test "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/testutils" ) const ( diff --git a/kustomize/commands/edit/add/addcomponent.go b/kustomize/commands/edit/add/addcomponent.go index b287c6b86..beb78c40c 100644 --- a/kustomize/commands/edit/add/addcomponent.go +++ b/kustomize/commands/edit/add/addcomponent.go @@ -10,8 +10,8 @@ import ( "github.com/spf13/cobra" "sigs.k8s.io/kustomize/api/filesys" "sigs.k8s.io/kustomize/api/loader" - "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile" - "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/util" + "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile" + "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/util" ) type addComponentOptions struct { diff --git a/kustomize/commands/edit/add/addcomponent_test.go b/kustomize/commands/edit/add/addcomponent_test.go index de6e79724..5d3b3beec 100644 --- a/kustomize/commands/edit/add/addcomponent_test.go +++ b/kustomize/commands/edit/add/addcomponent_test.go @@ -8,7 +8,7 @@ import ( "testing" "sigs.k8s.io/kustomize/api/filesys" - testutils_test "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/testutils" + testutils_test "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/testutils" ) const ( diff --git a/kustomize/commands/edit/add/addmetadata.go b/kustomize/commands/edit/add/addmetadata.go index 275a8a9af..1c7f95cf8 100644 --- a/kustomize/commands/edit/add/addmetadata.go +++ b/kustomize/commands/edit/add/addmetadata.go @@ -10,8 +10,8 @@ import ( "sigs.k8s.io/kustomize/api/filesys" "sigs.k8s.io/kustomize/api/konfig" "sigs.k8s.io/kustomize/api/types" - "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile" - "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/util" + "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile" + "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/util" ) // kindOfAdd is the kind of metadata being added: label or annotation diff --git a/kustomize/commands/edit/add/addmetadata_test.go b/kustomize/commands/edit/add/addmetadata_test.go index f3fb632e8..fe0079221 100644 --- a/kustomize/commands/edit/add/addmetadata_test.go +++ b/kustomize/commands/edit/add/addmetadata_test.go @@ -10,8 +10,8 @@ import ( "sigs.k8s.io/kustomize/api/filesys" valtest_test "sigs.k8s.io/kustomize/api/testutils/valtest" "sigs.k8s.io/kustomize/api/types" - "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile" - testutils_test "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/testutils" + "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile" + testutils_test "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/testutils" ) func makeKustomization(t *testing.T) *types.Kustomization { diff --git a/kustomize/commands/edit/add/addpatch.go b/kustomize/commands/edit/add/addpatch.go index 9046f136e..76732779c 100644 --- a/kustomize/commands/edit/add/addpatch.go +++ b/kustomize/commands/edit/add/addpatch.go @@ -10,7 +10,7 @@ import ( "github.com/spf13/cobra" "sigs.k8s.io/kustomize/api/filesys" "sigs.k8s.io/kustomize/api/types" - "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile" + "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile" ) type addPatchOptions struct { diff --git a/kustomize/commands/edit/add/addpatch_test.go b/kustomize/commands/edit/add/addpatch_test.go index 4c7484510..6bb9d917d 100644 --- a/kustomize/commands/edit/add/addpatch_test.go +++ b/kustomize/commands/edit/add/addpatch_test.go @@ -8,7 +8,7 @@ import ( "testing" "sigs.k8s.io/kustomize/api/filesys" - testutils_test "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/testutils" + testutils_test "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/testutils" ) const ( diff --git a/kustomize/commands/edit/add/addresource.go b/kustomize/commands/edit/add/addresource.go index e9371005a..f38bdc35a 100644 --- a/kustomize/commands/edit/add/addresource.go +++ b/kustomize/commands/edit/add/addresource.go @@ -10,8 +10,8 @@ import ( "github.com/spf13/cobra" "sigs.k8s.io/kustomize/api/filesys" "sigs.k8s.io/kustomize/api/loader" - "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile" - "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/util" + "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile" + "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/util" ) type addResourceOptions struct { diff --git a/kustomize/commands/edit/add/addresource_test.go b/kustomize/commands/edit/add/addresource_test.go index 1adece02e..62f506054 100644 --- a/kustomize/commands/edit/add/addresource_test.go +++ b/kustomize/commands/edit/add/addresource_test.go @@ -8,7 +8,7 @@ import ( "testing" "sigs.k8s.io/kustomize/api/filesys" - testutils_test "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/testutils" + testutils_test "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/testutils" ) const ( diff --git a/kustomize/commands/edit/add/addtransformer.go b/kustomize/commands/edit/add/addtransformer.go index 48c5aed04..605f2f41a 100644 --- a/kustomize/commands/edit/add/addtransformer.go +++ b/kustomize/commands/edit/add/addtransformer.go @@ -9,8 +9,8 @@ import ( "github.com/spf13/cobra" "sigs.k8s.io/kustomize/api/filesys" - "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile" - "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/util" + "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile" + "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/util" ) type addTransformerOptions struct { diff --git a/kustomize/commands/edit/add/addtransformer_test.go b/kustomize/commands/edit/add/addtransformer_test.go index 05e3a7e38..bb3b249bc 100644 --- a/kustomize/commands/edit/add/addtransformer_test.go +++ b/kustomize/commands/edit/add/addtransformer_test.go @@ -9,8 +9,8 @@ import ( "testing" "sigs.k8s.io/kustomize/api/filesys" - "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile" - testutils_test "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/testutils" + "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile" + testutils_test "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/testutils" ) const ( diff --git a/kustomize/commands/edit/add/configmap.go b/kustomize/commands/edit/add/configmap.go index 778e57bc2..fa539ccbe 100644 --- a/kustomize/commands/edit/add/configmap.go +++ b/kustomize/commands/edit/add/configmap.go @@ -8,7 +8,7 @@ import ( "sigs.k8s.io/kustomize/api/filesys" "sigs.k8s.io/kustomize/api/ifc" "sigs.k8s.io/kustomize/api/types" - "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile" + "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile" ) // newCmdAddConfigMap returns a new command. diff --git a/kustomize/commands/edit/add/flagsandargs.go b/kustomize/commands/edit/add/flagsandargs.go index 93e4ec788..bd22666ba 100644 --- a/kustomize/commands/edit/add/flagsandargs.go +++ b/kustomize/commands/edit/add/flagsandargs.go @@ -10,7 +10,7 @@ import ( "sigs.k8s.io/kustomize/api/types" "sigs.k8s.io/kustomize/api/filesys" - "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/util" + "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/util" ) // flagsAndArgs encapsulates the options for add secret/configmap commands. diff --git a/kustomize/commands/edit/add/secret.go b/kustomize/commands/edit/add/secret.go index c38666665..1e4b41a5d 100644 --- a/kustomize/commands/edit/add/secret.go +++ b/kustomize/commands/edit/add/secret.go @@ -8,7 +8,7 @@ import ( "sigs.k8s.io/kustomize/api/filesys" "sigs.k8s.io/kustomize/api/ifc" "sigs.k8s.io/kustomize/api/types" - "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile" + "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile" ) // newCmdAddSecret returns a new command. diff --git a/kustomize/commands/edit/all.go b/kustomize/commands/edit/all.go index e86ab75c7..2f90a9272 100644 --- a/kustomize/commands/edit/all.go +++ b/kustomize/commands/edit/all.go @@ -9,11 +9,11 @@ import ( "sigs.k8s.io/kustomize/api/ifc" "sigs.k8s.io/kustomize/api/kv" "sigs.k8s.io/kustomize/api/loader" - "sigs.k8s.io/kustomize/kustomize/v3/commands/edit/add" - "sigs.k8s.io/kustomize/kustomize/v3/commands/edit/fix" - "sigs.k8s.io/kustomize/kustomize/v3/commands/edit/listbuiltin" - "sigs.k8s.io/kustomize/kustomize/v3/commands/edit/remove" - "sigs.k8s.io/kustomize/kustomize/v3/commands/edit/set" + "sigs.k8s.io/kustomize/kustomize/v4/commands/edit/add" + "sigs.k8s.io/kustomize/kustomize/v4/commands/edit/fix" + "sigs.k8s.io/kustomize/kustomize/v4/commands/edit/listbuiltin" + "sigs.k8s.io/kustomize/kustomize/v4/commands/edit/remove" + "sigs.k8s.io/kustomize/kustomize/v4/commands/edit/set" ) // NewCmdEdit returns an instance of 'edit' subcommand. diff --git a/kustomize/commands/edit/fix/fix.go b/kustomize/commands/edit/fix/fix.go index 941f3de13..11aef8a38 100644 --- a/kustomize/commands/edit/fix/fix.go +++ b/kustomize/commands/edit/fix/fix.go @@ -6,7 +6,7 @@ package fix import ( "github.com/spf13/cobra" "sigs.k8s.io/kustomize/api/filesys" - "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile" + "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile" ) // NewCmdFix returns an instance of 'fix' subcommand. diff --git a/kustomize/commands/edit/fix/fix_test.go b/kustomize/commands/edit/fix/fix_test.go index dabf88257..dda973cde 100644 --- a/kustomize/commands/edit/fix/fix_test.go +++ b/kustomize/commands/edit/fix/fix_test.go @@ -9,7 +9,7 @@ import ( "github.com/google/go-cmp/cmp" "sigs.k8s.io/kustomize/api/filesys" - testutils_test "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/testutils" + testutils_test "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/testutils" ) func TestFix(t *testing.T) { diff --git a/kustomize/commands/edit/remove/removemetadata.go b/kustomize/commands/edit/remove/removemetadata.go index 0a7721744..8a4eb463e 100644 --- a/kustomize/commands/edit/remove/removemetadata.go +++ b/kustomize/commands/edit/remove/removemetadata.go @@ -11,7 +11,7 @@ import ( "sigs.k8s.io/kustomize/api/filesys" "sigs.k8s.io/kustomize/api/konfig" "sigs.k8s.io/kustomize/api/types" - "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile" + "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile" ) // kindOfAdd is the kind of metadata being added: label or annotation diff --git a/kustomize/commands/edit/remove/removemetadata_test.go b/kustomize/commands/edit/remove/removemetadata_test.go index 5ed24b036..ff029ed7f 100644 --- a/kustomize/commands/edit/remove/removemetadata_test.go +++ b/kustomize/commands/edit/remove/removemetadata_test.go @@ -11,8 +11,8 @@ import ( "sigs.k8s.io/kustomize/api/filesys" valtest_test "sigs.k8s.io/kustomize/api/testutils/valtest" "sigs.k8s.io/kustomize/api/types" - "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile" - testutils_test "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/testutils" + "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile" + testutils_test "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/testutils" ) func makeKustomizationFS() filesys.FileSystem { diff --git a/kustomize/commands/edit/remove/removepatch.go b/kustomize/commands/edit/remove/removepatch.go index d5beadd80..f136d7d70 100644 --- a/kustomize/commands/edit/remove/removepatch.go +++ b/kustomize/commands/edit/remove/removepatch.go @@ -11,7 +11,7 @@ import ( "sigs.k8s.io/kustomize/api/filesys" "sigs.k8s.io/kustomize/api/konfig" "sigs.k8s.io/kustomize/api/types" - "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile" + "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile" ) type removePatchOptions struct { diff --git a/kustomize/commands/edit/remove/removepatch_test.go b/kustomize/commands/edit/remove/removepatch_test.go index 0dd4033dd..3c63edb2f 100644 --- a/kustomize/commands/edit/remove/removepatch_test.go +++ b/kustomize/commands/edit/remove/removepatch_test.go @@ -7,7 +7,7 @@ import ( "testing" "sigs.k8s.io/kustomize/api/filesys" - testutils_test "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/testutils" + testutils_test "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/testutils" ) const ( diff --git a/kustomize/commands/edit/remove/removeresource.go b/kustomize/commands/edit/remove/removeresource.go index 556c4486b..033445bb3 100644 --- a/kustomize/commands/edit/remove/removeresource.go +++ b/kustomize/commands/edit/remove/removeresource.go @@ -10,7 +10,7 @@ import ( "github.com/spf13/cobra" "sigs.k8s.io/kustomize/api/filesys" "sigs.k8s.io/kustomize/api/konfig" - "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile" + "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile" ) type removeResourceOptions struct { diff --git a/kustomize/commands/edit/remove/removeresource_test.go b/kustomize/commands/edit/remove/removeresource_test.go index 1085ae03b..370a1ced3 100644 --- a/kustomize/commands/edit/remove/removeresource_test.go +++ b/kustomize/commands/edit/remove/removeresource_test.go @@ -7,7 +7,7 @@ import ( "errors" "testing" - "sigs.k8s.io/kustomize/kustomize/v3/commands/edit/remove_test" + "sigs.k8s.io/kustomize/kustomize/v4/commands/edit/remove_test" ) func TestRemoveResources(t *testing.T) { diff --git a/kustomize/commands/edit/remove/removetransformer.go b/kustomize/commands/edit/remove/removetransformer.go index 53e126e2c..4327a86aa 100644 --- a/kustomize/commands/edit/remove/removetransformer.go +++ b/kustomize/commands/edit/remove/removetransformer.go @@ -9,7 +9,7 @@ import ( "github.com/spf13/cobra" "sigs.k8s.io/kustomize/api/filesys" "sigs.k8s.io/kustomize/api/konfig" - "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile" + "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile" ) type removeTransformerOptions struct { diff --git a/kustomize/commands/edit/remove/removetransformer_test.go b/kustomize/commands/edit/remove/removetransformer_test.go index ecb3a56a9..d12bb4629 100644 --- a/kustomize/commands/edit/remove/removetransformer_test.go +++ b/kustomize/commands/edit/remove/removetransformer_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/pkg/errors" - "sigs.k8s.io/kustomize/kustomize/v3/commands/edit/remove_test" + "sigs.k8s.io/kustomize/kustomize/v4/commands/edit/remove_test" ) func TestRemoveTransformer(t *testing.T) { diff --git a/kustomize/commands/edit/remove_test/removetest.go b/kustomize/commands/edit/remove_test/removetest.go index 3df18c884..8773db682 100644 --- a/kustomize/commands/edit/remove_test/removetest.go +++ b/kustomize/commands/edit/remove_test/removetest.go @@ -7,7 +7,7 @@ import ( "github.com/spf13/cobra" "sigs.k8s.io/kustomize/api/filesys" - testutils_test "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/testutils" + testutils_test "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/testutils" ) // Given represents the provided inputs for the test case. diff --git a/kustomize/commands/edit/set/set_name_prefix.go b/kustomize/commands/edit/set/set_name_prefix.go index f76a90f45..5920df0fd 100644 --- a/kustomize/commands/edit/set/set_name_prefix.go +++ b/kustomize/commands/edit/set/set_name_prefix.go @@ -8,7 +8,7 @@ import ( "github.com/spf13/cobra" "sigs.k8s.io/kustomize/api/filesys" - "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile" + "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile" ) type setNamePrefixOptions struct { diff --git a/kustomize/commands/edit/set/set_name_prefix_test.go b/kustomize/commands/edit/set/set_name_prefix_test.go index 37feeb9d4..d17209fbe 100644 --- a/kustomize/commands/edit/set/set_name_prefix_test.go +++ b/kustomize/commands/edit/set/set_name_prefix_test.go @@ -8,7 +8,7 @@ import ( "testing" "sigs.k8s.io/kustomize/api/filesys" - testutils_test "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/testutils" + testutils_test "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/testutils" ) const ( diff --git a/kustomize/commands/edit/set/set_name_suffix.go b/kustomize/commands/edit/set/set_name_suffix.go index d696ba662..ac92acf94 100644 --- a/kustomize/commands/edit/set/set_name_suffix.go +++ b/kustomize/commands/edit/set/set_name_suffix.go @@ -8,7 +8,7 @@ import ( "github.com/spf13/cobra" "sigs.k8s.io/kustomize/api/filesys" - "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile" + "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile" ) type setNameSuffixOptions struct { diff --git a/kustomize/commands/edit/set/set_name_suffix_test.go b/kustomize/commands/edit/set/set_name_suffix_test.go index e78d733b4..64fab4f79 100644 --- a/kustomize/commands/edit/set/set_name_suffix_test.go +++ b/kustomize/commands/edit/set/set_name_suffix_test.go @@ -8,7 +8,7 @@ import ( "testing" "sigs.k8s.io/kustomize/api/filesys" - testutils_test "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/testutils" + testutils_test "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/testutils" ) const ( diff --git a/kustomize/commands/edit/set/setimage.go b/kustomize/commands/edit/set/setimage.go index 9517d0d10..0aaf17aef 100644 --- a/kustomize/commands/edit/set/setimage.go +++ b/kustomize/commands/edit/set/setimage.go @@ -13,7 +13,7 @@ import ( "github.com/spf13/cobra" "sigs.k8s.io/kustomize/api/filesys" - "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile" + "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile" ) type setImageOptions struct { diff --git a/kustomize/commands/edit/set/setimage_test.go b/kustomize/commands/edit/set/setimage_test.go index 7eb121651..ea9ef599c 100644 --- a/kustomize/commands/edit/set/setimage_test.go +++ b/kustomize/commands/edit/set/setimage_test.go @@ -9,7 +9,7 @@ import ( "testing" "sigs.k8s.io/kustomize/api/filesys" - testutils_test "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/testutils" + testutils_test "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/testutils" ) func TestSetImage(t *testing.T) { diff --git a/kustomize/commands/edit/set/setlabel.go b/kustomize/commands/edit/set/setlabel.go index 2aaedb06f..6ad8d5202 100644 --- a/kustomize/commands/edit/set/setlabel.go +++ b/kustomize/commands/edit/set/setlabel.go @@ -10,8 +10,8 @@ import ( "sigs.k8s.io/kustomize/api/filesys" "sigs.k8s.io/kustomize/api/konfig" "sigs.k8s.io/kustomize/api/types" - "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile" - "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/util" + "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile" + "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/util" ) type setLabelOptions struct { diff --git a/kustomize/commands/edit/set/setlabel_test.go b/kustomize/commands/edit/set/setlabel_test.go index 3672a2d87..e0615e626 100644 --- a/kustomize/commands/edit/set/setlabel_test.go +++ b/kustomize/commands/edit/set/setlabel_test.go @@ -9,8 +9,8 @@ import ( "sigs.k8s.io/kustomize/api/filesys" valtest_test "sigs.k8s.io/kustomize/api/testutils/valtest" "sigs.k8s.io/kustomize/api/types" - "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile" - testutils_test "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/testutils" + "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile" + testutils_test "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/testutils" ) func makeKustomization(t *testing.T) *types.Kustomization { diff --git a/kustomize/commands/edit/set/setnamespace.go b/kustomize/commands/edit/set/setnamespace.go index e3a0f055b..756a9e3d0 100644 --- a/kustomize/commands/edit/set/setnamespace.go +++ b/kustomize/commands/edit/set/setnamespace.go @@ -11,7 +11,7 @@ import ( "github.com/spf13/cobra" "sigs.k8s.io/kustomize/api/filesys" "sigs.k8s.io/kustomize/api/ifc" - "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile" + "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile" ) type setNamespaceOptions struct { diff --git a/kustomize/commands/edit/set/setnamespace_test.go b/kustomize/commands/edit/set/setnamespace_test.go index bf1c64bae..cda1e7a7a 100644 --- a/kustomize/commands/edit/set/setnamespace_test.go +++ b/kustomize/commands/edit/set/setnamespace_test.go @@ -10,7 +10,7 @@ import ( "sigs.k8s.io/kustomize/api/filesys" valtest_test "sigs.k8s.io/kustomize/api/testutils/valtest" - testutils_test "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/testutils" + testutils_test "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/testutils" ) const ( diff --git a/kustomize/commands/edit/set/setreplicas.go b/kustomize/commands/edit/set/setreplicas.go index 86a5d4aef..1710f8b16 100644 --- a/kustomize/commands/edit/set/setreplicas.go +++ b/kustomize/commands/edit/set/setreplicas.go @@ -12,7 +12,7 @@ import ( "github.com/spf13/cobra" "sigs.k8s.io/kustomize/api/filesys" "sigs.k8s.io/kustomize/api/types" - "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile" + "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile" ) type setReplicasOptions struct { diff --git a/kustomize/commands/edit/set/setreplicas_test.go b/kustomize/commands/edit/set/setreplicas_test.go index 7208978d4..67d6e24d0 100644 --- a/kustomize/commands/edit/set/setreplicas_test.go +++ b/kustomize/commands/edit/set/setreplicas_test.go @@ -9,7 +9,7 @@ import ( "testing" "sigs.k8s.io/kustomize/api/filesys" - testutils_test "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/testutils" + testutils_test "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/testutils" ) func TestSetReplicas(t *testing.T) { diff --git a/kustomize/commands/internal/kustfile/kustomizationfile_test.go b/kustomize/commands/internal/kustfile/kustomizationfile_test.go index 6015235fc..ebd9a51e9 100644 --- a/kustomize/commands/internal/kustfile/kustomizationfile_test.go +++ b/kustomize/commands/internal/kustfile/kustomizationfile_test.go @@ -13,7 +13,7 @@ import ( "sigs.k8s.io/kustomize/api/filesys" "sigs.k8s.io/kustomize/api/konfig" "sigs.k8s.io/kustomize/api/types" - testutils_test "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/testutils" + testutils_test "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/testutils" ) func TestFieldOrder(t *testing.T) { diff --git a/kustomize/commands/openapi/openapi.go b/kustomize/commands/openapi/openapi.go index a699cc970..9bb713f4e 100644 --- a/kustomize/commands/openapi/openapi.go +++ b/kustomize/commands/openapi/openapi.go @@ -8,7 +8,7 @@ import ( "github.com/spf13/cobra" "sigs.k8s.io/kustomize/cmd/config/configcobra" - "sigs.k8s.io/kustomize/kustomize/v3/commands/openapi/info" + "sigs.k8s.io/kustomize/kustomize/v4/commands/openapi/info" ) // NewCmdOpenAPI makes a new openapi command. diff --git a/kustomize/go.mod b/kustomize/go.mod index 6cbc7eba8..6d85fe200 100644 --- a/kustomize/go.mod +++ b/kustomize/go.mod @@ -1,4 +1,4 @@ -module sigs.k8s.io/kustomize/kustomize/v3 +module sigs.k8s.io/kustomize/kustomize/v4 go 1.15 diff --git a/kustomize/main.go b/kustomize/main.go index b5f3f2aec..059fd2fbd 100644 --- a/kustomize/main.go +++ b/kustomize/main.go @@ -7,7 +7,7 @@ package main import ( "os" - "sigs.k8s.io/kustomize/kustomize/v3/commands" + "sigs.k8s.io/kustomize/kustomize/v4/commands" ) func main() {