Compare commits

...

2 Commits

Author SHA1 Message Date
Kubernetes Publisher d1c769757c Merge pull request #139665 from kmala/automated-cherry-pick-of-#137451-upstream-release-1.34
Automated cherry pick of #137451: Update google.golang.org/protobuf to v1.36.12-0.20260120151049-f2248ac996af to prevent file size explosion in go 1.26

Kubernetes-commit: 66a2fceb510fb4b213607c2cd0d3434e3fe97c73
2026-06-24 22:24:53 +00:00
Davanum Srinivas 4a21570efd Update google.golang.org/protobuf to v1.36.12-0.20260120151049-f2248ac996af
Pins google.golang.org/protobuf to HEAD commit f2248ac996afc39b3df0777cdcc269f6ade50b07
(v1.36.12-0.20260120151049-f2248ac996af) which includes fixes for dead code
elimination issues surfaced by Go 1.26's reflect changes.

Xref: https://github.com/golang/protobuf/issues/1704
Xref: https://github.com/kubernetes/kubernetes/issues/137445
Signed-off-by: Davanum Srinivas <davanum@gmail.com>

Kubernetes-commit: a76f455fdb8a34c06a4db4b84977742d4651b7a2
2026-03-05 09:36:13 -05:00
2 changed files with 15 additions and 15 deletions
+5 -5
View File
@@ -8,10 +8,10 @@ godebug default=go1.24
require (
golang.org/x/time v0.9.0
k8s.io/api v0.0.0-20260414142439-ad42a1f6281f
k8s.io/apimachinery v0.0.0-20260414140422-454f531d3fb5
k8s.io/client-go v0.0.0-20260414150839-e4156f317ef4
k8s.io/code-generator v0.0.0-20260414155020-71e885f23b31
k8s.io/api v0.0.0-20260624210519-f40c031f034b
k8s.io/apimachinery v0.0.0-20260624205654-57ea95fcdaa3
k8s.io/client-go v0.0.0-20260624211714-27c434297dec
k8s.io/code-generator v0.0.0-20260624213419-c7ca86d1caee
k8s.io/klog/v2 v2.130.1
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
)
@@ -48,7 +48,7 @@ require (
golang.org/x/term v0.30.0 // indirect
golang.org/x/text v0.23.0 // indirect
golang.org/x/tools v0.26.0 // indirect
google.golang.org/protobuf v1.36.5 // indirect
google.golang.org/protobuf v1.36.12-0.20260120151049-f2248ac996af // indirect
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
+10 -10
View File
@@ -128,8 +128,8 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM=
google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
google.golang.org/protobuf v1.36.12-0.20260120151049-f2248ac996af h1:+5/Sw3GsDNlEmu7TfklWKPdQ0Ykja5VEmq2i817+jbI=
google.golang.org/protobuf v1.36.12-0.20260120151049-f2248ac996af/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
@@ -140,14 +140,14 @@ gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
k8s.io/api v0.0.0-20260414142439-ad42a1f6281f h1:bQ05FDvLkBf2/i8N/dcgTokfOcXGYVsCNQ+6rCuuuYk=
k8s.io/api v0.0.0-20260414142439-ad42a1f6281f/go.mod h1:xFbNNlVozUtmDFtAKFz7wBnUNPLyvSOgl5NrQzgTf4c=
k8s.io/apimachinery v0.0.0-20260414140422-454f531d3fb5 h1:jQmnsCgD05DkvShkDJoIv9ABVPtiLUZj5afrklULUpg=
k8s.io/apimachinery v0.0.0-20260414140422-454f531d3fb5/go.mod h1:z7dd12Xd400CXIycE8nmn32xZhApV9zskHs0A5xeU/Q=
k8s.io/client-go v0.0.0-20260414150839-e4156f317ef4 h1:B7af+5cPMNWxq2lUrrOkYRhtbjCAnIcu9Ffxnv97erg=
k8s.io/client-go v0.0.0-20260414150839-e4156f317ef4/go.mod h1:9zVmksLtA36crGoZ4ZzOJMDKs8E1hOJXxLa+cmcoqdA=
k8s.io/code-generator v0.0.0-20260414155020-71e885f23b31 h1:GNEc+xzxfr1KCGVHzTC/VY53uxrAD07yC/rL1S2uTaI=
k8s.io/code-generator v0.0.0-20260414155020-71e885f23b31/go.mod h1:xpXzUYvPq2uzZLxKTIWohqsbx2qumYht02PRar0zOJU=
k8s.io/api v0.0.0-20260624210519-f40c031f034b h1:S1NaenfMF+HZGLA9YmjU0FZlybjrN1HsEXij9EsXcgU=
k8s.io/api v0.0.0-20260624210519-f40c031f034b/go.mod h1:NItVClwftaHvhfar+3HS3NTQwu7zTrX/1pQPRO0WK20=
k8s.io/apimachinery v0.0.0-20260624205654-57ea95fcdaa3 h1:LWdpq8y3oX5c7rFSrXTVrLvanZwrm5ukxTf7yBhCZ34=
k8s.io/apimachinery v0.0.0-20260624205654-57ea95fcdaa3/go.mod h1:gCxm98KdKjmJKLtGA2OQOIGmb3tY/csRmlQSymG3tLw=
k8s.io/client-go v0.0.0-20260624211714-27c434297dec h1:pq88ZEMWfz5J6RIemVd7FldYfyEdJWIFT7oRerbJd+U=
k8s.io/client-go v0.0.0-20260624211714-27c434297dec/go.mod h1:bVoPtiUwEVjqf7H+o4Ul/E651K+Yqgd4kow7g3fZV5Q=
k8s.io/code-generator v0.0.0-20260624213419-c7ca86d1caee h1:Pne4PjDhO9R+6bKybbNda30lztmxjt18UDdS4Z66ZJQ=
k8s.io/code-generator v0.0.0-20260624213419-c7ca86d1caee/go.mod h1:Cjg+8YvIu5c/hx0Z2DQviGJLd3TKTz/E9zwa9KsTXAc=
k8s.io/gengo/v2 v2.0.0-20250604051438-85fd79dbfd9f h1:SLb+kxmzfA87x4E4brQzB33VBbT2+x7Zq9ROIHmGn9Q=
k8s.io/gengo/v2 v2.0.0-20250604051438-85fd79dbfd9f/go.mod h1:EJykeLsmFC60UQbYJezXkEsG2FLrt0GPNkU5iK5GWxU=
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=