diff --git a/go.mod b/go.mod index a4d710b78..74fdfea55 100644 --- a/go.mod +++ b/go.mod @@ -32,7 +32,7 @@ require ( gopkg.in/yaml.v2 v2.4.0 k8s.io/api v0.0.0-20230315055831-abe66f57fdb1 k8s.io/apimachinery v0.0.0-20230315054728-8d1258da8f38 - k8s.io/cli-runtime v0.0.0-20230315090342-119034b67cd9 + k8s.io/cli-runtime v0.0.0-20230315090346-9185a9dd0ead k8s.io/client-go v0.0.0-20230315061845-84ae514115bd k8s.io/component-base v0.0.0-20230315065615-6b9bb8ecc3d0 k8s.io/component-helpers v0.0.0-20230315070331-853a1039365a @@ -41,8 +41,8 @@ require ( k8s.io/metrics v0.0.0-20230315085338-9dbbb87d575a k8s.io/utils v0.0.0-20230209194617-a36077c30491 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd - sigs.k8s.io/kustomize/kustomize/v4 v4.5.7 - sigs.k8s.io/kustomize/kyaml v0.13.9 + sigs.k8s.io/kustomize/kustomize/v5 v5.0.1 + sigs.k8s.io/kustomize/kyaml v0.14.1 sigs.k8s.io/structured-merge-diff/v4 v4.2.3 sigs.k8s.io/yaml v1.3.0 ) @@ -51,7 +51,7 @@ require ( github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/emicklei/go-restful/v3 v3.9.0 // indirect - github.com/go-errors/errors v1.0.1 // indirect + github.com/go-errors/errors v1.4.2 // indirect github.com/go-logr/logr v1.2.3 // indirect github.com/go-openapi/jsonpointer v0.19.6 // indirect github.com/go-openapi/swag v0.22.3 // indirect @@ -90,13 +90,13 @@ require ( google.golang.org/protobuf v1.28.1 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - sigs.k8s.io/kustomize/api v0.12.1 // indirect + sigs.k8s.io/kustomize/api v0.13.2 // indirect ) replace ( k8s.io/api => k8s.io/api v0.0.0-20230315055831-abe66f57fdb1 k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230315054728-8d1258da8f38 - k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20230315090342-119034b67cd9 + k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20230315090346-9185a9dd0ead k8s.io/client-go => k8s.io/client-go v0.0.0-20230315061845-84ae514115bd k8s.io/code-generator => k8s.io/code-generator v0.0.0-20230315053024-8fead9f64de8 k8s.io/component-base => k8s.io/component-base v0.0.0-20230315065615-6b9bb8ecc3d0 diff --git a/go.sum b/go.sum index ebd8d48e0..7c86344e0 100644 --- a/go.sum +++ b/go.sum @@ -71,8 +71,8 @@ github.com/fatih/camelcase v1.0.0 h1:hxNvNX/xYBp0ovncs8WyWZrOrpBNub/JfaMvbURyft8 github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwoZc+/fpc= github.com/fvbommel/sortorder v1.0.1 h1:dSnXLt4mJYH25uDDGa3biZNQsozaUWDSWeKJ0qqFfzE= github.com/fvbommel/sortorder v1.0.1/go.mod h1:uk88iVf1ovNn1iLfgUVU2F9o5eO30ui720w+kxuqRs0= -github.com/go-errors/errors v1.0.1 h1:LUHzmkK3GUKUrL/1gfBUxAHzcev3apQlezX/+O7ma6w= -github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q= +github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA= +github.com/go-errors/errors v1.4.2/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= @@ -543,8 +543,8 @@ k8s.io/api v0.0.0-20230315055831-abe66f57fdb1 h1:XQ9kk+GySLR6UE0w0oqxpzP5QrcsELj k8s.io/api v0.0.0-20230315055831-abe66f57fdb1/go.mod h1:aZ6MBt4NMLXSxkSKFkoDaP4hTutnZIvH5dCSpOis9g4= k8s.io/apimachinery v0.0.0-20230315054728-8d1258da8f38 h1:n1qDRCTPAXwyXYg7eSpWDO9FdW79lwAQ9dAr1vETpn4= k8s.io/apimachinery v0.0.0-20230315054728-8d1258da8f38/go.mod h1:5ikh59fK3AJ287GUvpUsryoMFtH9zj/ARfWCo3AyXTM= -k8s.io/cli-runtime v0.0.0-20230315090342-119034b67cd9 h1:gPSZ9edqZUe0dI3HPxZDiNv4tfvdW0NwQDZpS2ep4t4= -k8s.io/cli-runtime v0.0.0-20230315090342-119034b67cd9/go.mod h1:QnnGh4vxT0JEAXxXqyh4zNLQ93liWuwh/HyDvBCn6yU= +k8s.io/cli-runtime v0.0.0-20230315090346-9185a9dd0ead h1:HYtR8a33cxjM2XGQvAZaDXXjhY3nz9uWvbeYJSz6yl0= +k8s.io/cli-runtime v0.0.0-20230315090346-9185a9dd0ead/go.mod h1:wg6/UJ9wwfEEAXnyuuajHSr+YnMXL1K0yUrRHjXz3Do= k8s.io/client-go v0.0.0-20230315061845-84ae514115bd h1:dilBefJQ4PnyI4xt/dH3EUQfGx5+tjwQMWL92ICsKoQ= k8s.io/client-go v0.0.0-20230315061845-84ae514115bd/go.mod h1:Np+Pk6S0Rgul2HDFTuxJLmr5pdZNE9rDxwdzBoxpOF4= k8s.io/component-base v0.0.0-20230315065615-6b9bb8ecc3d0 h1:IjneP02MOB07PIP9+PQjKrOIZEZ5T7umR+GIZkU4h0U= @@ -564,12 +564,12 @@ rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= -sigs.k8s.io/kustomize/api v0.12.1 h1:7YM7gW3kYBwtKvoY216ZzY+8hM+lV53LUayghNRJ0vM= -sigs.k8s.io/kustomize/api v0.12.1/go.mod h1:y3JUhimkZkR6sbLNwfJHxvo1TCLwuwm14sCYnkH6S1s= -sigs.k8s.io/kustomize/kustomize/v4 v4.5.7 h1:cDW6AVMl6t/SLuQaezMET8hgnadZGIAr8tUrxFVOrpg= -sigs.k8s.io/kustomize/kustomize/v4 v4.5.7/go.mod h1:VSNKEH9D9d9bLiWEGbS6Xbg/Ih0tgQalmPvntzRxZ/Q= -sigs.k8s.io/kustomize/kyaml v0.13.9 h1:Qz53EAaFFANyNgyOEJbT/yoIHygK40/ZcvU3rgry2Tk= -sigs.k8s.io/kustomize/kyaml v0.13.9/go.mod h1:QsRbD0/KcU+wdk0/L0fIp2KLnohkVzs6fQ85/nOXac4= +sigs.k8s.io/kustomize/api v0.13.2 h1:kejWfLeJhUsTGioDoFNJET5LQe/ajzXhJGYoU+pJsiA= +sigs.k8s.io/kustomize/api v0.13.2/go.mod h1:DUp325VVMFVcQSq+ZxyDisA8wtldwHxLZbr1g94UHsw= +sigs.k8s.io/kustomize/kustomize/v5 v5.0.1 h1:HWXbyKDNwGqol+s/sMNr/vnfNME/EoMdEraP4ZkUQek= +sigs.k8s.io/kustomize/kustomize/v5 v5.0.1/go.mod h1:Q8o+soB41Pn1y26eXzG9cniuECDpTJe2eKOA1fENCU8= +sigs.k8s.io/kustomize/kyaml v0.14.1 h1:c8iibius7l24G2wVAGZn/Va2wNys03GXLjYVIcFVxKA= +sigs.k8s.io/kustomize/kyaml v0.14.1/go.mod h1:AN1/IpawKilWD7V+YvQwRGUvuUOOWpjsHu6uHwonSF4= sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE= sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E= sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo= diff --git a/pkg/cmd/kustomize/kustomize.go b/pkg/cmd/kustomize/kustomize.go index 77543484c..5b0bc3507 100644 --- a/pkg/cmd/kustomize/kustomize.go +++ b/pkg/cmd/kustomize/kustomize.go @@ -21,7 +21,7 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" - "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/pkg/cmd/version/version.go b/pkg/cmd/version/version.go index 38a1eb30a..8f7242bf7 100644 --- a/pkg/cmd/version/version.go +++ b/pkg/cmd/version/version.go @@ -36,7 +36,7 @@ import ( ) // TODO(knverey): remove this hardcoding once kubectl being built with module support makes BuildInfo available. -const kustomizeVersion = "v4.5.7" +const kustomizeVersion = "v5.0.1" // Version is a struct for version information type Version struct { @@ -195,7 +195,7 @@ func GetKustomizeModVersion() (string, bool) { return "", false } for _, dep := range info.Deps { - if dep.Path == "sigs.k8s.io/kustomize/kustomize/v4" { + if dep.Path == "sigs.k8s.io/kustomize/kustomize/v4" || dep.Path == "sigs.k8s.io/kustomize/kustomize/v5" { return dep.Version, true } }