Skip to content

Commit 21a0318

Browse files
[vendor] Downgrade k8s.io/kube-openapi
The latest bump requires structured-merge-diff/v6 which is not compatible with v33.3 of k8s.io/apimachinery
1 parent 6bffa78 commit 21a0318

File tree

14 files changed

+21
-1061
lines changed

14 files changed

+21
-1061
lines changed

go.mod

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,12 +146,11 @@ require (
146146
k8s.io/cli-runtime v0.33.3 // indirect
147147
k8s.io/component-base v0.33.3 // indirect
148148
k8s.io/controller-manager v0.32.7 // indirect
149-
k8s.io/kube-openapi v0.0.0-20250812141708-942b836dc350 // indirect
149+
k8s.io/kube-openapi v0.0.0-20250628140032-d90c4fd18f59 // indirect
150150
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
151151
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
152152
sigs.k8s.io/kustomize/api v0.19.0 // indirect
153153
sigs.k8s.io/kustomize/kyaml v0.19.0 // indirect
154154
sigs.k8s.io/randfill v1.0.0 // indirect
155-
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
156-
sigs.k8s.io/structured-merge-diff/v6 v6.2.0 // indirect
155+
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
157156
)

go.sum

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1121,8 +1121,8 @@ k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
11211121
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
11221122
k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c/go.mod h1:GRQhZsXIAJ1xR0C9bd8UpWHZ5plfAS9fzPjJuQ6JL3E=
11231123
k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM=
1124-
k8s.io/kube-openapi v0.0.0-20250812141708-942b836dc350 h1:zxobBJebKoDLWO4GayQTdcW9JHcshxl3NgG8p6wavOY=
1125-
k8s.io/kube-openapi v0.0.0-20250812141708-942b836dc350/go.mod h1:UZ2yyWbFTpuhSbFhv24aGNOdoRdJZgsIObGBUaYVsts=
1124+
k8s.io/kube-openapi v0.0.0-20250628140032-d90c4fd18f59 h1:Jc4GiFTK2HHOpfQFoQEGXTBTs2pETwHukmoD4yoTqwo=
1125+
k8s.io/kube-openapi v0.0.0-20250628140032-d90c4fd18f59/go.mod h1:GLOk5B+hDbRROvt0X2+hqX64v/zO3vXN7J78OUmBSKw=
11261126
k8s.io/kubectl v0.33.3 h1:r/phHvH1iU7gO/l7tTjQk2K01ER7/OAJi8uFHHyWSac=
11271127
k8s.io/kubectl v0.33.3/go.mod h1:euj2bG56L6kUGOE/ckZbCoudPwuj4Kud7BR0GzyNiT0=
11281128
k8s.io/kubelet v0.33.3 h1:Cvy8+7Lq9saZds2ib7YBXbKvkMMJu3f5mzucmhSIJno=
@@ -1156,10 +1156,8 @@ sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxO
11561156
sigs.k8s.io/structured-merge-diff/v3 v3.0.0-20200116222232-67a7b8c61874/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw=
11571157
sigs.k8s.io/structured-merge-diff/v3 v3.0.0/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw=
11581158
sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
1159-
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 h1:qPeWmscJcXP0snki5IYF79Z8xrl8ETFxgMd7wez1XkI=
1160-
sigs.k8s.io/structured-merge-diff/v4 v4.7.0/go.mod h1:dDy58f92j70zLsuZVuUX5Wp9vtxXpaZnkPGWeqDfCps=
1161-
sigs.k8s.io/structured-merge-diff/v6 v6.2.0 h1:msyqjP8Nyd5sF3QSmJouFSzcBIdwq4ct8d1/7VSBHIQ=
1162-
sigs.k8s.io/structured-merge-diff/v6 v6.2.0/go.mod h1:M3W8sfWvn2HhQDIbGWj3S099YozAsymCo/wrT5ohRUE=
1159+
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 h1:IUA9nvMmnKWcj5jl84xn+T5MnlZKThmUW1TdblaLVAc=
1160+
sigs.k8s.io/structured-merge-diff/v4 v4.6.0/go.mod h1:dDy58f92j70zLsuZVuUX5Wp9vtxXpaZnkPGWeqDfCps=
11631161
sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
11641162
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
11651163
sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=

vendor/k8s.io/kube-openapi/pkg/schemaconv/openapi.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/k8s.io/kube-openapi/pkg/schemaconv/proto_models.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/k8s.io/kube-openapi/pkg/schemaconv/smd.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/modules.txt

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1267,8 +1267,8 @@ k8s.io/klog/v2/internal/severity
12671267
k8s.io/klog/v2/internal/sloghandler
12681268
k8s.io/klog/v2/internal/verbosity
12691269
k8s.io/klog/v2/textlogger
1270-
# k8s.io/kube-openapi v0.0.0-20250812141708-942b836dc350
1271-
## explicit; go 1.23
1270+
# k8s.io/kube-openapi v0.0.0-20250628140032-d90c4fd18f59
1271+
## explicit; go 1.22
12721272
k8s.io/kube-openapi/pkg/cached
12731273
k8s.io/kube-openapi/pkg/common
12741274
k8s.io/kube-openapi/pkg/handler3
@@ -1457,16 +1457,13 @@ sigs.k8s.io/kustomize/kyaml/yaml/walk
14571457
## explicit; go 1.18
14581458
sigs.k8s.io/randfill
14591459
sigs.k8s.io/randfill/bytesource
1460-
# sigs.k8s.io/structured-merge-diff/v4 v4.7.0
1460+
# sigs.k8s.io/structured-merge-diff/v4 v4.6.0
14611461
## explicit; go 1.13
14621462
sigs.k8s.io/structured-merge-diff/v4/fieldpath
14631463
sigs.k8s.io/structured-merge-diff/v4/merge
14641464
sigs.k8s.io/structured-merge-diff/v4/schema
14651465
sigs.k8s.io/structured-merge-diff/v4/typed
14661466
sigs.k8s.io/structured-merge-diff/v4/value
1467-
# sigs.k8s.io/structured-merge-diff/v6 v6.2.0
1468-
## explicit; go 1.23
1469-
sigs.k8s.io/structured-merge-diff/v6/schema
14701467
# sigs.k8s.io/yaml v1.6.0
14711468
## explicit; go 1.22
14721469
sigs.k8s.io/yaml

vendor/sigs.k8s.io/structured-merge-diff/v4/typed/validate.go

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

vendor/sigs.k8s.io/structured-merge-diff/v4/value/jsontagutil.go

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

vendor/sigs.k8s.io/structured-merge-diff/v4/value/reflectcache.go

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

0 commit comments

Comments
 (0)