Skip to content

Commit 4281163

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#129622 from dims/update-to-latest-kustomize-v5.6.0
Update to latest kustomize v5.6.0 to drop `github.com/asaskevich/govalidator`
2 parents 165da9a + 43d86c2 commit 4281163

File tree

54 files changed

+77
-3288
lines changed

Some content is hidden

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

54 files changed

+77
-3288
lines changed

‎LICENSES/vendor/github.com/asaskevich/govalidator/LICENSE‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎go.mod‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,6 @@ require (
131131
github.com/MakeNowJust/heredoc v1.0.0 // indirect
132132
github.com/NYTimes/gziphandler v1.1.1 // indirect
133133
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
134-
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
135134
github.com/beorn7/perks v1.0.1 // indirect
136135
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
137136
github.com/cespare/xxhash/v2 v2.3.0 // indirect
@@ -217,9 +216,9 @@ require (
217216
k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 // indirect
218217
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.1 // indirect
219218
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
220-
sigs.k8s.io/kustomize/api v0.18.0 // indirect
221-
sigs.k8s.io/kustomize/kustomize/v5 v5.5.0 // indirect
222-
sigs.k8s.io/kustomize/kyaml v0.18.1 // indirect
219+
sigs.k8s.io/kustomize/api v0.19.0 // indirect
220+
sigs.k8s.io/kustomize/kustomize/v5 v5.6.0 // indirect
221+
sigs.k8s.io/kustomize/kyaml v0.19.0 // indirect
223222
)
224223

225224
replace (

‎go.sum‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,6 @@ github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2 h1:7Ip0wMmLHLRJdrloD
143143
github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
144144
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
145145
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
146-
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a h1:idn718Q4B6AGu/h5Sxe66HYVdqdGu2l9Iebqhi/AEoA=
147-
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
148146
github.com/aws/aws-sdk-go-v2 v1.30.1/go.mod h1:nIQjQVp5sfpQcTc9mPSr1B0PaWK5ByX9MOoDadSN4lc=
149147
github.com/aws/aws-sdk-go-v2/config v1.27.24/go.mod h1:aXzi6QJTuQRVVusAO8/NxpdTeTyr/wRcybdDtfUwJSs=
150148
github.com/aws/aws-sdk-go-v2/credentials v1.17.24/go.mod h1:Hld7tmnAkoBQdTMNYZGzztzKRdA4fCdn9L83LOoigac=
@@ -671,13 +669,13 @@ sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1
671669
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3/go.mod h1:18nIHnGi6636UCz6m8i4DhaJ65T6EruyzmoQqI2BVDo=
672670
sigs.k8s.io/knftables v0.0.17 h1:wGchTyRF/iGTIjd+vRaR1m676HM7jB8soFtyr/148ic=
673671
sigs.k8s.io/knftables v0.0.17/go.mod h1:f/5ZLKYEUPUhVjUCg6l80ACdL7CIIyeL0DxfgojGRTk=
674-
sigs.k8s.io/kustomize/api v0.18.0 h1:hTzp67k+3NEVInwz5BHyzc9rGxIauoXferXyjv5lWPo=
675-
sigs.k8s.io/kustomize/api v0.18.0/go.mod h1:f8isXnX+8b+SGLHQ6yO4JG1rdkZlvhaCf/uZbLVMb0U=
676-
sigs.k8s.io/kustomize/cmd/config v0.15.0/go.mod h1:Jq57b0nPaoYUlOqg//0JtAh6iibboqMcfbtCYoWPM00=
677-
sigs.k8s.io/kustomize/kustomize/v5 v5.5.0 h1:o1mtt6vpxsxDYaZKrw3BnEtc+pAjLz7UffnIvHNbvW0=
678-
sigs.k8s.io/kustomize/kustomize/v5 v5.5.0/go.mod h1:AeFCmgCrXzmvjWWaeZCyBp6XzG1Y0w1svYus8GhJEOE=
679-
sigs.k8s.io/kustomize/kyaml v0.18.1 h1:WvBo56Wzw3fjS+7vBjN6TeivvpbW9GmRaWZ9CIVmt4E=
680-
sigs.k8s.io/kustomize/kyaml v0.18.1/go.mod h1:C3L2BFVU1jgcddNBE1TxuVLgS46TjObMwW5FT9FcjYo=
672+
sigs.k8s.io/kustomize/api v0.19.0 h1:F+2HB2mU1MSiR9Hp1NEgoU2q9ItNOaBJl0I4Dlus5SQ=
673+
sigs.k8s.io/kustomize/api v0.19.0/go.mod h1:/BbwnivGVcBh1r+8m3tH1VNxJmHSk1PzP5fkP6lbL1o=
674+
sigs.k8s.io/kustomize/cmd/config v0.19.0/go.mod h1:29Vvdl26PidPLUDi7nfjYa/I0wHBkwCZp15Nlcc4y98=
675+
sigs.k8s.io/kustomize/kustomize/v5 v5.6.0 h1:MWtRRDWCwQEeW2rnJTqJMuV6Agy56P53SkbVoJpN7wA=
676+
sigs.k8s.io/kustomize/kustomize/v5 v5.6.0/go.mod h1:XuuZiQF7WdcvZzEYyNww9A0p3LazCKeJmCjeycN8e1I=
677+
sigs.k8s.io/kustomize/kyaml v0.19.0 h1:RFge5qsO1uHhwJsu3ipV7RNolC7Uozc0jUBC/61XSlA=
678+
sigs.k8s.io/kustomize/kyaml v0.19.0/go.mod h1:FeKD5jEOH+FbZPpqUghBP8mrLjJ3+zD3/rf9NNu1cwY=
681679
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 h1:MdmvkGuXi/8io6ixD5wud3vOLwc1rj0aNqRlpuvjmwA=
682680
sigs.k8s.io/structured-merge-diff/v4 v4.4.2/go.mod h1:N8f93tFZh9U6vpxwRArLiikrE5/2tiu1w1AGfACIGE4=
683681
sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=

‎go.work.sum‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,4 +181,4 @@ google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6
181181
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
182182
gotest.tools/v3 v3.0.2 h1:kG1BFyqVHuQoVQiR1bWGnfz/fmHvvuiSPIV7rvl360E=
183183
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc h1:/hemPrYIhOhy8zYrNj+069zDB68us2sMGsfkFJO0iZs=
184-
sigs.k8s.io/kustomize/cmd/config v0.15.0 h1:WkdY8V2+8J+W00YbImXa2ke9oegfrHH79e+kywW7EdU=
184+
sigs.k8s.io/kustomize/cmd/config v0.19.0 h1:D3uASwjHWHmNiEHu3pPJBJMBIsb+auFvHrHql3HAarU=

‎hack/unwanted-dependencies.json‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
"github.com/GoogleCloudPlatform/k8s-cloud-provider": "cloud dependency",
1111
"github.com/PuerkitoBio/urlesc": "unmaintained, archive mode",
1212
"github.com/armon/consul-api": "MPL license not in CNCF allowlist",
13+
"github.com/asaskevich/govalidator": "see https://github.com/kubernetes/kubernetes/issues/128573",
1314
"github.com/bketelsen/crypt": "unused, crypto",
1415
"github.com/containerd/cgroups": "standardize on single cgroups library from runc, refer #128157",
1516
"github.com/davecgh/go-spew": "refer to #103942",
@@ -178,10 +179,7 @@
178179
"google.golang.org/genproto",
179180
"google.golang.org/grpc",
180181
"google.golang.org/protobuf",
181-
"sigs.k8s.io/apiserver-network-proxy/konnectivity-client",
182-
"sigs.k8s.io/kustomize/api",
183-
"sigs.k8s.io/kustomize/kustomize/v5",
184-
"sigs.k8s.io/kustomize/kyaml"
182+
"sigs.k8s.io/apiserver-network-proxy/konnectivity-client"
185183
],
186184
"github.com/google/gofuzz": [
187185
"github.com/json-iterator/go",
@@ -194,7 +192,6 @@
194192
"k8s.io/kube-openapi",
195193
"k8s.io/kubernetes",
196194
"k8s.io/sample-apiserver",
197-
"sigs.k8s.io/kustomize/kyaml",
198195
"sigs.k8s.io/structured-merge-diff/v4"
199196
],
200197
"github.com/google/shlex": [

‎staging/src/k8s.io/apiextensions-apiserver/go.mod‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ require (
4545
cel.dev/expr v0.18.0 // indirect
4646
github.com/NYTimes/gziphandler v1.1.1 // indirect
4747
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
48-
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
4948
github.com/beorn7/perks v1.0.1 // indirect
5049
github.com/blang/semver/v4 v4.0.0 // indirect
5150
github.com/cenkalti/backoff/v4 v4.3.0 // indirect

‎staging/src/k8s.io/apiextensions-apiserver/go.sum‎

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ godebug default=go1.23
99
godebug winsymlink=0
1010

1111
require (
12-
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a
1312
github.com/blang/semver/v4 v4.0.0
1413
github.com/coreos/go-oidc v2.2.1+incompatible
1514
github.com/coreos/go-systemd/v22 v22.5.0

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

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎staging/src/k8s.io/apiserver/pkg/cel/library/format.go‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import (
2020
"fmt"
2121
"net/url"
2222

23-
"github.com/asaskevich/govalidator"
2423
"github.com/google/cel-go/cel"
2524
"github.com/google/cel-go/common/decls"
2625
"github.com/google/cel-go/common/types"
@@ -32,6 +31,13 @@ import (
3231
"k8s.io/kube-openapi/pkg/validation/strfmt"
3332
)
3433

34+
var (
35+
// base64_length estimate for base64 regex size from github.com/asaskevich/govalidator
36+
base64Length = 84
37+
// url_length estimate for url regex size from github.com/asaskevich/govalidator
38+
urlLength = 1103
39+
)
40+
3541
// Format provides a CEL library exposing common named Kubernetes string
3642
// validations. Can be used in CRD ValidationRules messageExpression.
3743
//
@@ -193,7 +199,7 @@ var ConstantFormats = map[string]apiservercel.Format{
193199
},
194200
// Use govalidator url regex to estimate, since ParseRequestURI
195201
// doesnt use regex
196-
MaxRegexSize: len(govalidator.URL),
202+
MaxRegexSize: urlLength,
197203
},
198204
"uuid": {
199205
Name: "uuid",
@@ -213,7 +219,7 @@ var ConstantFormats = map[string]apiservercel.Format{
213219
}
214220
return nil
215221
},
216-
MaxRegexSize: len(govalidator.Base64),
222+
MaxRegexSize: base64Length,
217223
},
218224
"date": {
219225
Name: "date",

0 commit comments

Comments
 (0)