Merge pull request #132269 from dims/update-to-latest-github.com/modern-go/reflect2

Update to latest github.com/modern-go/reflect2 Kubernetes-commit: d55b119d34883bbad2a3436dcb6c62339d963031
Update to latest github.com/modern-go/reflect2
2025-06-12 20:48:08 +00:00 · 2025-06-12 11:20:39 -04:00 · 2025-06-12 00:37:31 +00:00 · 2025-06-11 16:46:03 -04:00 · 2025-06-10 20:39:56 +00:00 · 2025-06-10 10:50:54 -04:00
6 changed files with 161 additions and 56 deletions
--- a/config/v1/types.go
+++ b/config/v1/types.go
@ -134,6 +134,8 @@ type ServiceAccountTokenAttributes struct {
 	// additional information required to fetch credentials or allow workloads to opt in to
 	// using service account tokens for image pull.
 	// If non-empty, requireServiceAccount must be set to true.
 	// Keys in this list must be unique.
 	// This list needs to be mutually exclusive with optionalServiceAccountAnnotationKeys.
 	// +optional
 	// +listType=set
 	RequiredServiceAccountAnnotationKeys []string `json:"requiredServiceAccountAnnotationKeys,omitempty"`
@ -145,6 +147,7 @@ type ServiceAccountTokenAttributes struct {
 	// the existence of annotations and their values.
 	// This field is optional and may be empty. Plugins may use this field to extract
 	// additional information required to fetch credentials.
 	// Keys in this list must be unique.
 	// +optional
 	// +listType=set
 	OptionalServiceAccountAnnotationKeys []string `json:"optionalServiceAccountAnnotationKeys,omitempty"`
--- a/config/v1beta1/types.go
+++ b/config/v1beta1/types.go
@ -923,7 +923,7 @@ type KubeletConfiguration struct {
 	FailCgroupV1 *bool `json:"failCgroupV1,omitempty"`
 	// UserNamespaces contains User Namespace configurations.
-	// +featureGate=UserNamespaceSupport
+	// +featureGate=UserNamespacesSupport
 	// +optional
 	UserNamespaces *UserNamespaces `json:"userNamespaces,omitempty"`
 }
@ -1131,7 +1131,7 @@ type UserNamespaces struct {
 	// Changing the value may require recreating all containers on the node.
 	//
 	// Default: 65536
-	// +featureGate=UserNamespaceSupport
+	// +featureGate=UserNamespacesSupport
 	// +optional
 	IDsPerPod *int64 `json:"idsPerPod,omitempty"`
 }
--- a/go.mod
+++ b/go.mod
@ -10,15 +10,16 @@ require (
 	github.com/emicklei/go-restful/v3 v3.11.0
 	github.com/gogo/protobuf v1.3.2
 	github.com/stretchr/testify v1.10.0
-	google.golang.org/grpc v1.68.1
+	go.uber.org/goleak v1.3.0
-	k8s.io/api v0.0.0-20250401102040-dc8867983a6e
+	google.golang.org/grpc v1.72.1
-	k8s.io/apimachinery v0.0.0-20250401101805-7b4292bd2e85
+	k8s.io/api v0.0.0-20250612195650-7efafe3627c8
-	k8s.io/apiserver v0.0.0-20250401105901-beaef1d3ecb9
+	k8s.io/apimachinery v0.0.0-20250612195403-e0270fe44c97
-	k8s.io/client-go v0.0.0-20250401103247-18a1faa115ed
+	k8s.io/apiserver v0.0.0-20250612202325-89f1e0c9f7d8
-	k8s.io/component-base v0.0.0-20250401105049-cc24073df84f
+	k8s.io/client-go v0.0.0-20250612200049-4e82e684120e
-	k8s.io/cri-api v0.0.0-20250401112043-c9a9c280d850
+	k8s.io/component-base v0.0.0-20250612201519-d0c00e6471f7
 	k8s.io/cri-api v0.0.0-20250527182550-7d025a3cd8e3
 	k8s.io/klog/v2 v2.130.1
-	k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
+	k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
 )
 require (
@ -26,7 +27,7 @@ require (
 	github.com/blang/semver/v4 v4.0.0 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/fxamacker/cbor/v2 v2.7.0 // indirect
+	github.com/fxamacker/cbor/v2 v2.8.0 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/google/go-cmp v0.7.0 // indirect
 	github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
@ -34,31 +35,31 @@ require (
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/moby/spdystream v0.5.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/prometheus/client_golang v1.22.0-rc.0 // indirect
+	github.com/prometheus/client_golang v1.22.0 // indirect
 	github.com/prometheus/client_model v0.6.1 // indirect
 	github.com/prometheus/common v0.62.0 // indirect
 	github.com/prometheus/procfs v0.15.1 // indirect
-	github.com/spf13/cobra v1.8.1 // indirect
+	github.com/spf13/cobra v1.9.1 // indirect
-	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/spf13/pflag v1.0.6 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
-	go.opentelemetry.io/otel v1.33.0 // indirect
+	go.opentelemetry.io/otel v1.35.0 // indirect
-	go.opentelemetry.io/otel/trace v1.33.0 // indirect
+	go.opentelemetry.io/otel/trace v1.35.0 // indirect
 	golang.org/x/net v0.38.0 // indirect
 	golang.org/x/oauth2 v0.27.0 // indirect
 	golang.org/x/sys v0.31.0 // indirect
 	golang.org/x/term v0.30.0 // indirect
 	golang.org/x/text v0.23.0 // indirect
 	golang.org/x/time v0.9.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb // indirect
 	google.golang.org/protobuf v1.36.5 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
 	sigs.k8s.io/randfill v1.0.0 // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
 	sigs.k8s.io/yaml v1.4.0 // indirect
 )
--- a/go.sum
+++ b/go.sum
@ -6,16 +6,18 @@ github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM
 github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ=
 github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
 github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
+github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g=
 github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
-github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E=
+github.com/fxamacker/cbor/v2 v2.8.0 h1:fFtUGXUzXPHTIUdne5+zzMPTfffl3RD5qYnkY40vtxU=
-github.com/fxamacker/cbor/v2 v2.7.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ=
+github.com/fxamacker/cbor/v2 v2.8.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/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
 github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
 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=
 github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE=
@ -59,8 +61,9 @@ github.com/moby/spdystream v0.5.0/go.mod h1:xBAYlnt/ay+11ShkdFKNAG7LsyK/tmNBVvVO
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee h1:W5t00kpgFdJifH4BDsTlE89Zl93FEloxaWZfGcifgq8=
 github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J1GEMiLbxo1LJaP8RfCpH6pymGZus=
@ -69,8 +72,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/prometheus/client_golang v1.22.0-rc.0 h1:meoqLyZIVEIiQxZmyVTOnzk/bA+n2pN2MXN8pSzX2ws=
+github.com/prometheus/client_golang v1.22.0 h1:rb93p9lokFEsctTys46VnV1kLCDpVZ0a/Y92Vm0Zc6Q=
-github.com/prometheus/client_golang v1.22.0-rc.0/go.mod h1:R7ljNsLXhuQXYZYtw6GAE9AZg8Y7vEW5scdCXrWRXC0=
+github.com/prometheus/client_golang v1.22.0/go.mod h1:R7ljNsLXhuQXYZYtw6GAE9AZg8Y7vEW5scdCXrWRXC0=
 github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
 github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
 github.com/prometheus/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ2Io=
@ -80,10 +83,10 @@ github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoG
 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/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM=
+github.com/spf13/cobra v1.9.1 h1:CXSaggrXdbHK9CF+8ywj8Amf7PBRmPCOJugH954Nnlo=
-github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y=
+github.com/spf13/cobra v1.9.1/go.mod h1:nDyEzZ8ogv936Cinf6g1RU9MRY64Ir93oCnqb9wxYW0=
-github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
+github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=
-github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
 github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
@ -94,10 +97,20 @@ 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=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-go.opentelemetry.io/otel v1.33.0 h1:/FerN9bax5LoK51X/sI0SVYrjSE0/yUL7DpxW4K3FWw=
+go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
-go.opentelemetry.io/otel v1.33.0/go.mod h1:SUUkR6csvUQl+yjReHu5uM3EtVV7MBm5FHKRlNx4I8I=
+go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
-go.opentelemetry.io/otel/trace v1.33.0 h1:cCJuF7LRjUFso9LPnEAHJDB2pqzp+hbO8eu1qqW2d/s=
+go.opentelemetry.io/otel v1.35.0 h1:xKWKPxrxB6OtMCbmMY021CqC45J+3Onta9MqjhnusiQ=
-go.opentelemetry.io/otel/trace v1.33.0/go.mod h1:uIcdVUZMpTAmz0tI1z04GoVSezK37CbGV4fr1f2nBck=
+go.opentelemetry.io/otel v1.35.0/go.mod h1:UEqy8Zp11hpkUrL73gSlELM0DupHoiq72dR+Zqel/+Y=
 go.opentelemetry.io/otel/metric v1.35.0 h1:0znxYu2SNyuMSQT4Y9WDWej0VpcsxkuklLa4/siN90M=
 go.opentelemetry.io/otel/metric v1.35.0/go.mod h1:nKVFgxBZ2fReX6IlyW28MgZojkoAkJGaE8CpgeAU3oE=
 go.opentelemetry.io/otel/sdk v1.34.0 h1:95zS4k/2GOy069d321O8jWgYsW3MzVV+KuSPKp7Wr1A=
 go.opentelemetry.io/otel/sdk v1.34.0/go.mod h1:0e/pNiaMAqaykJGKbi+tSjWfNNHMTxoC9qANsCzbyxU=
 go.opentelemetry.io/otel/sdk/metric v1.34.0 h1:5CeK9ujjbFVL5c1PhLuStg1wxA7vQv7ce1EK0Gyvahk=
 go.opentelemetry.io/otel/sdk/metric v1.34.0/go.mod h1:jQ/r8Ze28zRKoNRdkjCZxfs6YvBTG1+YIqyFVFYec5w=
 go.opentelemetry.io/otel/trace v1.35.0 h1:dPpEfJu1sDIqruz7BHFG3c7528f6ddfSWfFDVt/xgMs=
 go.opentelemetry.io/otel/trace v1.35.0/go.mod h1:WUk7DtFp1Aw2MkvqGdwiXYDZZNvA/1J8o6xRXLrIkyc=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
 go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
@ -135,10 +148,10 @@ 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/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 h1:8ZmaLZE4XWrtU3MyClkYqqtl6Oegr3235h7jxsDyqCY=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb h1:TLPQVbx1GJ8VKZxz52VAxl1EBgKXXbTiU9Fc5fZeLn4=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576/go.mod h1:5uTbfoYQed2U9p3KIj2/Zzm02PYhndfdmML0qC3q3FU=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb/go.mod h1:LuRYeWDFV6WOn90g357N17oMCaxpgCnbi/44qJvDn2I=
-google.golang.org/grpc v1.68.1 h1:oI5oTa11+ng8r8XMMN7jAOmWfPZWbYpCFaMUTACxkM0=
+google.golang.org/grpc v1.72.1 h1:HR03wO6eyZ7lknl75XlxABNVLLFc2PAb6mHlYh756mA=
-google.golang.org/grpc v1.68.1/go.mod h1:+q1XYFJjShcqn0QZHvCyeR4CXPA+llXIeUIfIe00waw=
+google.golang.org/grpc v1.72.1/go.mod h1:wH5Aktxcg25y1I3w7H69nHfXdOG3UiadoBtjh3izSDM=
 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=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@ -150,30 +163,30 @@ gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
 gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
 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-20250401102040-dc8867983a6e h1:oY/yt517XLctfPgsZl3UBOunhhwj3p957k5ptQZIl7A=
+k8s.io/api v0.0.0-20250612195650-7efafe3627c8 h1:K1AnJQBQTKLy2C/up2YSFuuQ+OBucYGcDCBO2cafjlQ=
-k8s.io/api v0.0.0-20250401102040-dc8867983a6e/go.mod h1:FFhGt5u35h2C+LO52B0n4kxNjVzqZJieArQBpannX+s=
+k8s.io/api v0.0.0-20250612195650-7efafe3627c8/go.mod h1:+9QbMyXTXctHAXg3fdhJbuZgyzhYgprCn43M5NqoJzw=
-k8s.io/apimachinery v0.0.0-20250401101805-7b4292bd2e85 h1:eN9elIIXhVi5aK03Qb89lKWm8zpKmuhNjZLMt7fXZig=
+k8s.io/apimachinery v0.0.0-20250612195403-e0270fe44c97 h1:h2og30eGCCk1GOEZK6+LNhhlydDcWY3wJaWDIs05xR8=
-k8s.io/apimachinery v0.0.0-20250401101805-7b4292bd2e85/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM=
+k8s.io/apimachinery v0.0.0-20250612195403-e0270fe44c97/go.mod h1:EZ7eIfFAwky7ktmG4Pu9XWxBxFG++4dxPDOM0GL3abw=
-k8s.io/apiserver v0.0.0-20250401105901-beaef1d3ecb9 h1:9T9RaXPDFM935RJUU8jCyUqwKft973LCiXbV5u2bQsw=
+k8s.io/apiserver v0.0.0-20250612202325-89f1e0c9f7d8 h1:ParTrAI+8gMCqiYjD9B33XZxNnODITRKi0I/rJCJmTY=
-k8s.io/apiserver v0.0.0-20250401105901-beaef1d3ecb9/go.mod h1:QrpjHOIPTmZhzoSOMzPEEgu9Z2H5+macsAkp9n6rA1E=
+k8s.io/apiserver v0.0.0-20250612202325-89f1e0c9f7d8/go.mod h1:h9Mz8g41T/MRlrcxnfKoj9omNrKtKvdaDRhX34SVi5A=
-k8s.io/client-go v0.0.0-20250401103247-18a1faa115ed h1:O80bglccVvjn9M6m1artcLIXlXn47cwP7XDXaz+Z7X4=
+k8s.io/client-go v0.0.0-20250612200049-4e82e684120e h1:xoSxEgTvcAD7YG46B6RN1yZx5KhF0YKNe4SSoY+qSQA=
-k8s.io/client-go v0.0.0-20250401103247-18a1faa115ed/go.mod h1:T+upHK4/WC+12wVOCcBdmtoRQr5A5U0IOVk9FR4b93c=
+k8s.io/client-go v0.0.0-20250612200049-4e82e684120e/go.mod h1:hktzpPyrdfB1WrXOvdnDayNSrngzEwWjiwTGqq6Zjns=
-k8s.io/component-base v0.0.0-20250401105049-cc24073df84f h1:VGrKHHvzVFW2NBGuzX6Dg9BilPOybOwmWXybdpuNfWU=
+k8s.io/component-base v0.0.0-20250612201519-d0c00e6471f7 h1:PmR3IJeL8qbnqdH70lmCLxZjHFr+Cbz5v6VY6ZFlMsI=
-k8s.io/component-base v0.0.0-20250401105049-cc24073df84f/go.mod h1:AOhLFGgSoM0sA47N5DEUyMHoDUUHAXi2oCqoQVup0qM=
+k8s.io/component-base v0.0.0-20250612201519-d0c00e6471f7/go.mod h1:eMJvxKozNu3AbHhH6mWUJbzNhElacCbAilLeMjxIW5k=
-k8s.io/cri-api v0.0.0-20250401112043-c9a9c280d850 h1:o3jhZdhijhINe/s37iFYguu3/H80rL9ZYGv1Uj5LsFg=
+k8s.io/cri-api v0.0.0-20250527182550-7d025a3cd8e3 h1:r4SV0gc6fVMJPOUEhuyAt8FG1RD4iSzEQQtuztQDA9o=
-k8s.io/cri-api v0.0.0-20250401112043-c9a9c280d850/go.mod h1:OLQvT45OpIA+tv91ZrpuFIGY+Y2Ho23poS7n115Aocs=
+k8s.io/cri-api v0.0.0-20250527182550-7d025a3cd8e3/go.mod h1:+Caj3ZVbxtl8aq+J8bhiQCeDcYPYBFE1IFInuxO3fLk=
 k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
 k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
 k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff h1:/usPimJzUKKu+m+TE36gUyGcf03XZEP0ZIKgKj35LS4=
 k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff/go.mod h1:5jIi+8yX4RIb8wk3XwBo5Pq2ccx4FP10ohkbSKCZoK8=
-k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6JSWYFzOFnYeS6Ro=
+k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8tmbZBHi4zVsl1Y=
-k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
+k8s.io/utils v0.0.0-20250604170112-4c0f3b243397/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
 sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8=
 sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3/go.mod h1:18nIHnGi6636UCz6m8i4DhaJ65T6EruyzmoQqI2BVDo=
 sigs.k8s.io/randfill v0.0.0-20250304075658-069ef1bbf016/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
 sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU=
 sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
-sigs.k8s.io/structured-merge-diff/v4 v4.6.0 h1:IUA9nvMmnKWcj5jl84xn+T5MnlZKThmUW1TdblaLVAc=
+sigs.k8s.io/structured-merge-diff/v4 v4.7.0 h1:qPeWmscJcXP0snki5IYF79Z8xrl8ETFxgMd7wez1XkI=
-sigs.k8s.io/structured-merge-diff/v4 v4.6.0/go.mod h1:dDy58f92j70zLsuZVuUX5Wp9vtxXpaZnkPGWeqDfCps=
+sigs.k8s.io/structured-merge-diff/v4 v4.7.0/go.mod h1:dDy58f92j70zLsuZVuUX5Wp9vtxXpaZnkPGWeqDfCps=
 sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
 sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=
--- a/pkg/cri/streaming/remotecommand/httpstream.go
+++ b/pkg/cri/streaming/remotecommand/httpstream.go
@ -17,6 +17,7 @@ limitations under the License.
 package remotecommand
 import (
 	"context"
 	"encoding/json"
 	"errors"
 	"fmt"
@ -116,7 +117,7 @@ func createStreams(req *http.Request, w http.ResponseWriter, opts *Options, supp
 	if ctx.resizeStream != nil {
 		ctx.resizeChan = make(chan remotecommand.TerminalSize)
-		go handleResizeEvents(ctx.resizeStream, ctx.resizeChan)
+		go handleResizeEvents(req.Context(), ctx.resizeStream, ctx.resizeChan)
 	}
 	return ctx, true
@ -409,7 +410,7 @@ WaitForStreams:
 // supportsTerminalResizing returns false because v1ProtocolHandler doesn't support it.
 func (*v1ProtocolHandler) supportsTerminalResizing() bool { return false }
-func handleResizeEvents(stream io.Reader, channel chan<- remotecommand.TerminalSize) {
+func handleResizeEvents(reqctx context.Context, stream io.Reader, channel chan<- remotecommand.TerminalSize) {
 	defer runtime.HandleCrash()
 	defer close(channel)
@ -419,7 +420,12 @@ func handleResizeEvents(stream io.Reader, channel chan<- remotecommand.TerminalS
 		if err := decoder.Decode(&size); err != nil {
 			break
 		}
-		channel <- size
+		select {
 		case channel <- size:
 		case <-reqctx.Done():
 			// To prevent go routine leak.
 			return
 		}
 	}
 }
--- a/pkg/cri/streaming/remotecommand/httpstream_test.go
+++ b/pkg/cri/streaming/remotecommand/httpstream_test.go
@ -0,0 +1,82 @@
 /*
 Copyright 2025 The Kubernetes Authors.
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
    http://www.apache.org/licenses/LICENSE-2.0
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
 package remotecommand
 import (
 	"bytes"
 	"context"
 	"encoding/json"
 	"io"
 	"testing"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/goleak"
 	"k8s.io/client-go/tools/remotecommand"
 )
 func TestHandleResizeEvents(t *testing.T) {
 	var testTerminalSize remotecommand.TerminalSize
 	rawTerminalSize, err := json.Marshal(&testTerminalSize)
 	require.NoError(t, err)
 	testCases := []struct {
 		name             string
 		resizeStreamData []byte
 		cancelContext    bool
 		readFromChannel  bool
 	}{
 		{
 			name:             "data attempted to be sent on the channel; channel not read; context canceled",
 			resizeStreamData: rawTerminalSize,
 			cancelContext:    true,
 		},
 		{
 			name:             "data attempted to be sent on the channel; channel read; context not canceled",
 			resizeStreamData: rawTerminalSize,
 			readFromChannel:  true,
 		},
 		{
 			name:          "no data attempted to be sent on the channel; context canceled",
 			cancelContext: true,
 		},
 		{
 			name: "no data attempted to be sent on the channel; context not canceled",
 		},
 	}
 	for _, testCase := range testCases {
 		t.Run(testCase.name, func(t *testing.T) {
 			ctx, cancel := context.WithCancel(context.Background())
 			connCtx := connectionContext{
 				resizeStream: io.NopCloser(bytes.NewReader(testCase.resizeStreamData)),
 				resizeChan:   make(chan remotecommand.TerminalSize),
 			}
 			go handleResizeEvents(ctx, connCtx.resizeStream, connCtx.resizeChan)
 			if testCase.readFromChannel {
 				gotTerminalSize := <-connCtx.resizeChan
 				require.Equal(t, gotTerminalSize, testTerminalSize)
 			}
 			if testCase.cancelContext {
 				cancel()
 			}
 			goleak.VerifyNone(t)
 			cancel()
 		})
 	}
 }
Author	SHA1	Message	Date
Kubernetes Publisher	36e6498109	Merge pull request #132269 from dims/update-to-latest-github.com/modern-go/reflect2 Update to latest github.com/modern-go/reflect2 Kubernetes-commit: d55b119d34883bbad2a3436dcb6c62339d963031	2025-06-12 20:48:08 +00:00
Davanum Srinivas	d908300b36	Update to latest github.com/modern-go/reflect2 Signed-off-by: Davanum Srinivas <davanum@gmail.com> Kubernetes-commit: 3908550c0dc189cfa9de38a84bee508fa0659463	2025-06-12 11:20:39 -04:00
Kubernetes Publisher	0c5bb6862a	Merge pull request #132239 from dims/update-to-etcd-3.6.1-in-vendor Update to etcd v3.6.1 in vendor/ Kubernetes-commit: 568f7300c9811f5c07a5b2a786fb1d043306c35c	2025-06-12 00:37:31 +00:00
Davanum Srinivas	bc5666e87e	Update to etcd v3.6.1 in vendor/ Signed-off-by: Davanum Srinivas <davanum@gmail.com> Kubernetes-commit: 5a2844a766bb0113b969b4519350c962d8dd8428	2025-06-11 16:46:03 -04:00
Kubernetes Publisher	d639b0c762	Merge pull request #132209 from dims/update-github.com/spf13/cobra-v1.9.1eksctl update github.com/spf13/cobra v1.9.1 Kubernetes-commit: dc19f0b6b9cd14ece6b1929cb4e7ea2c9d322b95	2025-06-10 20:39:56 +00:00
Davanum Srinivas	9a8e34b385	update github.com/spf13/cobra v1.9.1 Signed-off-by: Davanum Srinivas <davanum@gmail.com> Kubernetes-commit: 449320a54a2dac04f953d5f6401d875ea9b7e8de	2025-06-10 10:50:54 -04:00
Kubernetes Publisher	6341803436	Merge pull request #132103 from nojnhuh/typed-ring-buffer Replace queue.FIFOs with k8s.io/utils/buffer.Ring Kubernetes-commit: 5090812df4fb6cf09a9181635d90c2e154eab8cc	2025-06-06 20:56:49 +00:00
Jon Huhn	52b9a9200b	Update k8s.io/utils for new generic ring buffer Kubernetes-commit: 8cdbbf5cdaef7e37cfd432e9044aa52f4d42adcd	2025-06-04 12:09:53 -05:00
Kubernetes Publisher	422028d547	Merge pull request #131951 from dims/drop-usages-of-deprecated-otelgrpc-methods Drop usages of deprecated otelgrpc methods (update to v0.60.0) Kubernetes-commit: d9c1b4ec9b3df7f09dc23a0cc2b3daf2506d3688	2025-05-27 18:29:22 +00:00
Davanum Srinivas	1e50e4369e	Drop usages of deprecated otelgrpc methods Signed-off-by: Davanum Srinivas <davanum@gmail.com> Kubernetes-commit: 7c0f968ab256486b524ea37014ccf580b12c73e4	2025-05-23 19:40:36 -07:00
Kubernetes Publisher	97b7420a1a	Merge pull request #131838 from dims/bump-google.golang.org/grpc-to-google-v1.72.1 Bump google.golang.org/grpc to google v1.72.1 Kubernetes-commit: 444e2b4eb079727d7cdd81ad25041502656370b8	2025-05-20 16:23:15 +00:00
Davanum Srinivas	51a008f3f9	Bump google.golang.org/grpc v1.72.1 Signed-off-by: Davanum Srinivas <davanum@gmail.com> Kubernetes-commit: 9b3830fba234bc4a4f09a1ad4417e4d18b74d6dc	2025-05-18 12:52:05 -04:00
Kubernetes Publisher	91135debfd	Merge pull request #128419 from liggitt/etcd-3.6 etcd 3.6 client update Kubernetes-commit: 09ca440a450e9103a8f835f598c09237dba6ecbb	2025-05-16 04:27:08 +00:00
Jordan Liggitt	789ad24877	bump etcd client to 3.6 hack/pin-dependency.sh go.etcd.io/etcd/api/v3 v3.6.0 hack/pin-dependency.sh go.etcd.io/etcd/client/pkg/v3 v3.6.0 hack/pin-dependency.sh go.etcd.io/etcd/client/v3 v3.6.0 hack/pin-dependency.sh go.etcd.io/etcd/pkg/v3 v3.6.0 hack/pin-dependency.sh go.etcd.io/etcd/server/v3 v3.6.0 hack/pin-dependency.sh github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.0 hack/update-vendor.sh Kubernetes-commit: cf0bbf1171e918d5d7ba1d3c83b5f347fc8333b0	2025-05-15 21:19:11 -04:00
Kubernetes Publisher	8419bc34b9	Merge pull request #131170 from azych/fix_goroutine_leak Fix goroutine leak Kubernetes-commit: 35b4016d222936e6acd71239d9f3ab128c05baa1	2025-05-05 00:02:52 +00:00
Kubernetes Publisher	4a6cccaf70	Merge pull request #131595 from aojea/utils_fake_clock update k8s.io/utils to bring fakeClock.Waiters() Kubernetes-commit: e3e1f80c0110c847acf4381b1790c1c667395010	2025-05-03 04:07:28 +00:00
Antonio Ojea	16ea44e324	update k8s.io/utils to bring fakeClock.Waiters() Change-Id: I7e25338df225c2c27457403fbc2f158d08638f87 Kubernetes-commit: c2c003a71fc52fa79c2fff0109afad58573d0216	2025-05-02 11:21:11 +00:00
Kubernetes Publisher	69a343db6f	Merge pull request #130989 from liggitt/creationTimestamp-omitzero Omit null creationTimestamp Kubernetes-commit: 01899a7c86337b05a16a4155c9351cf947beaee9	2025-05-03 00:11:00 +00:00
Artur Zych	ecad826127	replace context.TODO with context.Background in tests Kubernetes-commit: ffe235d2dd3577fb71d0c9ff51b7c337eba10e76	2025-04-10 11:38:01 +02:00
Artur Zych	0bcbcadd33	add goleak to kubelet vendor via hack/update-vendor.sh Kubernetes-commit: 4bd0c024e9d999e6051b4fa7a24ede61a7724324	2025-04-05 00:34:46 +02:00
Artur Zych	bb2324b47b	add missing header in httpstream_test.go; whitespace in imports Kubernetes-commit: 161b44d04ede1d423fdf4a7e101f19005eab4b17	2025-04-05 00:09:52 +02:00
Artur Zych	a1589230c6	add unit tests to verify the fix Kubernetes-commit: 79150d1ecf16833524f9795d9621e5cd9acd54a4	2025-04-04 13:55:24 +02:00
Jordan Liggitt	870ea5c0c6	bump cbor to add omitzero support Kubernetes-commit: bc6051717137cef288b82305588e675de4a32c0d	2025-03-25 12:27:43 -04:00
Jordan Liggitt	6312d4ffc1	bump structured-merge-diff to add omitzero support Kubernetes-commit: 06b0784062f68566daa8eed83c475b738dcf620c	2025-03-24 16:34:01 -04:00
Kubernetes Publisher	9784a8d9cb	Merge pull request #131527 from carlory/cleanup-kubelet-UserNamespaces Fix incorrect feature gate name UserNamespaceSupport for kubelet apis Kubernetes-commit: e3b9541b235e47e7afd7edef403e1187f1e62a16	2025-04-29 09:18:17 -07:00
carlory	138f347175	Update UserNamespaceSupport feature gate name Kubernetes-commit: a56378d9fcb936a52a98e7ddbf1c3749db5d4b20	2025-04-29 16:15:41 +08:00
Kubernetes Publisher	c57578d1f5	Merge pull request #131434 from pacoxu/fsnotify bump fsnotify v1.9.0 Kubernetes-commit: 1b509a888327c0a7bcbae21b78b1bf3c447cc666	2025-04-25 20:00:22 +00:00
Kubernetes Publisher	a23e4377a3	Merge pull request #131444 from erdii/update-cel-go chore: update github.com/google/cel-go dependency to v0.25.0 Kubernetes-commit: e9379e92db19d826d46edd502dd3a61609b32c52	2025-04-25 11:57:48 +00:00
Josh Gwosdz	b4d8fb32a6	chore: update github.com/google/cel-go dependency to v0.25.0 Signed-off-by: Josh Gwosdz <jgwosdz@redhat.com> Kubernetes-commit: 7a24c4ce5d96aab2e9a33c4d62617cfb1c83c9f8	2025-04-24 14:59:35 +02:00
Paco Xu	9aefbc1d21	bump fsnotify v1.9.0 Kubernetes-commit: a2281f97bb06233ece3f601f73a7ac1137433610	2025-04-24 17:01:00 +08:00
Kubernetes Publisher	0f989a9793	Merge pull request #131061 from aramase/aramase/c/kep_4412_add_unique_req clarify mutual exclusivity of service account annotation keys in godoc Kubernetes-commit: ea04d665dade19bdfa548b1257b58f80e36e4e17	2025-04-24 00:13:56 +00:00
Kubernetes Publisher	6fd894d356	Merge pull request #130995 from xigang/utils bump k8s.io/utils for improvements Kubernetes-commit: 43a7d3be12425cc80ca6ad3599809a19728c5566	2025-04-24 00:13:55 +00:00
Kubernetes Publisher	8c3b3a28a0	Merge pull request #131204 from dims/move-to-released-version-of-prometheus/client_golang-v1.22.0-from-rc.0 Move to released version of prometheus/client_golang v1.22.0 from rc.0 Kubernetes-commit: 92af6ab6926f192a3d4543a1d6fa39f20edad3ea	2025-04-08 23:11:09 +00:00
Davanum Srinivas	61dae0523b	Move to released version of prometheus/client_golang v1.22.0 from rc.0 Signed-off-by: Davanum Srinivas <davanum@gmail.com> Kubernetes-commit: 2ef4a8426c2c1b6e3495de08c4686382a752f8f7	2025-04-08 08:35:18 -04:00
Anish Ramasekar	560bf1d9f1	clarify mutual exclusivity of service account annotation keys in godoc Signed-off-by: Anish Ramasekar <anish.ramasekar@gmail.com> Kubernetes-commit: f7e82d8059d29a279740a03ca2d9a76615632d5d	2025-03-25 17:30:42 -07:00
xigang	34bc5342f5	bump k8s.io/utils Kubernetes-commit: fe14689f221a968806b771b226581efb834654cd	2025-03-22 10:14:01 +08:00
Aaina26	c7defa9550	fixed the formatting Kubernetes-commit: 42d3716d7270d10f3570e189cb476a4495111095	2025-02-04 10:53:53 +05:30
Aaina26	3fee2d405f	Fixed go routine leak in kubelet tests Kubernetes-commit: 268033a5116b93383a0cd9ec535e804313e5c948	2025-02-02 00:16:52 +05:30