From b0b3a705f45db52662d07516b419c9039a102aa3 Mon Sep 17 00:00:00 2001 From: Jeffrey Regan Date: Tue, 22 Oct 2019 13:07:48 -0700 Subject: [PATCH] Fix internal kustomize CLI deps --- kustomize/go.mod | 2 +- kustomize/go.sum | 1 + kustomize/internal/commands/commands.go | 10 +++++----- kustomize/internal/commands/create/create.go | 4 ++-- kustomize/internal/commands/create/create_test.go | 2 +- kustomize/internal/commands/edit/add/addbase.go | 2 +- kustomize/internal/commands/edit/add/addbase_test.go | 4 ++-- kustomize/internal/commands/edit/add/addmetadata.go | 4 ++-- .../internal/commands/edit/add/addmetadata_test.go | 10 +++++----- kustomize/internal/commands/edit/add/addpatch.go | 6 +++--- kustomize/internal/commands/edit/add/addpatch_test.go | 2 +- kustomize/internal/commands/edit/add/addresource.go | 4 ++-- .../internal/commands/edit/add/addresource_test.go | 2 +- kustomize/internal/commands/edit/add/configmap.go | 2 +- kustomize/internal/commands/edit/add/configmap_test.go | 2 +- kustomize/internal/commands/edit/add/flagsandargs.go | 2 +- kustomize/internal/commands/edit/add/secret.go | 2 +- kustomize/internal/commands/edit/add/secret_test.go | 2 +- kustomize/internal/commands/edit/all.go | 8 ++++---- kustomize/internal/commands/edit/fix/fix.go | 2 +- kustomize/internal/commands/edit/fix/fix_test.go | 2 +- .../internal/commands/edit/remove/removemetadata.go | 2 +- .../commands/edit/remove/removemetadata_test.go | 10 +++++----- kustomize/internal/commands/edit/remove/removepatch.go | 6 +++--- .../internal/commands/edit/remove/removepatch_test.go | 4 ++-- .../internal/commands/edit/remove/removeresource.go | 2 +- .../commands/edit/remove/removeresource_test.go | 2 +- .../internal/commands/edit/set/set_name_prefix.go | 2 +- .../internal/commands/edit/set/set_name_prefix_test.go | 2 +- .../internal/commands/edit/set/set_name_suffix.go | 2 +- .../internal/commands/edit/set/set_name_suffix_test.go | 2 +- kustomize/internal/commands/edit/set/setimage.go | 2 +- kustomize/internal/commands/edit/set/setimage_test.go | 2 +- kustomize/internal/commands/edit/set/setnamespace.go | 2 +- .../internal/commands/edit/set/setnamespace_test.go | 4 ++-- kustomize/internal/commands/edit/set/setreplicas.go | 2 +- .../internal/commands/edit/set/setreplicas_test.go | 2 +- .../commands/kustfile/kustomizationfile_test.go | 2 +- kustomize/main.go | 2 +- releasing/cloudbuild.sh | 4 +++- releasing/localbuild.sh | 2 +- 41 files changed, 68 insertions(+), 65 deletions(-) diff --git a/kustomize/go.mod b/kustomize/go.mod index 4a2b8d0d6..de7440a86 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 go 1.13 diff --git a/kustomize/go.sum b/kustomize/go.sum index 0b9ad01f3..3b3d21229 100644 --- a/kustomize/go.sum +++ b/kustomize/go.sum @@ -202,6 +202,7 @@ 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 796ef2484..c24179199 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/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" + "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" ) // 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 09d99e2d5..d00012b88 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/v3/internal/commands/kustfile" - "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/util" + "sigs.k8s.io/kustomize/kustomize/internal/commands/kustfile" + "sigs.k8s.io/kustomize/kustomize/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 e55992c2b..8bb210df1 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/v3/internal/commands/kustfile" + "sigs.k8s.io/kustomize/kustomize/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 01e4ef12e..883b370be 100644 --- a/kustomize/internal/commands/edit/add/addbase.go +++ b/kustomize/internal/commands/edit/add/addbase.go @@ -9,8 +9,8 @@ import ( "strings" "github.com/spf13/cobra" - "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile" "sigs.k8s.io/kustomize/api/filesys" + "sigs.k8s.io/kustomize/kustomize/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 4472fec4f..aa2c6fa94 100644 --- a/kustomize/internal/commands/edit/add/addbase_test.go +++ b/kustomize/internal/commands/edit/add/addbase_test.go @@ -7,9 +7,9 @@ import ( "strings" "testing" - "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile" - "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils" "sigs.k8s.io/kustomize/api/filesys" + "sigs.k8s.io/kustomize/kustomize/internal/commands/kustfile" + testutils_test "sigs.k8s.io/kustomize/kustomize/internal/commands/testutils" ) const ( diff --git a/kustomize/internal/commands/edit/add/addmetadata.go b/kustomize/internal/commands/edit/add/addmetadata.go index ce3a6cdba..e4701840f 100644 --- a/kustomize/internal/commands/edit/add/addmetadata.go +++ b/kustomize/internal/commands/edit/add/addmetadata.go @@ -7,11 +7,11 @@ import ( "fmt" "github.com/spf13/cobra" - "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile" - "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/util" "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" ) // 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 773bccb72..3929cca11 100644 --- a/kustomize/internal/commands/edit/add/addmetadata_test.go +++ b/kustomize/internal/commands/edit/add/addmetadata_test.go @@ -6,11 +6,11 @@ package add import ( "testing" - "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile" - "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils" "sigs.k8s.io/kustomize/api/filesys" - "sigs.k8s.io/kustomize/api/testutils/valtest" + 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" ) func makeKustomization(t *testing.T) *types.Kustomization { @@ -73,7 +73,7 @@ func TestAddAnnotationInvalidFormat(t *testing.T) { if err == nil { t.Errorf("expected an error") } - if err.Error() != validators.SAD { + if err.Error() != valtest_test.SAD { t.Errorf("incorrect error: %v", err.Error()) } } @@ -254,7 +254,7 @@ func TestAddLabelInvalidFormat(t *testing.T) { if err == nil { t.Errorf("expected an error") } - if err.Error() != validators.SAD { + if err.Error() != valtest_test.SAD { t.Errorf("incorrect error: %v", err.Error()) } } diff --git a/kustomize/internal/commands/edit/add/addpatch.go b/kustomize/internal/commands/edit/add/addpatch.go index 39266ea62..617b0fb4a 100644 --- a/kustomize/internal/commands/edit/add/addpatch.go +++ b/kustomize/internal/commands/edit/add/addpatch.go @@ -8,10 +8,10 @@ import ( "log" "github.com/spf13/cobra" - "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" "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" ) type addPatchOptions struct { diff --git a/kustomize/internal/commands/edit/add/addpatch_test.go b/kustomize/internal/commands/edit/add/addpatch_test.go index a6b5c78f6..d63ca796f 100644 --- a/kustomize/internal/commands/edit/add/addpatch_test.go +++ b/kustomize/internal/commands/edit/add/addpatch_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils" "sigs.k8s.io/kustomize/api/filesys" + testutils_test "sigs.k8s.io/kustomize/kustomize/internal/commands/testutils" ) const ( diff --git a/kustomize/internal/commands/edit/add/addresource.go b/kustomize/internal/commands/edit/add/addresource.go index 0d410571b..c23be4992 100644 --- a/kustomize/internal/commands/edit/add/addresource.go +++ b/kustomize/internal/commands/edit/add/addresource.go @@ -8,9 +8,9 @@ import ( "log" "github.com/spf13/cobra" - "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile" - "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/util" "sigs.k8s.io/kustomize/api/filesys" + "sigs.k8s.io/kustomize/kustomize/internal/commands/kustfile" + "sigs.k8s.io/kustomize/kustomize/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 8685bfd4b..014544aa5 100644 --- a/kustomize/internal/commands/edit/add/addresource_test.go +++ b/kustomize/internal/commands/edit/add/addresource_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils" "sigs.k8s.io/kustomize/api/filesys" + testutils_test "sigs.k8s.io/kustomize/kustomize/internal/commands/testutils" ) const ( diff --git a/kustomize/internal/commands/edit/add/configmap.go b/kustomize/internal/commands/edit/add/configmap.go index ef9dbbc9c..7ccd813a6 100644 --- a/kustomize/internal/commands/edit/add/configmap.go +++ b/kustomize/internal/commands/edit/add/configmap.go @@ -5,10 +5,10 @@ package add import ( "github.com/spf13/cobra" - "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile" "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" ) // newCmdAddConfigMap returns a new command. diff --git a/kustomize/internal/commands/edit/add/configmap_test.go b/kustomize/internal/commands/edit/add/configmap_test.go index 3d530c3e8..84ed55373 100644 --- a/kustomize/internal/commands/edit/add/configmap_test.go +++ b/kustomize/internal/commands/edit/add/configmap_test.go @@ -9,7 +9,7 @@ import ( "sigs.k8s.io/kustomize/api/filesys" "sigs.k8s.io/kustomize/api/kv" "sigs.k8s.io/kustomize/api/loader" - "sigs.k8s.io/kustomize/api/testutils/valtest" + valtest_test "sigs.k8s.io/kustomize/api/testutils/valtest" "sigs.k8s.io/kustomize/api/types" ) diff --git a/kustomize/internal/commands/edit/add/flagsandargs.go b/kustomize/internal/commands/edit/add/flagsandargs.go index 76195872e..15a7741de 100644 --- a/kustomize/internal/commands/edit/add/flagsandargs.go +++ b/kustomize/internal/commands/edit/add/flagsandargs.go @@ -7,8 +7,8 @@ import ( "fmt" "strings" - "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/util" "sigs.k8s.io/kustomize/api/filesys" + "sigs.k8s.io/kustomize/kustomize/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 a6c691426..6c3975f49 100644 --- a/kustomize/internal/commands/edit/add/secret.go +++ b/kustomize/internal/commands/edit/add/secret.go @@ -5,10 +5,10 @@ package add import ( "github.com/spf13/cobra" - "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile" "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" ) // newCmdAddSecret returns a new command. diff --git a/kustomize/internal/commands/edit/add/secret_test.go b/kustomize/internal/commands/edit/add/secret_test.go index 2ba49f470..2007bfa12 100644 --- a/kustomize/internal/commands/edit/add/secret_test.go +++ b/kustomize/internal/commands/edit/add/secret_test.go @@ -7,10 +7,10 @@ import ( "testing" "sigs.k8s.io/kustomize/api/kv" + valtest_test "sigs.k8s.io/kustomize/api/testutils/valtest" "sigs.k8s.io/kustomize/api/filesys" "sigs.k8s.io/kustomize/api/loader" - "sigs.k8s.io/kustomize/api/testutils/valtest" "sigs.k8s.io/kustomize/api/types" ) diff --git a/kustomize/internal/commands/edit/all.go b/kustomize/internal/commands/edit/all.go index 72bc9f9df..2ec54e2de 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/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" + "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" ) // 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 13d9a3136..bb5fae066 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/v3/internal/commands/kustfile" + "sigs.k8s.io/kustomize/kustomize/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 61e5787bd..3f2739c81 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" - "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils" + testutils_test "sigs.k8s.io/kustomize/kustomize/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 d82a072ed..59af32c13 100644 --- a/kustomize/internal/commands/edit/remove/removemetadata.go +++ b/kustomize/internal/commands/edit/remove/removemetadata.go @@ -8,10 +8,10 @@ import ( "strings" "github.com/spf13/cobra" - "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile" "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" ) // 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 f0504f85b..8f8a18d10 100644 --- a/kustomize/internal/commands/edit/remove/removemetadata_test.go +++ b/kustomize/internal/commands/edit/remove/removemetadata_test.go @@ -8,11 +8,11 @@ import ( "strings" "testing" - "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile" - "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils" "sigs.k8s.io/kustomize/api/filesys" - "sigs.k8s.io/kustomize/api/testutils/valtest" + 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" ) func makeKustomizationFS() filesys.FileSystem { @@ -147,7 +147,7 @@ func TestRemoveAnnotationInvalidFormat(t *testing.T) { if err == nil { t.Errorf("expected an error") } - if err.Error() != validators.SAD { + if err.Error() != valtest_test.SAD { t.Errorf("incorrect error: %v", err.Error()) } } @@ -295,7 +295,7 @@ func TestRemoveLabelInvalidFormat(t *testing.T) { if err == nil { t.Errorf("expected an error") } - if err.Error() != validators.SAD { + if err.Error() != valtest_test.SAD { t.Errorf("incorrect error: %v", err.Error()) } } diff --git a/kustomize/internal/commands/edit/remove/removepatch.go b/kustomize/internal/commands/edit/remove/removepatch.go index 06cb4232e..90c0c45b8 100644 --- a/kustomize/internal/commands/edit/remove/removepatch.go +++ b/kustomize/internal/commands/edit/remove/removepatch.go @@ -8,11 +8,11 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "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" "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" ) type removePatchOptions struct { diff --git a/kustomize/internal/commands/edit/remove/removepatch_test.go b/kustomize/internal/commands/edit/remove/removepatch_test.go index 93b37c8b7..192e65b37 100644 --- a/kustomize/internal/commands/edit/remove/removepatch_test.go +++ b/kustomize/internal/commands/edit/remove/removepatch_test.go @@ -8,9 +8,9 @@ import ( "strings" "testing" - "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/edit/patch" - "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils" "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" ) const ( diff --git a/kustomize/internal/commands/edit/remove/removeresource.go b/kustomize/internal/commands/edit/remove/removeresource.go index 61e70e769..243d680e3 100644 --- a/kustomize/internal/commands/edit/remove/removeresource.go +++ b/kustomize/internal/commands/edit/remove/removeresource.go @@ -8,9 +8,9 @@ import ( "path/filepath" "github.com/spf13/cobra" - "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile" "sigs.k8s.io/kustomize/api/filesys" "sigs.k8s.io/kustomize/api/pgmconfig" + "sigs.k8s.io/kustomize/kustomize/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 2abecd11f..855ce6bff 100644 --- a/kustomize/internal/commands/edit/remove/removeresource_test.go +++ b/kustomize/internal/commands/edit/remove/removeresource_test.go @@ -9,8 +9,8 @@ import ( "strings" "testing" - "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils" "sigs.k8s.io/kustomize/api/filesys" + testutils_test "sigs.k8s.io/kustomize/kustomize/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 b8aadb688..6cdfaa72d 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/v3/internal/commands/kustfile" + "sigs.k8s.io/kustomize/kustomize/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 3fd363733..3fc7f73a9 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" - "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils" + testutils_test "sigs.k8s.io/kustomize/kustomize/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 ec6d4a230..c2b97cf67 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/v3/internal/commands/kustfile" + "sigs.k8s.io/kustomize/kustomize/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 3fae1a3e5..cbb7b4032 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" - "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils" + testutils_test "sigs.k8s.io/kustomize/kustomize/internal/commands/testutils" ) const ( diff --git a/kustomize/internal/commands/edit/set/setimage.go b/kustomize/internal/commands/edit/set/setimage.go index d062f848d..95ccd4621 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/v3/internal/commands/kustfile" + "sigs.k8s.io/kustomize/kustomize/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 98f991342..c2aa51684 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" - "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils" + testutils_test "sigs.k8s.io/kustomize/kustomize/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 823792a12..508c49cce 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/v3/internal/commands/kustfile" + "sigs.k8s.io/kustomize/kustomize/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 5ee1e4662..514c9dabd 100644 --- a/kustomize/internal/commands/edit/set/setnamespace_test.go +++ b/kustomize/internal/commands/edit/set/setnamespace_test.go @@ -9,8 +9,8 @@ import ( "testing" "sigs.k8s.io/kustomize/api/filesys" - "sigs.k8s.io/kustomize/api/testutils/valtest" - "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils" + valtest_test "sigs.k8s.io/kustomize/api/testutils/valtest" + testutils_test "sigs.k8s.io/kustomize/kustomize/internal/commands/testutils" ) const ( diff --git a/kustomize/internal/commands/edit/set/setreplicas.go b/kustomize/internal/commands/edit/set/setreplicas.go index ee0acbe73..2a118cf7d 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/v3/internal/commands/kustfile" + "sigs.k8s.io/kustomize/kustomize/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 ed5bec7a0..42cfde5f8 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" - "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils" + testutils_test "sigs.k8s.io/kustomize/kustomize/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 721324d0f..05051198c 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" - "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils" + testutils_test "sigs.k8s.io/kustomize/kustomize/internal/commands/testutils" ) func TestFieldOrder(t *testing.T) { diff --git a/kustomize/main.go b/kustomize/main.go index 1bec068fd..8dbbe23c4 100644 --- a/kustomize/main.go +++ b/kustomize/main.go @@ -7,7 +7,7 @@ package main import ( "os" - "sigs.k8s.io/kustomize/kustomize/v3/internal/commands" + "sigs.k8s.io/kustomize/kustomize/internal/commands" ) func main() { diff --git a/releasing/cloudbuild.sh b/releasing/cloudbuild.sh index baad2b932..c6a87dd13 100755 --- a/releasing/cloudbuild.sh +++ b/releasing/cloudbuild.sh @@ -27,6 +27,8 @@ if [ "$module" != "$tModule" ]; then exit 1 fi +cd $module + configFile=$(mktemp) cat <$configFile project_name: $module @@ -48,7 +50,7 @@ release: owner: kubernetes-sigs name: kustomize builds: -- main: ./$module/main.go +- main: ./main.go ldflags: > -s -X sigs.k8s.io/kustomize/api/provenance.version={{.Version}} diff --git a/releasing/localbuild.sh b/releasing/localbuild.sh index 5b29bab36..b49eb0dbb 100755 --- a/releasing/localbuild.sh +++ b/releasing/localbuild.sh @@ -79,5 +79,5 @@ cloud-build-local \ echo " " echo "Result of local build:" echo "##########################################" -tree ./dist +tree ./$module/dist echo "##########################################"