Skip to content

Commit

Permalink
Merge pull request #126300 from cici37/automated-cherry-pick-of-#1261…
Browse files Browse the repository at this point in the history
…67-upstream-release-1.30

Automated cherry pick of #126167: Hot fix for panic on schema conversion.

Kubernetes-commit: 935f5d5e43236e6e40d4780a1511f75e8589a02e
  • Loading branch information
k8s-publishing-bot committed Jul 31, 2024
1 parent acd049c commit 76b79cf
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
8 changes: 4 additions & 4 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ require (
google.golang.org/grpc v1.58.3
google.golang.org/protobuf v1.33.0
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.0.0-20240510083903-0fd470c38104
k8s.io/apimachinery v0.0.0-20240405200823-37988e577e16
k8s.io/apiserver v0.0.0-20240604053420-7a3db503744e
k8s.io/client-go v0.0.0-20240510085155-4e1652b143b3
k8s.io/api v0.0.0-20240729133035-48606d9abc29
k8s.io/apimachinery v0.0.0-20240729091232-07dc100ca27c
k8s.io/apiserver v0.0.0-20240729142728-7514fdb6a6ac
k8s.io/client-go v0.0.0-20240729134403-274256ef2e49
k8s.io/code-generator v0.0.0-20240419114927-e5a48a57f0c3
k8s.io/component-base v0.0.0-20240405201845-0ac84ef15102
k8s.io/klog/v2 v2.120.1
Expand Down
16 changes: 8 additions & 8 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -376,14 +376,14 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
k8s.io/api v0.0.0-20240510083903-0fd470c38104 h1:CsFjvCQX86vxV6SVLgl1dVWNAGzdR3vaziQchmYNnXo=
k8s.io/api v0.0.0-20240510083903-0fd470c38104/go.mod h1:72LmHV9KJWB464cJMYgnWZqh3GiKgX70hjmgoYjR67Y=
k8s.io/apimachinery v0.0.0-20240405200823-37988e577e16 h1:GjoXk5Gb8LqhZJjGbYOqIw8JbuDJZv9MKd94i2DXzg8=
k8s.io/apimachinery v0.0.0-20240405200823-37988e577e16/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc=
k8s.io/apiserver v0.0.0-20240604053420-7a3db503744e h1:p0Ukd6b3/q+TCOepCxmX5szsNQJzML/3WRo4H9YJDBg=
k8s.io/apiserver v0.0.0-20240604053420-7a3db503744e/go.mod h1:ASsutdmVmPQmuaOw8qreHNMuW09bDiKGzCPhm2c7DGY=
k8s.io/client-go v0.0.0-20240510085155-4e1652b143b3 h1:3QobH/DptkfvbDtWgUzxCwbuoGRL8WzlJyrCx1NNU7w=
k8s.io/client-go v0.0.0-20240510085155-4e1652b143b3/go.mod h1:lvbxFeJeLdTXhYLUuaGD2ptt/R+9cCQ8FZvnmF+OBaM=
k8s.io/api v0.0.0-20240729133035-48606d9abc29 h1:hpnrekf6Yh+i8umj6eSe/nk9lj9Ed0E0b5iZMuD4y+M=
k8s.io/api v0.0.0-20240729133035-48606d9abc29/go.mod h1:72LmHV9KJWB464cJMYgnWZqh3GiKgX70hjmgoYjR67Y=
k8s.io/apimachinery v0.0.0-20240729091232-07dc100ca27c h1:PMvIiEyO6vNoHQCaeMmLduktIYCbou73s3P2+bHi0WE=
k8s.io/apimachinery v0.0.0-20240729091232-07dc100ca27c/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc=
k8s.io/apiserver v0.0.0-20240729142728-7514fdb6a6ac h1:Xk0ICVFbM2RqGMg7lR2P/hPxYgPgau85G6CIsys74Ps=
k8s.io/apiserver v0.0.0-20240729142728-7514fdb6a6ac/go.mod h1:cUcCn3F2GvGLSOoEvQciXlyZGHCSz1xYlqEo2H1oXM0=
k8s.io/client-go v0.0.0-20240729134403-274256ef2e49 h1:ji8+fwJy3/XFPV5PD9Fk0d1e/pyHgMRljLXTydeBLgE=
k8s.io/client-go v0.0.0-20240729134403-274256ef2e49/go.mod h1:u9jdtWMo8BzDK2A9B3rKPfiBh6nXauWmbPbzEebo7kA=
k8s.io/code-generator v0.0.0-20240419114927-e5a48a57f0c3 h1:A7f9PjcKHQ3unXNNiT/CJucFK5k6EYSPDO8RI7H9Zig=
k8s.io/code-generator v0.0.0-20240419114927-e5a48a57f0c3/go.mod h1:QhvK5OXyy1YqgyAfa8QQ5SwnXCZwMAcvDdDvslhHXFA=
k8s.io/component-base v0.0.0-20240405201845-0ac84ef15102 h1:0cfcZldzLbU9OCTNggwWSvwbmpfndqVA5FpzAdv2PZM=
Expand Down

0 comments on commit 76b79cf

Please sign in to comment.