Skip to content

Commit 76b79cf

Browse files
Merge pull request #126300 from cici37/automated-cherry-pick-of-#126167-upstream-release-1.30
Automated cherry pick of #126167: Hot fix for panic on schema conversion. Kubernetes-commit: 935f5d5e43236e6e40d4780a1511f75e8589a02e
1 parent acd049c commit 76b79cf

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ require (
2424
google.golang.org/grpc v1.58.3
2525
google.golang.org/protobuf v1.33.0
2626
gopkg.in/yaml.v2 v2.4.0
27-
k8s.io/api v0.0.0-20240510083903-0fd470c38104
28-
k8s.io/apimachinery v0.0.0-20240405200823-37988e577e16
29-
k8s.io/apiserver v0.0.0-20240604053420-7a3db503744e
30-
k8s.io/client-go v0.0.0-20240510085155-4e1652b143b3
27+
k8s.io/api v0.0.0-20240729133035-48606d9abc29
28+
k8s.io/apimachinery v0.0.0-20240729091232-07dc100ca27c
29+
k8s.io/apiserver v0.0.0-20240729142728-7514fdb6a6ac
30+
k8s.io/client-go v0.0.0-20240729134403-274256ef2e49
3131
k8s.io/code-generator v0.0.0-20240419114927-e5a48a57f0c3
3232
k8s.io/component-base v0.0.0-20240405201845-0ac84ef15102
3333
k8s.io/klog/v2 v2.120.1

go.sum

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -376,14 +376,14 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
376376
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
377377
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
378378
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
379-
k8s.io/api v0.0.0-20240510083903-0fd470c38104 h1:CsFjvCQX86vxV6SVLgl1dVWNAGzdR3vaziQchmYNnXo=
380-
k8s.io/api v0.0.0-20240510083903-0fd470c38104/go.mod h1:72LmHV9KJWB464cJMYgnWZqh3GiKgX70hjmgoYjR67Y=
381-
k8s.io/apimachinery v0.0.0-20240405200823-37988e577e16 h1:GjoXk5Gb8LqhZJjGbYOqIw8JbuDJZv9MKd94i2DXzg8=
382-
k8s.io/apimachinery v0.0.0-20240405200823-37988e577e16/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc=
383-
k8s.io/apiserver v0.0.0-20240604053420-7a3db503744e h1:p0Ukd6b3/q+TCOepCxmX5szsNQJzML/3WRo4H9YJDBg=
384-
k8s.io/apiserver v0.0.0-20240604053420-7a3db503744e/go.mod h1:ASsutdmVmPQmuaOw8qreHNMuW09bDiKGzCPhm2c7DGY=
385-
k8s.io/client-go v0.0.0-20240510085155-4e1652b143b3 h1:3QobH/DptkfvbDtWgUzxCwbuoGRL8WzlJyrCx1NNU7w=
386-
k8s.io/client-go v0.0.0-20240510085155-4e1652b143b3/go.mod h1:lvbxFeJeLdTXhYLUuaGD2ptt/R+9cCQ8FZvnmF+OBaM=
379+
k8s.io/api v0.0.0-20240729133035-48606d9abc29 h1:hpnrekf6Yh+i8umj6eSe/nk9lj9Ed0E0b5iZMuD4y+M=
380+
k8s.io/api v0.0.0-20240729133035-48606d9abc29/go.mod h1:72LmHV9KJWB464cJMYgnWZqh3GiKgX70hjmgoYjR67Y=
381+
k8s.io/apimachinery v0.0.0-20240729091232-07dc100ca27c h1:PMvIiEyO6vNoHQCaeMmLduktIYCbou73s3P2+bHi0WE=
382+
k8s.io/apimachinery v0.0.0-20240729091232-07dc100ca27c/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc=
383+
k8s.io/apiserver v0.0.0-20240729142728-7514fdb6a6ac h1:Xk0ICVFbM2RqGMg7lR2P/hPxYgPgau85G6CIsys74Ps=
384+
k8s.io/apiserver v0.0.0-20240729142728-7514fdb6a6ac/go.mod h1:cUcCn3F2GvGLSOoEvQciXlyZGHCSz1xYlqEo2H1oXM0=
385+
k8s.io/client-go v0.0.0-20240729134403-274256ef2e49 h1:ji8+fwJy3/XFPV5PD9Fk0d1e/pyHgMRljLXTydeBLgE=
386+
k8s.io/client-go v0.0.0-20240729134403-274256ef2e49/go.mod h1:u9jdtWMo8BzDK2A9B3rKPfiBh6nXauWmbPbzEebo7kA=
387387
k8s.io/code-generator v0.0.0-20240419114927-e5a48a57f0c3 h1:A7f9PjcKHQ3unXNNiT/CJucFK5k6EYSPDO8RI7H9Zig=
388388
k8s.io/code-generator v0.0.0-20240419114927-e5a48a57f0c3/go.mod h1:QhvK5OXyy1YqgyAfa8QQ5SwnXCZwMAcvDdDvslhHXFA=
389389
k8s.io/component-base v0.0.0-20240405201845-0ac84ef15102 h1:0cfcZldzLbU9OCTNggwWSvwbmpfndqVA5FpzAdv2PZM=

0 commit comments

Comments
 (0)