Merge pull request #123763 from liggitt/proto-1.29

[1.29][CVE-2024-24786] Bump github.com/golang/protobuf v1.5.4, google.golang.org/protobuf v1.33.0

Kubernetes-commit: a6fe782283fbe8af43d4d8990a5b3b8b72822ab4

go.mod

@@ -39,15 +39,15 @@ require (
 	golang.org/x/time v0.3.0
 	google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e
 	google.golang.org/grpc v1.58.3
-	google.golang.org/protobuf v1.31.0
+	google.golang.org/protobuf v1.33.0
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1
 	gopkg.in/square/go-jose.v2 v2.6.0
-	k8s.io/api v0.0.0-20240209025148-f5eca0431ee2
-	k8s.io/apimachinery v0.0.0-20240110172605-dc7e034c8647
-	k8s.io/client-go v0.0.0-20240110175813-baea19d6e81c
-	k8s.io/component-base v0.0.0-20240209134822-e8f624c76367
+	k8s.io/api v0.0.0-20240313000607-f98a50355b81
+	k8s.io/apimachinery v0.0.0-20240312235255-d794766488ac
+	k8s.io/client-go v0.0.0-20240313002401-403b37f3ba57
+	k8s.io/component-base v0.0.0-20240313004157-bdb0447fa7fd
 	k8s.io/klog/v2 v2.110.1
-	k8s.io/kms v0.0.0-20240110181705-7d9c51ea7c86
+	k8s.io/kms v0.0.0-20240313004656-694e505cc7f6
 	k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00
 	k8s.io/utils v0.0.0-20230726121419-3b25d923346b
 	sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0
@@ -75,7 +75,7 @@ require (
 	github.com/go-openapi/swag v0.22.3 // indirect
 	github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/google/btree v1.0.1 // indirect
 	github.com/gorilla/websocket v1.5.0 // indirect
 	github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
@@ -126,9 +126,9 @@ require (
 )
 
 replace (
-	k8s.io/api => k8s.io/api v0.0.0-20240209025148-f5eca0431ee2
-	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20240110172605-dc7e034c8647
-	k8s.io/client-go => k8s.io/client-go v0.0.0-20240110175813-baea19d6e81c
-	k8s.io/component-base => k8s.io/component-base v0.0.0-20240209134822-e8f624c76367
-	k8s.io/kms => k8s.io/kms v0.0.0-20240110181705-7d9c51ea7c86
+	k8s.io/api => k8s.io/api v0.0.0-20240313000607-f98a50355b81
+	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20240312235255-d794766488ac
+	k8s.io/client-go => k8s.io/client-go v0.0.0-20240313002401-403b37f3ba57
+	k8s.io/component-base => k8s.io/component-base v0.0.0-20240313004157-bdb0447fa7fd
+	k8s.io/kms => k8s.io/kms v0.0.0-20240313004656-694e505cc7f6
 )

go.sum

@@ -93,9 +93,8 @@ github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5y
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
-github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
-github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
+github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
 github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4=
 github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA=
 github.com/google/cel-go v0.17.7 h1:6ebJFzu1xO2n7TLtN+UBqShGBhlD85bhvglh5DpcfqQ=
@@ -104,7 +103,6 @@ github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvR
 github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
@@ -372,10 +370,8 @@ google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3Iji
 google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
 google.golang.org/grpc v1.58.3 h1:BjnpXut1btbtgN/6sp+brB2Kbm2LjNXnidYujAVbSoQ=
 google.golang.org/grpc v1.58.3/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0=
-google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
-google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
+google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
@@ -397,18 +393,18 @@ 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-20240209025148-f5eca0431ee2 h1:SalYyqp9fvQyZ64OIop5pLm+DH7HaHrAVWzy/QqOPTo=
-k8s.io/api v0.0.0-20240209025148-f5eca0431ee2/go.mod h1:JS1rn0RBc46vCh2T2+zcnx+oNtvh+pDndpURdiWnHNc=
-k8s.io/apimachinery v0.0.0-20240110172605-dc7e034c8647 h1:SfqmT8ezTnkZc9G0t8b4s6+Z6zT/rMKhZm9yQq5wG+U=
-k8s.io/apimachinery v0.0.0-20240110172605-dc7e034c8647/go.mod h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU=
-k8s.io/client-go v0.0.0-20240110175813-baea19d6e81c h1:S8iocBcKfLfrC9VQy38QMJeChfF3B5QwJKsNrA9MI0Q=
-k8s.io/client-go v0.0.0-20240110175813-baea19d6e81c/go.mod h1:6kNfSLAoK7xQAWeKaZ62IQvDSLEls0B+w4UQJccyOeA=
-k8s.io/component-base v0.0.0-20240209134822-e8f624c76367 h1:Q4SaLmQN3GqolvuSDFCLzleahOH9h0Y7dsxNpq5YDbw=
-k8s.io/component-base v0.0.0-20240209134822-e8f624c76367/go.mod h1:s4r3xv/3wbRDAnNz5xknR/iov2c/3lOCAK34CuK2JWE=
+k8s.io/api v0.0.0-20240313000607-f98a50355b81 h1:JltflPI0OPaReXisLYHX211RW8ct8miX+jjmb/ib2Aw=
+k8s.io/api v0.0.0-20240313000607-f98a50355b81/go.mod h1:GH4vol2evGhw3mt5/hOpSywnK47aAJeEkwaLgC1y4Q4=
+k8s.io/apimachinery v0.0.0-20240312235255-d794766488ac h1:mRSdlc0EJz8+NtG2b/7SE3lSNNQuA4ANvq0eE5pAMEk=
+k8s.io/apimachinery v0.0.0-20240312235255-d794766488ac/go.mod h1:hx/S4V2PNW4OMg3WizRrHutyB5la0iCUbZym+W0EQIU=
+k8s.io/client-go v0.0.0-20240313002401-403b37f3ba57 h1:R1HYjIrQfDf83EoBAk4sdZkEfd4xx8neXACkW0B013g=
+k8s.io/client-go v0.0.0-20240313002401-403b37f3ba57/go.mod h1:T6SfTUWXj+IzjMokQUTT+W8a3vlTnIoK0chqEAUL1vc=
+k8s.io/component-base v0.0.0-20240313004157-bdb0447fa7fd h1:eNQ6qFQOH4Vg672OCrl3AcbX8d9iPcn04dFpeSe9aC8=
+k8s.io/component-base v0.0.0-20240313004157-bdb0447fa7fd/go.mod h1:OGpB+ezbqr/HKTeWsAXfDcl8jX95znqdKvK6m527jvQ=
 k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0=
 k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo=
-k8s.io/kms v0.0.0-20240110181705-7d9c51ea7c86 h1:z/xBbZa3arvKiJAZhjeBHPEyZCI5Wa6wKV+6ezOjnro=
-k8s.io/kms v0.0.0-20240110181705-7d9c51ea7c86/go.mod h1:RdHMTd5rUZJgGr62LhKWDIm7AHxrtOFTK1O/58aR5jE=
+k8s.io/kms v0.0.0-20240313004656-694e505cc7f6 h1:GrStofgSMqgun5V5K/phusYaWO7ABmG7dD/SOa4N1ts=
+k8s.io/kms v0.0.0-20240313004656-694e505cc7f6/go.mod h1:5wR7xtD6m9j1QrSOzG6EMvgNoLbgwIRC8Eb55utKD78=
 k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/AuzbMm96cd3YHRTU83I780=
 k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA=
 k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI=