Skip to content

Commit 9a2a753

Browse files
authored
Merge pull request kubernetes#128580 from jpbetz/bump-kube-openapi
Bump kube-openapi to latest
2 parents 08391b3 + bedfcc9 commit 9a2a753

File tree

75 files changed

+107
-10393
lines changed

Some content is hidden

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

75 files changed

+107
-10393
lines changed

LICENSES/vendor/gopkg.in/yaml.v2/LICENSE

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

go.mod

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ require (
107107
k8s.io/kms v0.0.0
108108
k8s.io/kube-aggregator v0.0.0
109109
k8s.io/kube-controller-manager v0.0.0
110-
k8s.io/kube-openapi v0.0.0-20240827152857-f7e401e7b4c2
110+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f
111111
k8s.io/kube-proxy v0.0.0
112112
k8s.io/kube-scheduler v0.0.0
113113
k8s.io/kubectl v0.0.0
@@ -211,7 +211,6 @@ require (
211211
google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect
212212
gopkg.in/inf.v0 v0.9.1 // indirect
213213
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
214-
gopkg.in/yaml.v2 v2.4.0 // indirect
215214
gopkg.in/yaml.v3 v3.0.1 // indirect
216215
k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 // indirect
217216
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect

go.sum

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -674,7 +674,6 @@ gopkg.in/square/go-jose.v2 v2.6.0 h1:NGk74WTnPKBNUhNzQX7PYcTLUjoq7mzKk2OKbvwk2iI
674674
gopkg.in/square/go-jose.v2 v2.6.0/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
675675
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
676676
gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
677-
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
678677
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
679678
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
680679
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
@@ -686,8 +685,8 @@ k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 h1:si3PfKm8dDYxgfbeA6orqrtLkv
686685
k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9/go.mod h1:EJykeLsmFC60UQbYJezXkEsG2FLrt0GPNkU5iK5GWxU=
687686
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
688687
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
689-
k8s.io/kube-openapi v0.0.0-20240827152857-f7e401e7b4c2 h1:GKE9U8BH16uynoxQii0auTjmmmuZ3O0LFMN6S0lPPhI=
690-
k8s.io/kube-openapi v0.0.0-20240827152857-f7e401e7b4c2/go.mod h1:coRQXBK9NxO98XUv3ZD6AK3xzHCxV6+b7lrquKwaKzA=
688+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f h1:GA7//TjRY9yWGy1poLzYYJJ4JRdzg3+O6e8I+e+8T5Y=
689+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f/go.mod h1:R/HEjbvWI0qdfb8viZUeVZm0X6IZnxAydC7YU42CMw4=
691690
k8s.io/system-validators v1.9.1 h1:O8xrr08foamG+1uQjAdiTLt/fT+QQJ4QNREfCWvuOws=
692691
k8s.io/system-validators v1.9.1/go.mod h1:d4UVrxKu52s0BHU984Peb9VpIq4V9sd8xjTBV/waY/I=
693692
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6JSWYFzOFnYeS6Ro=

go.work.sum

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,7 @@ golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3 h1:XQyxROzUlZH+WIQwySDgnISg
178178
golang.org/x/telemetry v0.0.0-20240521205824-bda55230c457 h1:zf5N6UOrA487eEFacMePxjXAJctxKmyjKUsjA11Uzuk=
179179
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
180180
google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
181+
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
181182
gotest.tools/v3 v3.0.2 h1:kG1BFyqVHuQoVQiR1bWGnfz/fmHvvuiSPIV7rvl360E=
182183
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc h1:/hemPrYIhOhy8zYrNj+069zDB68us2sMGsfkFJO0iZs=
183184
sigs.k8s.io/kustomize/cmd/config v0.15.0 h1:WkdY8V2+8J+W00YbImXa2ke9oegfrHH79e+kywW7EdU=

hack/unwanted-dependencies.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@
7171
"google.golang.org/appengine": "cloud dependency",
7272
"google.golang.org/genproto": "refer to #113366",
7373
"gopkg.in/fsnotify.v1": "obsolete, use github.com/fsnotify/fsnotify",
74+
"gopkg.in/yaml.v2": "prefer sigs.k8s.io/yaml",
7475
"k8s.io/klog": "we have switched to klog v2, so avoid klog v1",
7576
"rsc.io/quote": "refer to #102833",
7677
"rsc.io/sampler": "refer to #102833"
@@ -194,6 +195,14 @@
194195
"go.etcd.io/etcd/api/v3",
195196
"go.etcd.io/etcd/client/v3",
196197
"go.etcd.io/etcd/server/v3"
198+
],
199+
"gopkg.in/yaml.v2": [
200+
"github.com/grpc-ecosystem/grpc-gateway",
201+
"github.com/prometheus/client_golang",
202+
"github.com/prometheus/common",
203+
"go.etcd.io/etcd/api/v3",
204+
"go.etcd.io/etcd/client/v3",
205+
"go.etcd.io/etcd/server/v3"
197206
]
198207
},
199208
"unwantedVendored": [

staging/src/k8s.io/api/go.sum

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

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ require (
3232
k8s.io/code-generator v0.0.0
3333
k8s.io/component-base v0.0.0
3434
k8s.io/klog/v2 v2.130.1
35-
k8s.io/kube-openapi v0.0.0-20240827152857-f7e401e7b4c2
35+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f
3636
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
3737
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3
3838
sigs.k8s.io/structured-merge-diff/v4 v4.4.2
@@ -119,7 +119,6 @@ require (
119119
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
120120
gopkg.in/inf.v0 v0.9.1 // indirect
121121
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
122-
gopkg.in/yaml.v2 v2.4.0 // indirect
123122
gopkg.in/yaml.v3 v3.0.1 // indirect
124123
k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 // indirect
125124
k8s.io/kms v0.0.0 // indirect

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

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

staging/src/k8s.io/apimachinery/go.mod

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ require (
2626
gopkg.in/evanphx/json-patch.v4 v4.12.0
2727
gopkg.in/inf.v0 v0.9.1
2828
k8s.io/klog/v2 v2.130.1
29-
k8s.io/kube-openapi v0.0.0-20240827152857-f7e401e7b4c2
29+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f
3030
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
3131
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3
3232
sigs.k8s.io/structured-merge-diff/v4 v4.4.2
@@ -53,6 +53,5 @@ require (
5353
golang.org/x/text v0.19.0 // indirect
5454
golang.org/x/tools v0.26.0 // indirect
5555
google.golang.org/protobuf v1.35.1 // indirect
56-
gopkg.in/yaml.v2 v2.4.0 // indirect
5756
gopkg.in/yaml.v3 v3.0.1 // indirect
5857
)

0 commit comments

Comments
 (0)