diff --git a/Makefile b/Makefile index 3658d177f..591773813 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ # # Makefile for kustomize CLI and API. -LATEST_V4_RELEASE=v4.5.6 +LATEST_V4_RELEASE=v4.5.7 SHELL := /usr/bin/env bash GOOS = $(shell go env GOOS) diff --git a/README.md b/README.md index 86533559f..bcd439bf6 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,14 @@ This tool is sponsored by [sig-cli] ([KEP]). ## kubectl integration +To find the kustomize version embedded in recently version of kubectl, run `kubectl version`: + +```sh +> kubectl version --short --client +Client Version: v1.26.0 +Kustomize Version: v4.5.7 +``` + The kustomize build flow at [v2.0.3] was added to [kubectl v1.14][kubectl announcement]. The kustomize flow in kubectl remained frozen at v2.0.3 until kubectl v1.21, diff --git a/kustomize/commands/build/build_test.go b/kustomize/commands/build/build_test.go index c470c35b0..8a17a32a6 100644 --- a/kustomize/commands/build/build_test.go +++ b/kustomize/commands/build/build_test.go @@ -11,7 +11,7 @@ import ( "sigs.k8s.io/kustomize/api/konfig" "sigs.k8s.io/kustomize/api/provenance" - . "sigs.k8s.io/kustomize/kustomize/v4/commands/build" + . "sigs.k8s.io/kustomize/kustomize/v5/commands/build" "sigs.k8s.io/kustomize/kyaml/filesys" ) diff --git a/kustomize/commands/commands.go b/kustomize/commands/commands.go index 184da4e37..f312696d3 100644 --- a/kustomize/commands/commands.go +++ b/kustomize/commands/commands.go @@ -14,12 +14,12 @@ 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/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/localize" - "sigs.k8s.io/kustomize/kustomize/v4/commands/openapi" - "sigs.k8s.io/kustomize/kustomize/v4/commands/version" + "sigs.k8s.io/kustomize/kustomize/v5/commands/build" + "sigs.k8s.io/kustomize/kustomize/v5/commands/create" + "sigs.k8s.io/kustomize/kustomize/v5/commands/edit" + "sigs.k8s.io/kustomize/kustomize/v5/commands/localize" + "sigs.k8s.io/kustomize/kustomize/v5/commands/openapi" + "sigs.k8s.io/kustomize/kustomize/v5/commands/version" "sigs.k8s.io/kustomize/kyaml/filesys" ) diff --git a/kustomize/commands/create/create.go b/kustomize/commands/create/create.go index ad0b8e891..60cc9f4d3 100644 --- a/kustomize/commands/create/create.go +++ b/kustomize/commands/create/create.go @@ -13,8 +13,8 @@ import ( "sigs.k8s.io/kustomize/api/konfig" "sigs.k8s.io/kustomize/api/loader" "sigs.k8s.io/kustomize/api/resource" - "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile" - "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/util" + "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/kustfile" + "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/util" "sigs.k8s.io/kustomize/kyaml/filesys" ) diff --git a/kustomize/commands/create/create_test.go b/kustomize/commands/create/create_test.go index 7d869f4b7..ec695235a 100644 --- a/kustomize/commands/create/create_test.go +++ b/kustomize/commands/create/create_test.go @@ -9,7 +9,7 @@ import ( "sigs.k8s.io/kustomize/api/provider" "sigs.k8s.io/kustomize/api/types" - "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile" + "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/kustfile" "sigs.k8s.io/kustomize/kyaml/filesys" ) diff --git a/kustomize/commands/edit/add/addbase.go b/kustomize/commands/edit/add/addbase.go index d5835813a..01a422e5a 100644 --- a/kustomize/commands/edit/add/addbase.go +++ b/kustomize/commands/edit/add/addbase.go @@ -9,7 +9,7 @@ import ( "strings" "github.com/spf13/cobra" - "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile" + "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/kustfile" "sigs.k8s.io/kustomize/kyaml/filesys" ) diff --git a/kustomize/commands/edit/add/addbase_test.go b/kustomize/commands/edit/add/addbase_test.go index ecad29173..29452f716 100644 --- a/kustomize/commands/edit/add/addbase_test.go +++ b/kustomize/commands/edit/add/addbase_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile" - testutils_test "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/testutils" + "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/kustfile" + testutils_test "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/testutils" "sigs.k8s.io/kustomize/kyaml/filesys" ) diff --git a/kustomize/commands/edit/add/addbuildmetadata.go b/kustomize/commands/edit/add/addbuildmetadata.go index b37623842..e4aa86ca3 100644 --- a/kustomize/commands/edit/add/addbuildmetadata.go +++ b/kustomize/commands/edit/add/addbuildmetadata.go @@ -7,8 +7,8 @@ import ( "fmt" "github.com/spf13/cobra" - "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile" - "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/util" + "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/kustfile" + "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/util" "sigs.k8s.io/kustomize/kyaml/filesys" ) diff --git a/kustomize/commands/edit/add/addbuildmetadata_test.go b/kustomize/commands/edit/add/addbuildmetadata_test.go index 47d91471a..a3cedc7da 100644 --- a/kustomize/commands/edit/add/addbuildmetadata_test.go +++ b/kustomize/commands/edit/add/addbuildmetadata_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "sigs.k8s.io/kustomize/api/types" - testutils_test "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/testutils" + testutils_test "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/testutils" "sigs.k8s.io/kustomize/kyaml/filesys" ) diff --git a/kustomize/commands/edit/add/addcomponent.go b/kustomize/commands/edit/add/addcomponent.go index 553fff29a..946b38ae9 100644 --- a/kustomize/commands/edit/add/addcomponent.go +++ b/kustomize/commands/edit/add/addcomponent.go @@ -9,8 +9,8 @@ import ( "github.com/spf13/cobra" "sigs.k8s.io/kustomize/api/loader" - "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile" - "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/util" + "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/kustfile" + "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/util" "sigs.k8s.io/kustomize/kyaml/filesys" ) diff --git a/kustomize/commands/edit/add/addcomponent_test.go b/kustomize/commands/edit/add/addcomponent_test.go index fedd4d7da..e35486191 100644 --- a/kustomize/commands/edit/add/addcomponent_test.go +++ b/kustomize/commands/edit/add/addcomponent_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - testutils_test "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/testutils" + testutils_test "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/testutils" "sigs.k8s.io/kustomize/kyaml/filesys" ) diff --git a/kustomize/commands/edit/add/addgenerator.go b/kustomize/commands/edit/add/addgenerator.go index ae51536eb..ee475d1b4 100644 --- a/kustomize/commands/edit/add/addgenerator.go +++ b/kustomize/commands/edit/add/addgenerator.go @@ -8,8 +8,8 @@ import ( "log" "github.com/spf13/cobra" - "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile" - "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/util" + "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/kustfile" + "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/util" "sigs.k8s.io/kustomize/kyaml/filesys" ) diff --git a/kustomize/commands/edit/add/addgenerator_test.go b/kustomize/commands/edit/add/addgenerator_test.go index f2fba1b64..3f7f50f77 100644 --- a/kustomize/commands/edit/add/addgenerator_test.go +++ b/kustomize/commands/edit/add/addgenerator_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile" - testutils_test "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/testutils" + "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/kustfile" + testutils_test "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/testutils" "sigs.k8s.io/kustomize/kyaml/filesys" ) diff --git a/kustomize/commands/edit/add/addmetadata.go b/kustomize/commands/edit/add/addmetadata.go index a7483b48d..705f36dc1 100644 --- a/kustomize/commands/edit/add/addmetadata.go +++ b/kustomize/commands/edit/add/addmetadata.go @@ -9,8 +9,8 @@ import ( "github.com/spf13/cobra" "sigs.k8s.io/kustomize/api/konfig" "sigs.k8s.io/kustomize/api/types" - "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile" - "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/util" + "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/kustfile" + "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/util" "sigs.k8s.io/kustomize/kyaml/filesys" ) diff --git a/kustomize/commands/edit/add/addmetadata_test.go b/kustomize/commands/edit/add/addmetadata_test.go index 2c2c7980a..c0eb4cd3a 100644 --- a/kustomize/commands/edit/add/addmetadata_test.go +++ b/kustomize/commands/edit/add/addmetadata_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/require" valtest_test "sigs.k8s.io/kustomize/api/testutils/valtest" "sigs.k8s.io/kustomize/api/types" - "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile" - testutils_test "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/testutils" + "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/kustfile" + testutils_test "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/testutils" "sigs.k8s.io/kustomize/kyaml/filesys" ) diff --git a/kustomize/commands/edit/add/addpatch.go b/kustomize/commands/edit/add/addpatch.go index 1d0bd56c4..119040114 100644 --- a/kustomize/commands/edit/add/addpatch.go +++ b/kustomize/commands/edit/add/addpatch.go @@ -9,7 +9,7 @@ import ( "github.com/spf13/cobra" "sigs.k8s.io/kustomize/api/types" - "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile" + "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/kustfile" "sigs.k8s.io/kustomize/kyaml/filesys" ) diff --git a/kustomize/commands/edit/add/addpatch_test.go b/kustomize/commands/edit/add/addpatch_test.go index 5d9823b72..021b7fd18 100644 --- a/kustomize/commands/edit/add/addpatch_test.go +++ b/kustomize/commands/edit/add/addpatch_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - testutils_test "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/testutils" + testutils_test "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/testutils" "sigs.k8s.io/kustomize/kyaml/filesys" ) diff --git a/kustomize/commands/edit/add/addresource.go b/kustomize/commands/edit/add/addresource.go index c14d43dba..98e1adb28 100644 --- a/kustomize/commands/edit/add/addresource.go +++ b/kustomize/commands/edit/add/addresource.go @@ -9,8 +9,8 @@ import ( "github.com/spf13/cobra" "sigs.k8s.io/kustomize/api/loader" - "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile" - "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/util" + "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/kustfile" + "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/util" "sigs.k8s.io/kustomize/kyaml/filesys" ) diff --git a/kustomize/commands/edit/add/addresource_test.go b/kustomize/commands/edit/add/addresource_test.go index 5f70a83ae..d4a344185 100644 --- a/kustomize/commands/edit/add/addresource_test.go +++ b/kustomize/commands/edit/add/addresource_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - testutils_test "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/testutils" + testutils_test "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/testutils" "sigs.k8s.io/kustomize/kyaml/filesys" ) diff --git a/kustomize/commands/edit/add/addtransformer.go b/kustomize/commands/edit/add/addtransformer.go index a9c3fd792..288ee3f3e 100644 --- a/kustomize/commands/edit/add/addtransformer.go +++ b/kustomize/commands/edit/add/addtransformer.go @@ -8,8 +8,8 @@ import ( "log" "github.com/spf13/cobra" - "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile" - "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/util" + "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/kustfile" + "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/util" "sigs.k8s.io/kustomize/kyaml/filesys" ) diff --git a/kustomize/commands/edit/add/addtransformer_test.go b/kustomize/commands/edit/add/addtransformer_test.go index b24881c1a..489c5144b 100644 --- a/kustomize/commands/edit/add/addtransformer_test.go +++ b/kustomize/commands/edit/add/addtransformer_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile" - testutils_test "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/testutils" + "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/kustfile" + testutils_test "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/testutils" "sigs.k8s.io/kustomize/kyaml/filesys" ) diff --git a/kustomize/commands/edit/add/configmap.go b/kustomize/commands/edit/add/configmap.go index fff3a8514..16c0cc3fe 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/ifc" "sigs.k8s.io/kustomize/api/resource" "sigs.k8s.io/kustomize/api/types" - "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile" + "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/kustfile" "sigs.k8s.io/kustomize/kyaml/filesys" ) diff --git a/kustomize/commands/edit/add/flagsandargs.go b/kustomize/commands/edit/add/flagsandargs.go index 58b7b3007..03077e42c 100644 --- a/kustomize/commands/edit/add/flagsandargs.go +++ b/kustomize/commands/edit/add/flagsandargs.go @@ -9,7 +9,7 @@ import ( "sigs.k8s.io/kustomize/api/types" - "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/util" + "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/util" "sigs.k8s.io/kustomize/kyaml/filesys" ) diff --git a/kustomize/commands/edit/add/secret.go b/kustomize/commands/edit/add/secret.go index 95cb258aa..32172a8b6 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/ifc" "sigs.k8s.io/kustomize/api/resource" "sigs.k8s.io/kustomize/api/types" - "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile" + "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/kustfile" "sigs.k8s.io/kustomize/kyaml/filesys" ) diff --git a/kustomize/commands/edit/all.go b/kustomize/commands/edit/all.go index 56c4ebe67..fcb77fbd5 100644 --- a/kustomize/commands/edit/all.go +++ b/kustomize/commands/edit/all.go @@ -11,11 +11,11 @@ import ( "sigs.k8s.io/kustomize/api/kv" "sigs.k8s.io/kustomize/api/loader" "sigs.k8s.io/kustomize/api/resource" - "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" + "sigs.k8s.io/kustomize/kustomize/v5/commands/edit/add" + "sigs.k8s.io/kustomize/kustomize/v5/commands/edit/fix" + "sigs.k8s.io/kustomize/kustomize/v5/commands/edit/listbuiltin" + "sigs.k8s.io/kustomize/kustomize/v5/commands/edit/remove" + "sigs.k8s.io/kustomize/kustomize/v5/commands/edit/set" "sigs.k8s.io/kustomize/kyaml/filesys" ) diff --git a/kustomize/commands/edit/fix/convert_test.go b/kustomize/commands/edit/fix/convert_test.go index a851d2b4f..2472c5046 100644 --- a/kustomize/commands/edit/fix/convert_test.go +++ b/kustomize/commands/edit/fix/convert_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - testutils_test "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/testutils" + testutils_test "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/testutils" "sigs.k8s.io/kustomize/kyaml/filesys" ) diff --git a/kustomize/commands/edit/fix/fix.go b/kustomize/commands/edit/fix/fix.go index bae67811d..c261f20d9 100644 --- a/kustomize/commands/edit/fix/fix.go +++ b/kustomize/commands/edit/fix/fix.go @@ -11,8 +11,8 @@ import ( "github.com/spf13/cobra" "github.com/spf13/pflag" "sigs.k8s.io/kustomize/api/konfig" - "sigs.k8s.io/kustomize/kustomize/v4/commands/build" - "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile" + "sigs.k8s.io/kustomize/kustomize/v5/commands/build" + "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/kustfile" "sigs.k8s.io/kustomize/kyaml/filesys" ) diff --git a/kustomize/commands/edit/fix/fix_test.go b/kustomize/commands/edit/fix/fix_test.go index fc6cced28..a563fccb5 100644 --- a/kustomize/commands/edit/fix/fix_test.go +++ b/kustomize/commands/edit/fix/fix_test.go @@ -10,7 +10,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - testutils_test "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/testutils" + testutils_test "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/testutils" "sigs.k8s.io/kustomize/kyaml/filesys" ) diff --git a/kustomize/commands/edit/remove/removebuildmetadata.go b/kustomize/commands/edit/remove/removebuildmetadata.go index be918044d..de27de0a1 100644 --- a/kustomize/commands/edit/remove/removebuildmetadata.go +++ b/kustomize/commands/edit/remove/removebuildmetadata.go @@ -5,8 +5,8 @@ package remove import ( "github.com/spf13/cobra" - "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile" - "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/util" + "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/kustfile" + "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/util" "sigs.k8s.io/kustomize/kyaml/filesys" ) diff --git a/kustomize/commands/edit/remove/removebuildmetadata_test.go b/kustomize/commands/edit/remove/removebuildmetadata_test.go index 0de7f0b7b..07d6e055f 100644 --- a/kustomize/commands/edit/remove/removebuildmetadata_test.go +++ b/kustomize/commands/edit/remove/removebuildmetadata_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "sigs.k8s.io/kustomize/api/types" - testutils_test "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/testutils" + testutils_test "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/testutils" "sigs.k8s.io/kustomize/kyaml/filesys" ) diff --git a/kustomize/commands/edit/remove/removemetadata.go b/kustomize/commands/edit/remove/removemetadata.go index 6e1f6617a..3c34916fc 100644 --- a/kustomize/commands/edit/remove/removemetadata.go +++ b/kustomize/commands/edit/remove/removemetadata.go @@ -10,7 +10,7 @@ import ( "github.com/spf13/cobra" "sigs.k8s.io/kustomize/api/konfig" "sigs.k8s.io/kustomize/api/types" - "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile" + "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/kustfile" "sigs.k8s.io/kustomize/kyaml/filesys" ) diff --git a/kustomize/commands/edit/remove/removemetadata_test.go b/kustomize/commands/edit/remove/removemetadata_test.go index 53afe6129..469771b70 100644 --- a/kustomize/commands/edit/remove/removemetadata_test.go +++ b/kustomize/commands/edit/remove/removemetadata_test.go @@ -10,8 +10,8 @@ import ( valtest_test "sigs.k8s.io/kustomize/api/testutils/valtest" "sigs.k8s.io/kustomize/api/types" - "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile" - testutils_test "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/testutils" + "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/kustfile" + testutils_test "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/testutils" "sigs.k8s.io/kustomize/kyaml/filesys" ) diff --git a/kustomize/commands/edit/remove/removepatch.go b/kustomize/commands/edit/remove/removepatch.go index 202dd7e96..2919efd67 100644 --- a/kustomize/commands/edit/remove/removepatch.go +++ b/kustomize/commands/edit/remove/removepatch.go @@ -9,7 +9,7 @@ import ( "github.com/spf13/cobra" "sigs.k8s.io/kustomize/api/konfig" "sigs.k8s.io/kustomize/api/types" - "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile" + "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/kustfile" "sigs.k8s.io/kustomize/kyaml/errors" "sigs.k8s.io/kustomize/kyaml/filesys" ) diff --git a/kustomize/commands/edit/remove/removepatch_test.go b/kustomize/commands/edit/remove/removepatch_test.go index 7c2094220..7cce45306 100644 --- a/kustomize/commands/edit/remove/removepatch_test.go +++ b/kustomize/commands/edit/remove/removepatch_test.go @@ -6,7 +6,7 @@ package remove import ( "testing" - testutils_test "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/testutils" + testutils_test "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/testutils" "sigs.k8s.io/kustomize/kyaml/filesys" ) diff --git a/kustomize/commands/edit/remove/removeresource.go b/kustomize/commands/edit/remove/removeresource.go index 4a85356ef..fc76943d0 100644 --- a/kustomize/commands/edit/remove/removeresource.go +++ b/kustomize/commands/edit/remove/removeresource.go @@ -9,7 +9,7 @@ import ( "github.com/spf13/cobra" "sigs.k8s.io/kustomize/api/konfig" - "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile" + "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/kustfile" "sigs.k8s.io/kustomize/kyaml/filesys" ) diff --git a/kustomize/commands/edit/remove/removeresource_test.go b/kustomize/commands/edit/remove/removeresource_test.go index 370a1ced3..53ed176bf 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/v4/commands/edit/remove_test" + "sigs.k8s.io/kustomize/kustomize/v5/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 9f63dbd87..c8e188cec 100644 --- a/kustomize/commands/edit/remove/removetransformer.go +++ b/kustomize/commands/edit/remove/removetransformer.go @@ -8,7 +8,7 @@ import ( "github.com/spf13/cobra" "sigs.k8s.io/kustomize/api/konfig" - "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile" + "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/kustfile" "sigs.k8s.io/kustomize/kyaml/filesys" ) diff --git a/kustomize/commands/edit/remove/removetransformer_test.go b/kustomize/commands/edit/remove/removetransformer_test.go index 954b45b4f..7217bf91d 100644 --- a/kustomize/commands/edit/remove/removetransformer_test.go +++ b/kustomize/commands/edit/remove/removetransformer_test.go @@ -6,7 +6,7 @@ package remove import ( "testing" - "sigs.k8s.io/kustomize/kustomize/v4/commands/edit/remove_test" + "sigs.k8s.io/kustomize/kustomize/v5/commands/edit/remove_test" "sigs.k8s.io/kustomize/kyaml/errors" ) diff --git a/kustomize/commands/edit/remove_test/removetest.go b/kustomize/commands/edit/remove_test/removetest.go index d62085454..98075a263 100644 --- a/kustomize/commands/edit/remove_test/removetest.go +++ b/kustomize/commands/edit/remove_test/removetest.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/spf13/cobra" - testutils_test "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/testutils" + testutils_test "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/testutils" "sigs.k8s.io/kustomize/kyaml/filesys" ) diff --git a/kustomize/commands/edit/set/set_name_prefix.go b/kustomize/commands/edit/set/set_name_prefix.go index 1542649e6..e04a5f6f0 100644 --- a/kustomize/commands/edit/set/set_name_prefix.go +++ b/kustomize/commands/edit/set/set_name_prefix.go @@ -7,7 +7,7 @@ import ( "errors" "github.com/spf13/cobra" - "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile" + "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/kustfile" "sigs.k8s.io/kustomize/kyaml/filesys" ) diff --git a/kustomize/commands/edit/set/set_name_prefix_test.go b/kustomize/commands/edit/set/set_name_prefix_test.go index 1721334f2..4e89293b4 100644 --- a/kustomize/commands/edit/set/set_name_prefix_test.go +++ b/kustomize/commands/edit/set/set_name_prefix_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - testutils_test "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/testutils" + testutils_test "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/testutils" "sigs.k8s.io/kustomize/kyaml/filesys" ) diff --git a/kustomize/commands/edit/set/set_name_suffix.go b/kustomize/commands/edit/set/set_name_suffix.go index 018a90546..8d1173583 100644 --- a/kustomize/commands/edit/set/set_name_suffix.go +++ b/kustomize/commands/edit/set/set_name_suffix.go @@ -7,7 +7,7 @@ import ( "errors" "github.com/spf13/cobra" - "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile" + "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/kustfile" "sigs.k8s.io/kustomize/kyaml/filesys" ) diff --git a/kustomize/commands/edit/set/set_name_suffix_test.go b/kustomize/commands/edit/set/set_name_suffix_test.go index f47dc2464..28de92177 100644 --- a/kustomize/commands/edit/set/set_name_suffix_test.go +++ b/kustomize/commands/edit/set/set_name_suffix_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - testutils_test "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/testutils" + testutils_test "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/testutils" "sigs.k8s.io/kustomize/kyaml/filesys" ) diff --git a/kustomize/commands/edit/set/setannotation.go b/kustomize/commands/edit/set/setannotation.go index bd23edf52..3e4d36baf 100644 --- a/kustomize/commands/edit/set/setannotation.go +++ b/kustomize/commands/edit/set/setannotation.go @@ -11,8 +11,8 @@ import ( "github.com/spf13/cobra" "sigs.k8s.io/kustomize/api/konfig" "sigs.k8s.io/kustomize/api/types" - "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile" - "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/util" + "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/kustfile" + "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/util" "sigs.k8s.io/kustomize/kyaml/filesys" ) diff --git a/kustomize/commands/edit/set/setannotation_test.go b/kustomize/commands/edit/set/setannotation_test.go index 9b1a5d06f..d50005caa 100644 --- a/kustomize/commands/edit/set/setannotation_test.go +++ b/kustomize/commands/edit/set/setannotation_test.go @@ -8,8 +8,8 @@ import ( valtest_test "sigs.k8s.io/kustomize/api/testutils/valtest" "sigs.k8s.io/kustomize/api/types" - "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile" - testutils_test "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/testutils" + "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/kustfile" + testutils_test "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/testutils" "sigs.k8s.io/kustomize/kyaml/filesys" ) diff --git a/kustomize/commands/edit/set/setbuildmetadata.go b/kustomize/commands/edit/set/setbuildmetadata.go index 43a7cc1ea..c016bb26a 100644 --- a/kustomize/commands/edit/set/setbuildmetadata.go +++ b/kustomize/commands/edit/set/setbuildmetadata.go @@ -5,8 +5,8 @@ package set import ( "github.com/spf13/cobra" - "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile" - "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/util" + "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/kustfile" + "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/util" "sigs.k8s.io/kustomize/kyaml/filesys" ) diff --git a/kustomize/commands/edit/set/setbuildmetadata_test.go b/kustomize/commands/edit/set/setbuildmetadata_test.go index 9802b189c..4c71c48b2 100644 --- a/kustomize/commands/edit/set/setbuildmetadata_test.go +++ b/kustomize/commands/edit/set/setbuildmetadata_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" "sigs.k8s.io/kustomize/api/types" - "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile" - testutils_test "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/testutils" + "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/kustfile" + testutils_test "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/testutils" "sigs.k8s.io/kustomize/kyaml/filesys" ) diff --git a/kustomize/commands/edit/set/setimage.go b/kustomize/commands/edit/set/setimage.go index e68d7b191..f03501dcf 100644 --- a/kustomize/commands/edit/set/setimage.go +++ b/kustomize/commands/edit/set/setimage.go @@ -12,7 +12,7 @@ import ( "sigs.k8s.io/kustomize/api/types" "github.com/spf13/cobra" - "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile" + "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/kustfile" "sigs.k8s.io/kustomize/kyaml/filesys" ) diff --git a/kustomize/commands/edit/set/setimage_test.go b/kustomize/commands/edit/set/setimage_test.go index 9dce4e45d..ad2ff1f6d 100644 --- a/kustomize/commands/edit/set/setimage_test.go +++ b/kustomize/commands/edit/set/setimage_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - testutils_test "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/testutils" + testutils_test "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/testutils" "sigs.k8s.io/kustomize/kyaml/filesys" ) diff --git a/kustomize/commands/edit/set/setlabel.go b/kustomize/commands/edit/set/setlabel.go index 3fa41ee66..0d2c6c2c8 100644 --- a/kustomize/commands/edit/set/setlabel.go +++ b/kustomize/commands/edit/set/setlabel.go @@ -9,8 +9,8 @@ import ( "github.com/spf13/cobra" "sigs.k8s.io/kustomize/api/konfig" "sigs.k8s.io/kustomize/api/types" - "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile" - "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/util" + "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/kustfile" + "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/util" "sigs.k8s.io/kustomize/kyaml/filesys" ) diff --git a/kustomize/commands/edit/set/setlabel_test.go b/kustomize/commands/edit/set/setlabel_test.go index 1c755b3cf..b1a3facf6 100644 --- a/kustomize/commands/edit/set/setlabel_test.go +++ b/kustomize/commands/edit/set/setlabel_test.go @@ -8,8 +8,8 @@ import ( valtest_test "sigs.k8s.io/kustomize/api/testutils/valtest" "sigs.k8s.io/kustomize/api/types" - "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile" - testutils_test "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/testutils" + "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/kustfile" + testutils_test "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/testutils" "sigs.k8s.io/kustomize/kyaml/filesys" ) diff --git a/kustomize/commands/edit/set/setnamespace.go b/kustomize/commands/edit/set/setnamespace.go index 0da231429..80f1dd33e 100644 --- a/kustomize/commands/edit/set/setnamespace.go +++ b/kustomize/commands/edit/set/setnamespace.go @@ -10,7 +10,7 @@ import ( "github.com/spf13/cobra" "sigs.k8s.io/kustomize/api/ifc" - "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile" + "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/kustfile" "sigs.k8s.io/kustomize/kyaml/filesys" ) diff --git a/kustomize/commands/edit/set/setnamespace_test.go b/kustomize/commands/edit/set/setnamespace_test.go index 5dccbab29..002ed4063 100644 --- a/kustomize/commands/edit/set/setnamespace_test.go +++ b/kustomize/commands/edit/set/setnamespace_test.go @@ -9,7 +9,7 @@ import ( "testing" valtest_test "sigs.k8s.io/kustomize/api/testutils/valtest" - testutils_test "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/testutils" + testutils_test "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/testutils" "sigs.k8s.io/kustomize/kyaml/filesys" ) diff --git a/kustomize/commands/edit/set/setreplicas.go b/kustomize/commands/edit/set/setreplicas.go index 695f19ad2..fc2019b10 100644 --- a/kustomize/commands/edit/set/setreplicas.go +++ b/kustomize/commands/edit/set/setreplicas.go @@ -11,7 +11,7 @@ import ( "github.com/spf13/cobra" "sigs.k8s.io/kustomize/api/types" - "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile" + "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/kustfile" "sigs.k8s.io/kustomize/kyaml/filesys" ) diff --git a/kustomize/commands/edit/set/setreplicas_test.go b/kustomize/commands/edit/set/setreplicas_test.go index a7d00fdb0..216564749 100644 --- a/kustomize/commands/edit/set/setreplicas_test.go +++ b/kustomize/commands/edit/set/setreplicas_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - testutils_test "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/testutils" + testutils_test "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/testutils" "sigs.k8s.io/kustomize/kyaml/filesys" ) diff --git a/kustomize/commands/internal/kustfile/kustomizationfile_test.go b/kustomize/commands/internal/kustfile/kustomizationfile_test.go index 7029aaf6f..3b0ff6db8 100644 --- a/kustomize/commands/internal/kustfile/kustomizationfile_test.go +++ b/kustomize/commands/internal/kustfile/kustomizationfile_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/require" "sigs.k8s.io/kustomize/api/konfig" "sigs.k8s.io/kustomize/api/types" - testutils_test "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/testutils" + testutils_test "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/testutils" "sigs.k8s.io/kustomize/kyaml/filesys" ) diff --git a/kustomize/commands/internal/util/validate.go b/kustomize/commands/internal/util/validate.go index 2c4538167..bf041b50f 100644 --- a/kustomize/commands/internal/util/validate.go +++ b/kustomize/commands/internal/util/validate.go @@ -9,7 +9,7 @@ import ( "strings" "sigs.k8s.io/kustomize/api/types" - "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile" + "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/kustfile" ) type BuildMetadataValidator struct{} diff --git a/kustomize/commands/localize/localize_test.go b/kustomize/commands/localize/localize_test.go index 7e43093e7..acb53232d 100644 --- a/kustomize/commands/localize/localize_test.go +++ b/kustomize/commands/localize/localize_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/require" loctest "sigs.k8s.io/kustomize/api/testutils/localizertest" - "sigs.k8s.io/kustomize/kustomize/v4/commands/localize" + "sigs.k8s.io/kustomize/kustomize/v5/commands/localize" ) const deployment = `apiVersion: apps/v1 diff --git a/kustomize/commands/openapi/openapi.go b/kustomize/commands/openapi/openapi.go index 4fdcad882..5c8209dd5 100644 --- a/kustomize/commands/openapi/openapi.go +++ b/kustomize/commands/openapi/openapi.go @@ -7,8 +7,8 @@ import ( "io" "github.com/spf13/cobra" - "sigs.k8s.io/kustomize/kustomize/v4/commands/openapi/fetch" - "sigs.k8s.io/kustomize/kustomize/v4/commands/openapi/info" + "sigs.k8s.io/kustomize/kustomize/v5/commands/openapi/fetch" + "sigs.k8s.io/kustomize/kustomize/v5/commands/openapi/info" ) // NewCmdOpenAPI makes a new openapi command. diff --git a/kustomize/go.mod b/kustomize/go.mod index 5e7752070..5df70f46d 100644 --- a/kustomize/go.mod +++ b/kustomize/go.mod @@ -1,4 +1,4 @@ -module sigs.k8s.io/kustomize/kustomize/v4 +module sigs.k8s.io/kustomize/kustomize/v5 go 1.19 diff --git a/kustomize/main.go b/kustomize/main.go index 059fd2fbd..b10388573 100644 --- a/kustomize/main.go +++ b/kustomize/main.go @@ -7,7 +7,7 @@ package main import ( "os" - "sigs.k8s.io/kustomize/kustomize/v4/commands" + "sigs.k8s.io/kustomize/kustomize/v5/commands" ) func main() {