diff --git a/kustomize/go.mod b/kustomize/go.mod index de7440a86..4a2b8d0d6 100644 --- a/kustomize/go.mod +++ b/kustomize/go.mod @@ -1,4 +1,4 @@ -module sigs.k8s.io/kustomize/kustomize +module sigs.k8s.io/kustomize/kustomize/v3 go 1.13 diff --git a/kustomize/go.sum b/kustomize/go.sum index 3b3d21229..0b9ad01f3 100644 --- a/kustomize/go.sum +++ b/kustomize/go.sum @@ -202,7 +202,6 @@ k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E= k8s.io/kube-openapi v0.0.0-20190918143330-0270cf2f1c1d h1:Xpe6sK+RY4ZgCTyZ3y273UmFmURhjtoJiwOMbQsXitY= k8s.io/kube-openapi v0.0.0-20190918143330-0270cf2f1c1d/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E= -sigs.k8s.io/kustomize v2.0.3+incompatible h1:JUufWFNlI44MdtnjUqVnvh29rR37PQFzPbLXqhyOyX0= sigs.k8s.io/kustomize/api v0.1.1 h1:W2dWXex2MhF4/EZNokZllvet2RejCHqdAFklufN7VTg= sigs.k8s.io/kustomize/api v0.1.1/go.mod h1:FyfJD1q1QMjC/TvK78b6cCtZB+mbpnGIo9YOvbucJes= sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI= diff --git a/kustomize/internal/commands/commands.go b/kustomize/internal/commands/commands.go index c24179199..796ef2484 100644 --- a/kustomize/internal/commands/commands.go +++ b/kustomize/internal/commands/commands.go @@ -16,11 +16,11 @@ import ( "sigs.k8s.io/kustomize/api/pgmconfig" "sigs.k8s.io/kustomize/api/resmap" "sigs.k8s.io/kustomize/api/resource" - "sigs.k8s.io/kustomize/kustomize/internal/commands/build" - "sigs.k8s.io/kustomize/kustomize/internal/commands/config" - "sigs.k8s.io/kustomize/kustomize/internal/commands/create" - "sigs.k8s.io/kustomize/kustomize/internal/commands/edit" - "sigs.k8s.io/kustomize/kustomize/internal/commands/version" + "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/build" + "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/config" + "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/create" + "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/edit" + "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/version" ) // NewDefaultCommand returns the default (aka root) command for kustomize command. diff --git a/kustomize/internal/commands/create/create.go b/kustomize/internal/commands/create/create.go index d00012b88..09d99e2d5 100644 --- a/kustomize/internal/commands/create/create.go +++ b/kustomize/internal/commands/create/create.go @@ -13,8 +13,8 @@ import ( "sigs.k8s.io/kustomize/api/filesys" "sigs.k8s.io/kustomize/api/ifc" "sigs.k8s.io/kustomize/api/pgmconfig" - "sigs.k8s.io/kustomize/kustomize/internal/commands/kustfile" - "sigs.k8s.io/kustomize/kustomize/internal/commands/util" + "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile" + "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/util" ) type createFlags struct { diff --git a/kustomize/internal/commands/create/create_test.go b/kustomize/internal/commands/create/create_test.go index 8bb210df1..e55992c2b 100644 --- a/kustomize/internal/commands/create/create_test.go +++ b/kustomize/internal/commands/create/create_test.go @@ -10,7 +10,7 @@ import ( "sigs.k8s.io/kustomize/api/filesys" "sigs.k8s.io/kustomize/api/k8sdeps/kunstruct" "sigs.k8s.io/kustomize/api/types" - "sigs.k8s.io/kustomize/kustomize/internal/commands/kustfile" + "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile" ) var factory = kunstruct.NewKunstructuredFactoryImpl() diff --git a/kustomize/internal/commands/edit/add/addbase.go b/kustomize/internal/commands/edit/add/addbase.go index 883b370be..65f2a5f4e 100644 --- a/kustomize/internal/commands/edit/add/addbase.go +++ b/kustomize/internal/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/internal/commands/kustfile" + "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile" ) type addBaseOptions struct { diff --git a/kustomize/internal/commands/edit/add/addbase_test.go b/kustomize/internal/commands/edit/add/addbase_test.go index aa2c6fa94..ad52fa5de 100644 --- a/kustomize/internal/commands/edit/add/addbase_test.go +++ b/kustomize/internal/commands/edit/add/addbase_test.go @@ -8,8 +8,8 @@ import ( "testing" "sigs.k8s.io/kustomize/api/filesys" - "sigs.k8s.io/kustomize/kustomize/internal/commands/kustfile" - testutils_test "sigs.k8s.io/kustomize/kustomize/internal/commands/testutils" + "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile" + testutils_test "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils" ) const ( diff --git a/kustomize/internal/commands/edit/add/addmetadata.go b/kustomize/internal/commands/edit/add/addmetadata.go index e4701840f..04a9fe7a7 100644 --- a/kustomize/internal/commands/edit/add/addmetadata.go +++ b/kustomize/internal/commands/edit/add/addmetadata.go @@ -10,8 +10,8 @@ import ( "sigs.k8s.io/kustomize/api/filesys" "sigs.k8s.io/kustomize/api/pgmconfig" "sigs.k8s.io/kustomize/api/types" - "sigs.k8s.io/kustomize/kustomize/internal/commands/kustfile" - "sigs.k8s.io/kustomize/kustomize/internal/commands/util" + "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile" + "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/util" ) // kindOfAdd is the kind of metadata being added: label or annotation diff --git a/kustomize/internal/commands/edit/add/addmetadata_test.go b/kustomize/internal/commands/edit/add/addmetadata_test.go index 3929cca11..691095b11 100644 --- a/kustomize/internal/commands/edit/add/addmetadata_test.go +++ b/kustomize/internal/commands/edit/add/addmetadata_test.go @@ -9,8 +9,8 @@ import ( "sigs.k8s.io/kustomize/api/filesys" valtest_test "sigs.k8s.io/kustomize/api/testutils/valtest" "sigs.k8s.io/kustomize/api/types" - "sigs.k8s.io/kustomize/kustomize/internal/commands/kustfile" - testutils_test "sigs.k8s.io/kustomize/kustomize/internal/commands/testutils" + "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile" + testutils_test "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils" ) func makeKustomization(t *testing.T) *types.Kustomization { diff --git a/kustomize/internal/commands/edit/add/addpatch.go b/kustomize/internal/commands/edit/add/addpatch.go index 617b0fb4a..c72f225c0 100644 --- a/kustomize/internal/commands/edit/add/addpatch.go +++ b/kustomize/internal/commands/edit/add/addpatch.go @@ -9,9 +9,9 @@ import ( "github.com/spf13/cobra" "sigs.k8s.io/kustomize/api/filesys" - "sigs.k8s.io/kustomize/kustomize/internal/commands/edit/patch" - "sigs.k8s.io/kustomize/kustomize/internal/commands/kustfile" - "sigs.k8s.io/kustomize/kustomize/internal/commands/util" + "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/edit/patch" + "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile" + "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/util" ) type addPatchOptions struct { diff --git a/kustomize/internal/commands/edit/add/addpatch_test.go b/kustomize/internal/commands/edit/add/addpatch_test.go index d63ca796f..b2666b027 100644 --- a/kustomize/internal/commands/edit/add/addpatch_test.go +++ b/kustomize/internal/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/internal/commands/testutils" + testutils_test "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils" ) const ( diff --git a/kustomize/internal/commands/edit/add/addresource.go b/kustomize/internal/commands/edit/add/addresource.go index c23be4992..a47d3a572 100644 --- a/kustomize/internal/commands/edit/add/addresource.go +++ b/kustomize/internal/commands/edit/add/addresource.go @@ -9,8 +9,8 @@ import ( "github.com/spf13/cobra" "sigs.k8s.io/kustomize/api/filesys" - "sigs.k8s.io/kustomize/kustomize/internal/commands/kustfile" - "sigs.k8s.io/kustomize/kustomize/internal/commands/util" + "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile" + "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/util" ) type addResourceOptions struct { diff --git a/kustomize/internal/commands/edit/add/addresource_test.go b/kustomize/internal/commands/edit/add/addresource_test.go index 014544aa5..d7f78cb5a 100644 --- a/kustomize/internal/commands/edit/add/addresource_test.go +++ b/kustomize/internal/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/internal/commands/testutils" + testutils_test "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils" ) const ( diff --git a/kustomize/internal/commands/edit/add/configmap.go b/kustomize/internal/commands/edit/add/configmap.go index 7ccd813a6..0d2606738 100644 --- a/kustomize/internal/commands/edit/add/configmap.go +++ b/kustomize/internal/commands/edit/add/configmap.go @@ -8,7 +8,7 @@ import ( "sigs.k8s.io/kustomize/api/filesys" "sigs.k8s.io/kustomize/api/ifc" "sigs.k8s.io/kustomize/api/types" - "sigs.k8s.io/kustomize/kustomize/internal/commands/kustfile" + "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile" ) // newCmdAddConfigMap returns a new command. diff --git a/kustomize/internal/commands/edit/add/flagsandargs.go b/kustomize/internal/commands/edit/add/flagsandargs.go index 15a7741de..659dd0039 100644 --- a/kustomize/internal/commands/edit/add/flagsandargs.go +++ b/kustomize/internal/commands/edit/add/flagsandargs.go @@ -8,7 +8,7 @@ import ( "strings" "sigs.k8s.io/kustomize/api/filesys" - "sigs.k8s.io/kustomize/kustomize/internal/commands/util" + "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/util" ) // flagsAndArgs encapsulates the options for add secret/configmap commands. diff --git a/kustomize/internal/commands/edit/add/secret.go b/kustomize/internal/commands/edit/add/secret.go index 6c3975f49..48566dae9 100644 --- a/kustomize/internal/commands/edit/add/secret.go +++ b/kustomize/internal/commands/edit/add/secret.go @@ -8,7 +8,7 @@ import ( "sigs.k8s.io/kustomize/api/filesys" "sigs.k8s.io/kustomize/api/ifc" "sigs.k8s.io/kustomize/api/types" - "sigs.k8s.io/kustomize/kustomize/internal/commands/kustfile" + "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile" ) // newCmdAddSecret returns a new command. diff --git a/kustomize/internal/commands/edit/all.go b/kustomize/internal/commands/edit/all.go index 2ec54e2de..72bc9f9df 100644 --- a/kustomize/internal/commands/edit/all.go +++ b/kustomize/internal/commands/edit/all.go @@ -9,10 +9,10 @@ import ( "sigs.k8s.io/kustomize/api/ifc" "sigs.k8s.io/kustomize/api/kv" "sigs.k8s.io/kustomize/api/loader" - "sigs.k8s.io/kustomize/kustomize/internal/commands/edit/add" - "sigs.k8s.io/kustomize/kustomize/internal/commands/edit/fix" - "sigs.k8s.io/kustomize/kustomize/internal/commands/edit/remove" - "sigs.k8s.io/kustomize/kustomize/internal/commands/edit/set" + "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/edit/add" + "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/edit/fix" + "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/edit/remove" + "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/edit/set" ) // NewCmdEdit returns an instance of 'edit' subcommand. diff --git a/kustomize/internal/commands/edit/fix/fix.go b/kustomize/internal/commands/edit/fix/fix.go index bb5fae066..13d9a3136 100644 --- a/kustomize/internal/commands/edit/fix/fix.go +++ b/kustomize/internal/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/internal/commands/kustfile" + "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile" ) // NewCmdFix returns an instance of 'fix' subcommand. diff --git a/kustomize/internal/commands/edit/fix/fix_test.go b/kustomize/internal/commands/edit/fix/fix_test.go index 3f2739c81..d0cd1b940 100644 --- a/kustomize/internal/commands/edit/fix/fix_test.go +++ b/kustomize/internal/commands/edit/fix/fix_test.go @@ -8,7 +8,7 @@ import ( "testing" "sigs.k8s.io/kustomize/api/filesys" - testutils_test "sigs.k8s.io/kustomize/kustomize/internal/commands/testutils" + testutils_test "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils" ) func TestFix(t *testing.T) { diff --git a/kustomize/internal/commands/edit/remove/removemetadata.go b/kustomize/internal/commands/edit/remove/removemetadata.go index 59af32c13..8b0a5fe7f 100644 --- a/kustomize/internal/commands/edit/remove/removemetadata.go +++ b/kustomize/internal/commands/edit/remove/removemetadata.go @@ -11,7 +11,7 @@ import ( "sigs.k8s.io/kustomize/api/filesys" "sigs.k8s.io/kustomize/api/pgmconfig" "sigs.k8s.io/kustomize/api/types" - "sigs.k8s.io/kustomize/kustomize/internal/commands/kustfile" + "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile" ) // kindOfAdd is the kind of metadata being added: label or annotation diff --git a/kustomize/internal/commands/edit/remove/removemetadata_test.go b/kustomize/internal/commands/edit/remove/removemetadata_test.go index 8f8a18d10..c0d968c5a 100644 --- a/kustomize/internal/commands/edit/remove/removemetadata_test.go +++ b/kustomize/internal/commands/edit/remove/removemetadata_test.go @@ -11,8 +11,8 @@ import ( "sigs.k8s.io/kustomize/api/filesys" valtest_test "sigs.k8s.io/kustomize/api/testutils/valtest" "sigs.k8s.io/kustomize/api/types" - "sigs.k8s.io/kustomize/kustomize/internal/commands/kustfile" - testutils_test "sigs.k8s.io/kustomize/kustomize/internal/commands/testutils" + "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile" + testutils_test "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils" ) func makeKustomizationFS() filesys.FileSystem { diff --git a/kustomize/internal/commands/edit/remove/removepatch.go b/kustomize/internal/commands/edit/remove/removepatch.go index 90c0c45b8..a2cfb598c 100644 --- a/kustomize/internal/commands/edit/remove/removepatch.go +++ b/kustomize/internal/commands/edit/remove/removepatch.go @@ -10,9 +10,9 @@ import ( "github.com/spf13/cobra" "sigs.k8s.io/kustomize/api/filesys" "sigs.k8s.io/kustomize/api/pgmconfig" - "sigs.k8s.io/kustomize/kustomize/internal/commands/edit/patch" - "sigs.k8s.io/kustomize/kustomize/internal/commands/kustfile" - "sigs.k8s.io/kustomize/kustomize/internal/commands/util" + "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/edit/patch" + "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile" + "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/util" ) type removePatchOptions struct { diff --git a/kustomize/internal/commands/edit/remove/removepatch_test.go b/kustomize/internal/commands/edit/remove/removepatch_test.go index 192e65b37..8a29d3b97 100644 --- a/kustomize/internal/commands/edit/remove/removepatch_test.go +++ b/kustomize/internal/commands/edit/remove/removepatch_test.go @@ -9,8 +9,8 @@ import ( "testing" "sigs.k8s.io/kustomize/api/filesys" - "sigs.k8s.io/kustomize/kustomize/internal/commands/edit/patch" - testutils_test "sigs.k8s.io/kustomize/kustomize/internal/commands/testutils" + "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/edit/patch" + testutils_test "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils" ) const ( diff --git a/kustomize/internal/commands/edit/remove/removeresource.go b/kustomize/internal/commands/edit/remove/removeresource.go index 243d680e3..1ce5fda97 100644 --- a/kustomize/internal/commands/edit/remove/removeresource.go +++ b/kustomize/internal/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/pgmconfig" - "sigs.k8s.io/kustomize/kustomize/internal/commands/kustfile" + "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile" ) type removeResourceOptions struct { diff --git a/kustomize/internal/commands/edit/remove/removeresource_test.go b/kustomize/internal/commands/edit/remove/removeresource_test.go index 855ce6bff..fd64305de 100644 --- a/kustomize/internal/commands/edit/remove/removeresource_test.go +++ b/kustomize/internal/commands/edit/remove/removeresource_test.go @@ -10,7 +10,7 @@ import ( "testing" "sigs.k8s.io/kustomize/api/filesys" - testutils_test "sigs.k8s.io/kustomize/kustomize/internal/commands/testutils" + testutils_test "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils" ) func TestRemoveResources(t *testing.T) { diff --git a/kustomize/internal/commands/edit/set/set_name_prefix.go b/kustomize/internal/commands/edit/set/set_name_prefix.go index 6cdfaa72d..b8aadb688 100644 --- a/kustomize/internal/commands/edit/set/set_name_prefix.go +++ b/kustomize/internal/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/internal/commands/kustfile" + "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile" ) type setNamePrefixOptions struct { diff --git a/kustomize/internal/commands/edit/set/set_name_prefix_test.go b/kustomize/internal/commands/edit/set/set_name_prefix_test.go index 3fc7f73a9..0690dae9e 100644 --- a/kustomize/internal/commands/edit/set/set_name_prefix_test.go +++ b/kustomize/internal/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/internal/commands/testutils" + testutils_test "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils" ) const ( diff --git a/kustomize/internal/commands/edit/set/set_name_suffix.go b/kustomize/internal/commands/edit/set/set_name_suffix.go index c2b97cf67..ec6d4a230 100644 --- a/kustomize/internal/commands/edit/set/set_name_suffix.go +++ b/kustomize/internal/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/internal/commands/kustfile" + "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile" ) type setNameSuffixOptions struct { diff --git a/kustomize/internal/commands/edit/set/set_name_suffix_test.go b/kustomize/internal/commands/edit/set/set_name_suffix_test.go index cbb7b4032..289532052 100644 --- a/kustomize/internal/commands/edit/set/set_name_suffix_test.go +++ b/kustomize/internal/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/internal/commands/testutils" + testutils_test "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils" ) const ( diff --git a/kustomize/internal/commands/edit/set/setimage.go b/kustomize/internal/commands/edit/set/setimage.go index 95ccd4621..d062f848d 100644 --- a/kustomize/internal/commands/edit/set/setimage.go +++ b/kustomize/internal/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/internal/commands/kustfile" + "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile" ) type setImageOptions struct { diff --git a/kustomize/internal/commands/edit/set/setimage_test.go b/kustomize/internal/commands/edit/set/setimage_test.go index c2aa51684..4c3515a6d 100644 --- a/kustomize/internal/commands/edit/set/setimage_test.go +++ b/kustomize/internal/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/internal/commands/testutils" + testutils_test "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils" ) func TestSetImage(t *testing.T) { diff --git a/kustomize/internal/commands/edit/set/setnamespace.go b/kustomize/internal/commands/edit/set/setnamespace.go index 508c49cce..823792a12 100644 --- a/kustomize/internal/commands/edit/set/setnamespace.go +++ b/kustomize/internal/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/internal/commands/kustfile" + "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile" ) type setNamespaceOptions struct { diff --git a/kustomize/internal/commands/edit/set/setnamespace_test.go b/kustomize/internal/commands/edit/set/setnamespace_test.go index 514c9dabd..2d1121867 100644 --- a/kustomize/internal/commands/edit/set/setnamespace_test.go +++ b/kustomize/internal/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/internal/commands/testutils" + testutils_test "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils" ) const ( diff --git a/kustomize/internal/commands/edit/set/setreplicas.go b/kustomize/internal/commands/edit/set/setreplicas.go index 2a118cf7d..ee0acbe73 100644 --- a/kustomize/internal/commands/edit/set/setreplicas.go +++ b/kustomize/internal/commands/edit/set/setreplicas.go @@ -12,7 +12,7 @@ import ( "github.com/spf13/cobra" "sigs.k8s.io/kustomize/api/filesys" "sigs.k8s.io/kustomize/api/types" - "sigs.k8s.io/kustomize/kustomize/internal/commands/kustfile" + "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile" ) type setReplicasOptions struct { diff --git a/kustomize/internal/commands/edit/set/setreplicas_test.go b/kustomize/internal/commands/edit/set/setreplicas_test.go index 42cfde5f8..00cc0375e 100644 --- a/kustomize/internal/commands/edit/set/setreplicas_test.go +++ b/kustomize/internal/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/internal/commands/testutils" + testutils_test "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils" ) func TestSetReplicas(t *testing.T) { diff --git a/kustomize/internal/commands/kustfile/kustomizationfile_test.go b/kustomize/internal/commands/kustfile/kustomizationfile_test.go index 05051198c..8f4cee4a6 100644 --- a/kustomize/internal/commands/kustfile/kustomizationfile_test.go +++ b/kustomize/internal/commands/kustfile/kustomizationfile_test.go @@ -11,7 +11,7 @@ import ( "sigs.k8s.io/kustomize/api/filesys" "sigs.k8s.io/kustomize/api/pgmconfig" "sigs.k8s.io/kustomize/api/types" - testutils_test "sigs.k8s.io/kustomize/kustomize/internal/commands/testutils" + testutils_test "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils" ) func TestFieldOrder(t *testing.T) { diff --git a/kustomize/main.go b/kustomize/main.go index 8dbbe23c4..1bec068fd 100644 --- a/kustomize/main.go +++ b/kustomize/main.go @@ -7,7 +7,7 @@ package main import ( "os" - "sigs.k8s.io/kustomize/kustomize/internal/commands" + "sigs.k8s.io/kustomize/kustomize/v3/internal/commands" ) func main() { diff --git a/releasing/README.md b/releasing/README.md index a141d070d..6647c6c32 100644 --- a/releasing/README.md +++ b/releasing/README.md @@ -38,8 +38,8 @@ files. #### Packages -There's only one package in this module. It's called `main`, -and it holds the _kustomize_ executable. +There's only one public package in this module. +It's called `main`, and it holds the _kustomize_ executable. #### Release artifacts @@ -113,6 +113,10 @@ The tag appears in the URL, e.g. [pluginator/v1.0.0]. ## Release procedure +> TODO: script this, e.g. `go run ./releasing/release.go kustomize minor` +> would look at the tags, bump the minor version, and +> create the right branch, tag, etc. No more bash please. + At any given moment, the repository's master branch is passing all its tests and contains code one could release. @@ -151,7 +155,7 @@ Go's [semver]-compatible version tags take the form `v{major}.{minor}.{patch}`: | major | minor | patch | | :---: | :---: | :---: | | API change | enhancements | bug fixes | -| manual update | OK to auto-update | OK to auto-update | +| manual update | maybe auto-update | auto-update encouraged | - If there are only bug fixes or refactors, increment `patch` from whatever it is now. - If there are new features, increment `minor`.