Skip to content

Commit 6df6424

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#116598 from natasha41575/updateKustV5
Update kubectl kustomize to kyaml/v0.14.1, cmd/config/v0.11.1, api/v0…
2 parents fa52539 + 09e6e4d commit 6df6424

File tree

128 files changed

+32319
-31588
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

128 files changed

+32319
-31588
lines changed

‎LICENSES/vendor/sigs.k8s.io/kustomize/kustomize/v4/LICENSE renamed to ‎LICENSES/vendor/sigs.k8s.io/kustomize/kustomize/v5/LICENSE

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎go.mod

+4-4
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ require (
161161
github.com/fatih/camelcase v1.0.0 // indirect
162162
github.com/felixge/httpsnoop v1.0.3 // indirect
163163
github.com/fvbommel/sortorder v1.0.1 // indirect
164-
github.com/go-errors/errors v1.0.1 // indirect
164+
github.com/go-errors/errors v1.4.2 // indirect
165165
github.com/go-logr/stdr v1.2.2 // indirect
166166
github.com/go-logr/zapr v1.2.3 // indirect
167167
github.com/go-openapi/jsonpointer v0.19.6 // indirect
@@ -237,9 +237,9 @@ require (
237237
gopkg.in/warnings.v0 v0.1.1 // indirect
238238
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.1 // indirect
239239
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
240-
sigs.k8s.io/kustomize/api v0.12.1 // indirect
241-
sigs.k8s.io/kustomize/kustomize/v4 v4.5.7 // indirect
242-
sigs.k8s.io/kustomize/kyaml v0.13.9 // indirect
240+
sigs.k8s.io/kustomize/api v0.13.2 // indirect
241+
sigs.k8s.io/kustomize/kustomize/v5 v5.0.1 // indirect
242+
sigs.k8s.io/kustomize/kyaml v0.14.1 // indirect
243243
)
244244

245245
replace (

‎go.sum

+8-8
Original file line numberDiff line numberDiff line change
@@ -247,8 +247,8 @@ github.com/fvbommel/sortorder v1.0.1 h1:dSnXLt4mJYH25uDDGa3biZNQsozaUWDSWeKJ0qqF
247247
github.com/fvbommel/sortorder v1.0.1/go.mod h1:uk88iVf1ovNn1iLfgUVU2F9o5eO30ui720w+kxuqRs0=
248248
github.com/getsentry/raven-go v0.2.0 h1:no+xWJRb5ZI7eE8TWgIq1jLulQiIoLG0IfYxv5JYMGs=
249249
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
250-
github.com/go-errors/errors v1.0.1 h1:LUHzmkK3GUKUrL/1gfBUxAHzcev3apQlezX/+O7ma6w=
251-
github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
250+
github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA=
251+
github.com/go-errors/errors v1.4.2/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og=
252252
github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
253253
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
254254
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
@@ -1265,12 +1265,12 @@ sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.1 h1:MB1zkK+WMOmfLx
12651265
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.1/go.mod h1:/4NLd21PQY0B+H+X0aDZdwUiVXYJQl/2NXA5KVtDiP4=
12661266
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
12671267
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
1268-
sigs.k8s.io/kustomize/api v0.12.1 h1:7YM7gW3kYBwtKvoY216ZzY+8hM+lV53LUayghNRJ0vM=
1269-
sigs.k8s.io/kustomize/api v0.12.1/go.mod h1:y3JUhimkZkR6sbLNwfJHxvo1TCLwuwm14sCYnkH6S1s=
1270-
sigs.k8s.io/kustomize/kustomize/v4 v4.5.7 h1:cDW6AVMl6t/SLuQaezMET8hgnadZGIAr8tUrxFVOrpg=
1271-
sigs.k8s.io/kustomize/kustomize/v4 v4.5.7/go.mod h1:VSNKEH9D9d9bLiWEGbS6Xbg/Ih0tgQalmPvntzRxZ/Q=
1272-
sigs.k8s.io/kustomize/kyaml v0.13.9 h1:Qz53EAaFFANyNgyOEJbT/yoIHygK40/ZcvU3rgry2Tk=
1273-
sigs.k8s.io/kustomize/kyaml v0.13.9/go.mod h1:QsRbD0/KcU+wdk0/L0fIp2KLnohkVzs6fQ85/nOXac4=
1268+
sigs.k8s.io/kustomize/api v0.13.2 h1:kejWfLeJhUsTGioDoFNJET5LQe/ajzXhJGYoU+pJsiA=
1269+
sigs.k8s.io/kustomize/api v0.13.2/go.mod h1:DUp325VVMFVcQSq+ZxyDisA8wtldwHxLZbr1g94UHsw=
1270+
sigs.k8s.io/kustomize/kustomize/v5 v5.0.1 h1:HWXbyKDNwGqol+s/sMNr/vnfNME/EoMdEraP4ZkUQek=
1271+
sigs.k8s.io/kustomize/kustomize/v5 v5.0.1/go.mod h1:Q8o+soB41Pn1y26eXzG9cniuECDpTJe2eKOA1fENCU8=
1272+
sigs.k8s.io/kustomize/kyaml v0.14.1 h1:c8iibius7l24G2wVAGZn/Va2wNys03GXLjYVIcFVxKA=
1273+
sigs.k8s.io/kustomize/kyaml v0.14.1/go.mod h1:AN1/IpawKilWD7V+YvQwRGUvuUOOWpjsHu6uHwonSF4=
12741274
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
12751275
sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
12761276
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=

‎hack/unwanted-dependencies.json

+2-8
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,6 @@
4343
},
4444
"status": {
4545
"unwantedReferences": {
46-
"github.com/PuerkitoBio/urlesc": [
47-
"sigs.k8s.io/kustomize/api",
48-
"sigs.k8s.io/kustomize/kustomize/v4",
49-
"sigs.k8s.io/kustomize/kyaml"
50-
],
5146
"github.com/getsentry/raven-go": [
5247
"go.etcd.io/etcd/raft/v3"
5348
],
@@ -72,7 +67,7 @@
7267
],
7368
"github.com/google/shlex": [
7469
"sigs.k8s.io/kustomize/api",
75-
"sigs.k8s.io/kustomize/kustomize/v4"
70+
"sigs.k8s.io/kustomize/kustomize/v5"
7671
],
7772
"github.com/gorilla/websocket": [
7873
"github.com/moby/spdystream",
@@ -104,8 +99,7 @@
10499
"gotest.tools/v3",
105100
"k8s.io/system-validators",
106101
"sigs.k8s.io/kustomize/api",
107-
"sigs.k8s.io/kustomize/kustomize/v4",
108-
"sigs.k8s.io/kustomize/kyaml"
102+
"sigs.k8s.io/kustomize/kustomize/v5"
109103
]
110104
}
111105
}

‎hack/update-kustomize.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ fi
4949
./hack/pin-dependency.sh sigs.k8s.io/kustomize/kyaml "$LATEST_KYAML"
5050
./hack/pin-dependency.sh sigs.k8s.io/kustomize/cmd/config "$LATEST_CONFIG"
5151
./hack/pin-dependency.sh sigs.k8s.io/kustomize/api "$LATEST_API"
52-
./hack/pin-dependency.sh sigs.k8s.io/kustomize/kustomize/v4 "$LATEST_KUSTOMIZE"
52+
./hack/pin-dependency.sh sigs.k8s.io/kustomize/kustomize/v5 "$LATEST_KUSTOMIZE"
5353

5454
./hack/update-vendor.sh
5555
./hack/update-internal-modules.sh

‎staging/src/k8s.io/cli-runtime/go.mod

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ require (
2121
k8s.io/klog/v2 v2.90.1
2222
k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a
2323
k8s.io/utils v0.0.0-20230209194617-a36077c30491
24-
sigs.k8s.io/kustomize/api v0.12.1
25-
sigs.k8s.io/kustomize/kyaml v0.13.9
24+
sigs.k8s.io/kustomize/api v0.13.2
25+
sigs.k8s.io/kustomize/kyaml v0.14.1
2626
sigs.k8s.io/yaml v1.3.0
2727
)
2828

2929
require (
3030
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
31-
github.com/go-errors/errors v1.0.1 // indirect
31+
github.com/go-errors/errors v1.4.2 // indirect
3232
github.com/go-logr/logr v1.2.3 // indirect
3333
github.com/go-openapi/jsonpointer v0.19.6 // indirect
3434
github.com/go-openapi/jsonreference v0.20.1 // indirect

‎staging/src/k8s.io/cli-runtime/go.sum

+6-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎staging/src/k8s.io/cli-runtime/pkg/resource/kustomizevisitor.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ type KustomizeVisitor struct {
3838
// Visit passes the result of a kustomize build to a StreamVisitor.
3939
func (v *KustomizeVisitor) Visit(fn VisitorFunc) error {
4040
kOpts := krusty.MakeDefaultOptions()
41-
kOpts.DoLegacyResourceSort = true
41+
kOpts.Reorder = krusty.ReorderOptionLegacy
4242
k := krusty.MakeKustomizer(kOpts)
4343
m, err := k.Run(v.fSys, v.dirPath)
4444
if err != nil {

‎staging/src/k8s.io/kubectl/go.mod

+4-4
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ require (
4141
k8s.io/metrics v0.0.0
4242
k8s.io/utils v0.0.0-20230209194617-a36077c30491
4343
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd
44-
sigs.k8s.io/kustomize/kustomize/v4 v4.5.7
45-
sigs.k8s.io/kustomize/kyaml v0.13.9
44+
sigs.k8s.io/kustomize/kustomize/v5 v5.0.1
45+
sigs.k8s.io/kustomize/kyaml v0.14.1
4646
sigs.k8s.io/structured-merge-diff/v4 v4.2.3
4747
sigs.k8s.io/yaml v1.3.0
4848
)
@@ -51,7 +51,7 @@ require (
5151
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
5252
github.com/davecgh/go-spew v1.1.1 // indirect
5353
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
54-
github.com/go-errors/errors v1.0.1 // indirect
54+
github.com/go-errors/errors v1.4.2 // indirect
5555
github.com/go-logr/logr v1.2.3 // indirect
5656
github.com/go-openapi/jsonpointer v0.19.6 // indirect
5757
github.com/go-openapi/swag v0.22.3 // indirect
@@ -90,7 +90,7 @@ require (
9090
google.golang.org/protobuf v1.28.1 // indirect
9191
gopkg.in/inf.v0 v0.9.1 // indirect
9292
gopkg.in/yaml.v3 v3.0.1 // indirect
93-
sigs.k8s.io/kustomize/api v0.12.1 // indirect
93+
sigs.k8s.io/kustomize/api v0.13.2 // indirect
9494
)
9595

9696
replace (

‎staging/src/k8s.io/kubectl/go.sum

+8-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎staging/src/k8s.io/kubectl/pkg/cmd/kustomize/kustomize.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"k8s.io/cli-runtime/pkg/genericclioptions"
2222
"k8s.io/kubectl/pkg/util/i18n"
2323
"k8s.io/kubectl/pkg/util/templates"
24-
"sigs.k8s.io/kustomize/kustomize/v4/commands/build"
24+
"sigs.k8s.io/kustomize/kustomize/v5/commands/build"
2525
"sigs.k8s.io/kustomize/kyaml/filesys"
2626
)
2727

‎staging/src/k8s.io/kubectl/pkg/cmd/version/version.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import (
3636
)
3737

3838
// TODO(knverey): remove this hardcoding once kubectl being built with module support makes BuildInfo available.
39-
const kustomizeVersion = "v4.5.7"
39+
const kustomizeVersion = "v5.0.1"
4040

4141
// Version is a struct for version information
4242
type Version struct {
@@ -195,7 +195,7 @@ func GetKustomizeModVersion() (string, bool) {
195195
return "", false
196196
}
197197
for _, dep := range info.Deps {
198-
if dep.Path == "sigs.k8s.io/kustomize/kustomize/v4" {
198+
if dep.Path == "sigs.k8s.io/kustomize/kustomize/v4" || dep.Path == "sigs.k8s.io/kustomize/kustomize/v5" {
199199
return dep.Version, true
200200
}
201201
}

‎staging/src/k8s.io/sample-cli-plugin/go.mod

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ require (
1515
github.com/davecgh/go-spew v1.1.1 // indirect
1616
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
1717
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
18-
github.com/go-errors/errors v1.0.1 // indirect
18+
github.com/go-errors/errors v1.4.2 // indirect
1919
github.com/go-logr/logr v1.2.3 // indirect
2020
github.com/go-openapi/jsonpointer v0.19.6 // indirect
2121
github.com/go-openapi/jsonreference v0.20.1 // indirect
@@ -60,8 +60,8 @@ require (
6060
k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a // indirect
6161
k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
6262
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
63-
sigs.k8s.io/kustomize/api v0.12.1 // indirect
64-
sigs.k8s.io/kustomize/kyaml v0.13.9 // indirect
63+
sigs.k8s.io/kustomize/api v0.13.2 // indirect
64+
sigs.k8s.io/kustomize/kyaml v0.14.1 // indirect
6565
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
6666
sigs.k8s.io/yaml v1.3.0 // indirect
6767
)

‎staging/src/k8s.io/sample-cli-plugin/go.sum

+6-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/go-errors/errors/.travis.yml

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/go-errors/errors/README.md

+16
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)