Skip to content

Commit

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

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

Kubernetes-commit: 138e2d568af302b593b771f8fe076d2868464707
  • Loading branch information
k8s-publishing-bot committed Jul 31, 2024
1 parent e44332a commit 7d4dcbf
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-20240404161350-448db12cecfb
k8s.io/apimachinery v0.0.0-20240404161013-3e7c65a7bc4d
k8s.io/apiserver v0.0.0-20240404164637-a4273cc011f1
k8s.io/client-go v0.0.0-20240404162704-0058eeef6a23
k8s.io/api v0.0.0-20240729132826-403c8539e45f
k8s.io/apimachinery v0.0.0-20240405121012-2bbf53022625
k8s.io/apiserver v0.0.0-20240729142257-d5bfbb319d1f
k8s.io/client-go v0.0.0-20240405121907-1e7adee6a0ce
k8s.io/code-generator v0.0.0-20240404163324-3f91291add43
k8s.io/component-base v0.0.0-20240404163600-1c2da834f8fb
k8s.io/klog/v2 v2.110.1
Expand Down
16 changes: 8 additions & 8 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -393,14 +393,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-20240404161350-448db12cecfb h1:/uYBtjPF21kf1qLyVVXGQOcFcjjqGowAssqopfbjQB0=
k8s.io/api v0.0.0-20240404161350-448db12cecfb/go.mod h1:dPhF9d7Kl/mI8T1SzZBp2/saFzES5J24O1PGAwNajB0=
k8s.io/apimachinery v0.0.0-20240404161013-3e7c65a7bc4d h1:bth65kuQyrmaqeI1unRAE9O4KtHWeblZ8mIZEjpOuc4=
k8s.io/apimachinery v0.0.0-20240404161013-3e7c65a7bc4d/go.mod h1:i3FJVwhvSp/6n8Fl4K97PJEP8C+MM+aoDq4+ZJBf70Y=
k8s.io/apiserver v0.0.0-20240404164637-a4273cc011f1 h1:NUpP/eDJzhBzyYLGnm7WPj7elcfxz4Akm46MSb2Fjqw=
k8s.io/apiserver v0.0.0-20240404164637-a4273cc011f1/go.mod h1:Qq691YBU1fN85SgR7FB/NVCDdEIxXbuCr+LLJvXr1Bk=
k8s.io/client-go v0.0.0-20240404162704-0058eeef6a23 h1:hByyJAlM0bM9BNoT1dP0Ty9lc6bA5rheUtXDjbR8Ldw=
k8s.io/client-go v0.0.0-20240404162704-0058eeef6a23/go.mod h1:FV/EgUZ4sWpLZgNY0A6/58fw4PqqSiIypAF12Ma6Rno=
k8s.io/api v0.0.0-20240729132826-403c8539e45f h1:qjIlRtcOjihNAb4DcEqQZrGA6eV+MvV5nFUg8tOa1xg=
k8s.io/api v0.0.0-20240729132826-403c8539e45f/go.mod h1:AFqQkkEfmsUH52cPeKeWVm6eQZJUan7p62A0JEH+azM=
k8s.io/apimachinery v0.0.0-20240405121012-2bbf53022625 h1:itYkKr52W3ugNsYoBZwpwcezu/vPxg3GK7XVkX24GAo=
k8s.io/apimachinery v0.0.0-20240405121012-2bbf53022625/go.mod h1:i3FJVwhvSp/6n8Fl4K97PJEP8C+MM+aoDq4+ZJBf70Y=
k8s.io/apiserver v0.0.0-20240729142257-d5bfbb319d1f h1:JiZs9BvQroH6iTCnd6c7BdC44W/v1KLkiDx8Vn+XrkA=
k8s.io/apiserver v0.0.0-20240729142257-d5bfbb319d1f/go.mod h1:vI3XyQLuAwZ5t5HD7Y6szlATlX65pW54lXNc10ZXOx8=
k8s.io/client-go v0.0.0-20240405121907-1e7adee6a0ce h1:z43ZNSMgeAmGh1n7NYStCKb0ZzlJvZje79+PbHMcaRM=
k8s.io/client-go v0.0.0-20240405121907-1e7adee6a0ce/go.mod h1:WUmefL+57tMtrBz2EEfhBeTSndZv0F1xjA8LCWMs7/k=
k8s.io/code-generator v0.0.0-20240404163324-3f91291add43 h1:0QB/nGphjfh9FU6BRLldU3pOctt2dkIiRZgbbjEcbDY=
k8s.io/code-generator v0.0.0-20240404163324-3f91291add43/go.mod h1:7TYnI0dYItL2cKuhhgPSuF3WED9uMdELgbVXFfn/joE=
k8s.io/component-base v0.0.0-20240404163600-1c2da834f8fb h1:fwRjV6mSoBicYMk9toq/gR9OKejTTMLNz3GrpSxGiVQ=
Expand Down

0 comments on commit 7d4dcbf

Please sign in to comment.