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
Update google.golang.org/protobuf to v1.36.12-0.20260120151049-f2248ac996af
2026-06-26 00:00:07 +08:00 · 2026-06-24 22:24:53 +00:00 · 2026-03-05 09:36:13 -05:00 · 2026-04-14 18:04:24 +00:00 · 2026-04-14 18:04:22 +00:00 · 2026-04-13 14:22:13 -04:00
2 changed files with 22 additions and 22 deletions
@@ -8,10 +8,10 @@ godebug default=go1.24

 require (
 	golang.org/x/time v0.9.0
-	k8s.io/api v0.0.0-20250725024535-b95b43d5b95d
-	k8s.io/apimachinery v0.0.0-20250725024258-04507a37f6a4
-	k8s.io/client-go v0.0.0-20250725024918-f78361a6474d
-	k8s.io/code-generator v0.0.0-20250725025733-9699fe1ce98e
+	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
 )
@@ -20,7 +20,7 @@ require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/emicklei/go-restful/v3 v3.12.2 // indirect
 	github.com/fxamacker/cbor/v2 v2.9.0 // indirect
-	github.com/go-logr/logr v1.4.2 // indirect
+	github.com/go-logr/logr v1.4.3 // indirect
 	github.com/go-openapi/jsonpointer v0.21.0 // indirect
 	github.com/go-openapi/jsonreference v0.20.2 // indirect
 	github.com/go-openapi/swag v0.23.0 // indirect
@@ -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
@@ -6,8 +6,8 @@ github.com/emicklei/go-restful/v3 v3.12.2 h1:DhwDP0vY3k8ZzE0RunuJy8GhNpPL6zqLkDf
 github.com/emicklei/go-restful/v3 v3.12.2/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
 github.com/fxamacker/cbor/v2 v2.9.0 h1:NpKPmjDBgUfBms6tr6JZkTHtfFGcMKsw3eGcmD/sapM=
 github.com/fxamacker/cbor/v2 v2.9.0/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ=
-github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
-github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
+github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
+github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs=
 github.com/go-openapi/jsonpointer v0.21.0 h1:YgdVicSA9vH5RiHs9TZW5oyafXZFc6+2Vc1rr/O9oNQ=
 github.com/go-openapi/jsonpointer v0.21.0/go.mod h1:IUyH9l/+uyhIYQ/PXVA41Rexl+kOkAPDdXEYns6fzUY=
@@ -60,8 +60,8 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
-github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
+github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
+github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
 github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=
 github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
@@ -73,8 +73,8 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
-github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
+github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
 github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
 github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -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-20250725024535-b95b43d5b95d h1:OdC1L69BYvh/4HX6Wgg7DeL0A++gD3gadKfaWT4IdbA=
-k8s.io/api v0.0.0-20250725024535-b95b43d5b95d/go.mod h1:wKZv1VB6nzJ6L449TteVelrBfRsawhrthiOsEylKo8U=
-k8s.io/apimachinery v0.0.0-20250725024258-04507a37f6a4 h1:N25HX4lRPTvLHSUPoCMFP+B/oEcOmPESB+BRkYMD8Io=
-k8s.io/apimachinery v0.0.0-20250725024258-04507a37f6a4/go.mod h1:/GwIlEcWuTX9zKIg2mbw0LRFIsXwrfoVxn+ef0X13lw=
-k8s.io/client-go v0.0.0-20250725024918-f78361a6474d h1:8i9q3fd352G8FsurDLj4++5oMS4gWqZ5O2lErveG9Ok=
-k8s.io/client-go v0.0.0-20250725024918-f78361a6474d/go.mod h1:j4aKw1XACZSFUnRBqWNU0d3TXbXzaBhAbazCrGTYHdg=
-k8s.io/code-generator v0.0.0-20250725025733-9699fe1ce98e h1:xIcgxMk7abLdchUvuHOGpb4bl9hlD3MKxYyhzFtRv2c=
-k8s.io/code-generator v0.0.0-20250725025733-9699fe1ce98e/go.mod h1:hOF9HJDEnMzeiWVAV71QA3R14zK/zfwS5JZ/+YIbd3w=
+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=
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
Kubernetes Publisher	9e69c2aec8	Merge pull request #138357 from dims/update-moby-spdystream-v0.5.1-1.34 [1.34] Update github.com/moby/spdystream from v0.5.0 to v0.5.1 Kubernetes-commit: ca12702454dbad87694dcabe97c5112a4a437a90	2026-04-14 18:04:24 +00:00
Kubernetes Publisher	eb7d923610	Merge pull request #138349 from dashpole/update_prop_34 [release-1.34] Update go.opentelemetry.io/otel to v1.41.0 Kubernetes-commit: 678244eee1990c685faade85b513e981c4d65e1c	2026-04-14 18:04:22 +00:00
Davanum Srinivas	0f433e8d9f	Update github.com/moby/spdystream from v0.5.0 to v0.5.1 Kubernetes-commit: 7e9c2c8eef26f99aa2f94d8e09d6d32de86c7769 Kubernetes-commit: 4b3d41fae7331a1d9b62e7a362307e31fb400431	2026-04-13 14:22:13 -04:00
David Ashpole	68a39da978	update go.opentelemetry.io/otel to v1.41.0 Kubernetes-commit: 27f03ccf2d87c03a9b105af127b13ed62f2d920c	2026-04-13 14:42:47 +00:00
Kubernetes Publisher	46ba99e9f8	Merge remote-tracking branch 'origin/master' into release-1.34 Kubernetes-commit: c5d688bb1020431135dabe225e562052c0b296e3	2025-08-16 11:00:53 +00:00