Merge pull request #140385 from dims/update-cadvisor-v0.60.4

bump github.com/google/cadvisor/lib from v0.60.3 to v0.60.4 Kubernetes-commit: 0fe889a76062e58098cb7582ee7aa91cf2649812
bump github.com/google/cadvisor/lib from v0.60.3 to v0.60.4
2026-07-15 00:00:09 +08:00 · 2026-07-10 11:00:35 +00:00 · 2026-07-10 08:24:03 +05:30 · 2026-07-09 10:52:19 +00:00 · 2026-07-08 16:23:51 -04:00 · 2026-07-08 02:52:17 +00:00
4 changed files with 42 additions and 42 deletions
@@ -8,14 +8,14 @@ godebug default=go1.26

 require (
 	golang.org/x/time v0.15.0
-	k8s.io/api v0.0.0-20260619005804-b846a6a65d1f
-	k8s.io/apimachinery v0.0.0-20260619005300-111d7ab7ffaf
-	k8s.io/client-go v0.0.0-20260619010447-d04ac3067ff1
-	k8s.io/code-generator v0.0.0-20260619011751-49908740568a
+	k8s.io/api v0.0.0-20260710100122-271ac82bb297
+	k8s.io/apimachinery v0.0.0-20260710095601-0838f1f442d5
+	k8s.io/client-go v0.0.0-20260710100904-9236c747471f
+	k8s.io/code-generator v0.0.0-20260710102450-018196b6f72f
 	k8s.io/klog/v2 v2.140.0
 	k8s.io/kube-openapi v0.0.0-20260618221249-bc653b64f974
-	k8s.io/utils v0.0.0-20260210185600-b8788abfbbc2
-	sigs.k8s.io/structured-merge-diff/v6 v6.4.0
+	k8s.io/utils v0.0.0-20260626114624-be93311217bd
+	sigs.k8s.io/structured-merge-diff/v6 v6.4.2
 )

 require (
@@ -48,14 +48,14 @@ require (
 	github.com/x448/float16 v0.8.4 // indirect
 	go.yaml.in/yaml/v2 v2.4.4 // indirect
 	go.yaml.in/yaml/v3 v3.0.4 // indirect
-	golang.org/x/mod v0.35.0 // indirect
-	golang.org/x/net v0.55.1-0.20260602153038-42abb857022c // indirect
+	golang.org/x/mod v0.37.0 // indirect
+	golang.org/x/net v0.57.0 // indirect
 	golang.org/x/oauth2 v0.36.0 // indirect
-	golang.org/x/sync v0.20.0 // indirect
-	golang.org/x/sys v0.45.0 // indirect
-	golang.org/x/term v0.43.0 // indirect
-	golang.org/x/text v0.37.0 // indirect
-	golang.org/x/tools v0.44.0 // indirect
+	golang.org/x/sync v0.22.0 // indirect
+	golang.org/x/sys v0.47.0 // indirect
+	golang.org/x/term v0.45.0 // indirect
+	golang.org/x/text v0.40.0 // indirect
+	golang.org/x/tools v0.47.0 // indirect
 	google.golang.org/protobuf v1.36.12-0.20260120151049-f2248ac996af // indirect
 	gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
@@ -84,24 +84,24 @@ go.yaml.in/yaml/v2 v2.4.4 h1:tuyd0P+2Ont/d6e2rl3be67goVK4R6deVxCUX5vyPaQ=
 go.yaml.in/yaml/v2 v2.4.4/go.mod h1:gMZqIpDtDqOfM0uNfy0SkpRhvUryYH0Z6wdMYcacYXQ=
 go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
 go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
-golang.org/x/mod v0.35.0 h1:Ww1D637e6Pg+Zb2KrWfHQUnH2dQRLBQyAtpr/haaJeM=
-golang.org/x/mod v0.35.0/go.mod h1:+GwiRhIInF8wPm+4AoT6L0FA1QWAad3OMdTRx4tFYlU=
-golang.org/x/net v0.55.1-0.20260602153038-42abb857022c h1:hzdRVvjwthcq46T3ybsDtJpg1iZZaW3zik9P3tsYJeo=
-golang.org/x/net v0.55.1-0.20260602153038-42abb857022c/go.mod h1:Mo4aFsyVPXieTwCJ1g83a3xU8RY7PkHFQqQ7pkWnuM0=
+golang.org/x/mod v0.37.0 h1:vF1DjpVEshcIqoEaauuHebaLk1O1forxjxBaVn884JQ=
+golang.org/x/mod v0.37.0/go.mod h1:m8S8VeM9r4dzDwjrKO0a1sZP3YjeMamRRlD+fmR2Q/0=
+golang.org/x/net v0.57.0 h1:K5+3DljvIuDG9/Jv9rvyMywYNFCQ9RSUY6OOTTkT+tE=
+golang.org/x/net v0.57.0/go.mod h1:KpXc8iv+r3XplLAG/f7Jsf9RPszJzdR0f58q9vGOuEU=
 golang.org/x/oauth2 v0.36.0 h1:peZ/1z27fi9hUOFCAZaHyrpWG5lwe0RJEEEeH0ThlIs=
 golang.org/x/oauth2 v0.36.0/go.mod h1:YDBUJMTkDnJS+A4BP4eZBjCqtokkg1hODuPjwiGPO7Q=
-golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4=
-golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
-golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY=
-golang.org/x/sys v0.45.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
-golang.org/x/term v0.43.0 h1:S4RLU2sB31O/NCl+zFN9Aru9A/Cq2aqKpTZJ6B+DwT4=
-golang.org/x/term v0.43.0/go.mod h1:lrhlHNdQJHO+1qVYiHfFKVuVioJIheAc3fBSMFYEIsk=
-golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc=
-golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38=
+golang.org/x/sync v0.22.0 h1:SZjpbeLmrCk4xhRSZFNZW5gFUeCeFgjekvI/+gfScek=
+golang.org/x/sync v0.22.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
+golang.org/x/sys v0.47.0 h1:o7XGOvZQCADBQQ4Y7VNq2dRWQR7JmOUW8Kxx4ZsNgWs=
+golang.org/x/sys v0.47.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
+golang.org/x/term v0.45.0 h1:NwWyBmoJCbfTHpxrWoZ9C6/VxOf7ic219I8xZZFdrf0=
+golang.org/x/term v0.45.0/go.mod h1:9aqxs0blBcrm/n0L9QW0aRVD+ktan8ssZromtqJC43w=
+golang.org/x/text v0.40.0 h1:Ub2Z6/xjgF1WrYQz2nuITOEegKFtiIy+rieRJ5lHZKs=
+golang.org/x/text v0.40.0/go.mod h1:hpnzDAfGV753zIKo+wk3u1bVKCGPbrnF7+7LBF/UHVY=
 golang.org/x/time v0.15.0 h1:bbrp8t3bGUeFOx08pvsMYRTCVSMk89u4tKbNOZbp88U=
 golang.org/x/time v0.15.0/go.mod h1:Y4YMaQmXwGQZoFaVFk4YpCt4FLQMYKZe9oeV/f4MSno=
-golang.org/x/tools v0.44.0 h1:UP4ajHPIcuMjT1GqzDWRlalUEoY+uzoZKnhOjbIPD2c=
-golang.org/x/tools v0.44.0/go.mod h1:KA0AfVErSdxRZIsOVipbv3rQhVXTnlU6UhKxHd1seDI=
+golang.org/x/tools v0.47.0 h1:7Kn5x/d1svx/PzryTsqeoZN4TZwqeH5pGWjefhLi/1Q=
+golang.org/x/tools v0.47.0/go.mod h1:dFHnyTvFWY212G+h7ZY4Vsp/K3U4/7W9TyVaAul8uCA=
 golang.org/x/tools/go/expect v0.1.1-deprecated h1:jpBZDwmgPhXsKZC6WhL20P4b/wmnpsEAGHaNy0n/rJM=
 golang.org/x/tools/go/expect v0.1.1-deprecated/go.mod h1:eihoPOH+FgIqa3FpoTwguz/bVUSGBlGQU67vpBeOrBY=
 golang.org/x/tools/go/packages/packagestest v0.1.1-deprecated h1:1h2MnaIAIXISqTFKdENegdpAgUXz6NrPEsbIeWaBRvM=
@@ -117,27 +117,27 @@ 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-20260619005804-b846a6a65d1f h1:+qsG5g6v6j/iRTYvW3JCrhDPESJcQqfX3E+X2afCF+E=
-k8s.io/api v0.0.0-20260619005804-b846a6a65d1f/go.mod h1:2L3SEvbcoSdY1VhC0AxR/jEEi0pAipEyAnkWt0JaUIY=
-k8s.io/apimachinery v0.0.0-20260619005300-111d7ab7ffaf h1:av3Z3HoC02trg0W0OFvTwlFhVPhjYj5BQeIQ5q8ZkFE=
-k8s.io/apimachinery v0.0.0-20260619005300-111d7ab7ffaf/go.mod h1:s2qMFi6yEsMcAS8Gm608ftRHgiVR/tKK/Rj1hZRaFWE=
-k8s.io/client-go v0.0.0-20260619010447-d04ac3067ff1 h1:4xm0Tk+fDJOCTBeL3RMxm6o4sq50YLa7psb/+P9GBc0=
-k8s.io/client-go v0.0.0-20260619010447-d04ac3067ff1/go.mod h1:Wr78ZuK8eroHh87Uy/544XPtuxnqgBGz+drsao2deXs=
-k8s.io/code-generator v0.0.0-20260619011751-49908740568a h1:ObI8GutIbhvmtW7yzwAx7Ox0rhdKYKkWlI20QfORUv4=
-k8s.io/code-generator v0.0.0-20260619011751-49908740568a/go.mod h1:RWwyHzTSobEjH4eyd3obTtwi2Xp5T9/7ss+GwF2n28I=
+k8s.io/api v0.0.0-20260710100122-271ac82bb297 h1:weEXc5tGNMpuC1GGwkZht3bkcBc9Faiipyz9j2MEMYQ=
+k8s.io/api v0.0.0-20260710100122-271ac82bb297/go.mod h1:be7u08H1x8iYfyScLY8cp3ezQA3oGUy9vuHbW6JMOBw=
+k8s.io/apimachinery v0.0.0-20260710095601-0838f1f442d5 h1:cmJOur/9PSYcs6BUl8OMfsWUK0SF/wU3lLBo1n52dHw=
+k8s.io/apimachinery v0.0.0-20260710095601-0838f1f442d5/go.mod h1:gUMHWz9sZCP7+vv/RiJJXhiPGY2mjS9OgfFcoqYul+M=
+k8s.io/client-go v0.0.0-20260710100904-9236c747471f h1:g1+Tqw2eVUOOZw71QtMJ5u2elyWnCoJdAcSEDVFw+ys=
+k8s.io/client-go v0.0.0-20260710100904-9236c747471f/go.mod h1:WX/BGz7Farm+c+qIByv+Bp1aiTl1UPydtbJ7d3gl9yk=
+k8s.io/code-generator v0.0.0-20260710102450-018196b6f72f h1:m6zQyZgaGdDH/uuTDx0hAV/UkxnaZJrpNkkoHG2gM6Y=
+k8s.io/code-generator v0.0.0-20260710102450-018196b6f72f/go.mod h1:+tP73MHUm7dOBs2xsPpL3qqZcP/5nFV3vtJq1g9CppU=
 k8s.io/gengo/v2 v2.0.0-20260408192533-25e2208e0dc3 h1:3L6PNkMLXkU/pz3jWzaaIUz0Rs2V9h+5O51AeRC7poc=
 k8s.io/gengo/v2 v2.0.0-20260408192533-25e2208e0dc3/go.mod h1:yvyl3l9E+UxlqOMUULdKTAYB0rEhsmjr7+2Vb/1pCSo=
 k8s.io/klog/v2 v2.140.0 h1:Tf+J3AH7xnUzZyVVXhTgGhEKnFqye14aadWv7bzXdzc=
 k8s.io/klog/v2 v2.140.0/go.mod h1:o+/RWfJ6PwpnFn7OyAG3QnO47BFsymfEfrz6XyYSSp0=
 k8s.io/kube-openapi v0.0.0-20260618221249-bc653b64f974 h1:JVogoTvOj6gutlx8bUwGh0e8o8L4X8nDbTLyONmoVvk=
 k8s.io/kube-openapi v0.0.0-20260618221249-bc653b64f974/go.mod h1:V/QaCUYDa+0QpcHhVVc5l99Uz56wEMEXBSj9oCDkNDY=
-k8s.io/utils v0.0.0-20260210185600-b8788abfbbc2 h1:AZYQSJemyQB5eRxqcPky+/7EdBj0xi3g0ZcxxJ7vbWU=
-k8s.io/utils v0.0.0-20260210185600-b8788abfbbc2/go.mod h1:xDxuJ0whA3d0I4mf/C4ppKHxXynQ+fxnkmQH0vTHnuk=
+k8s.io/utils v0.0.0-20260626114624-be93311217bd h1:Ea7fgQ5we8Y9T0OX5o0dAHzQOBRI07D/dEYRaB9ZZEs=
+k8s.io/utils v0.0.0-20260626114624-be93311217bd/go.mod h1:xDxuJ0whA3d0I4mf/C4ppKHxXynQ+fxnkmQH0vTHnuk=
 sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 h1:IpInykpT6ceI+QxKBbEflcR5EXP7sU1kvOlxwZh5txg=
 sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
 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/v6 v6.4.0 h1:qmp2e3ZfFi1/jJbDGpD4mt3wyp6PE1NfKHCYLqgNQJo=
-sigs.k8s.io/structured-merge-diff/v6 v6.4.0/go.mod h1:M3W8sfWvn2HhQDIbGWj3S099YozAsymCo/wrT5ohRUE=
+sigs.k8s.io/structured-merge-diff/v6 v6.4.2 h1:qdOxHwrl2Kaag1aQEarlYcOA9vSyGCp3CIki3aW8c4Q=
+sigs.k8s.io/structured-merge-diff/v6 v6.4.2/go.mod h1:M3W8sfWvn2HhQDIbGWj3S099YozAsymCo/wrT5ohRUE=
 sigs.k8s.io/yaml v1.6.0 h1:G8fkbMSAFqgEFgh4b1wmtzDnioxFCUgTZhlbj5P9QYs=
 sigs.k8s.io/yaml v1.6.0/go.mod h1:796bPqUfzR/0jLAl6XjHl3Ck7MiyVv8dbTdyT3/pMf4=
@@ -29,7 +29,7 @@ import (
 )

 type Interface interface {
-	Discovery() discovery.DiscoveryInterface
+	Discovery() discovery.DiscoveryInterfaces
 	SamplecontrollerV1alpha1() samplecontrollerv1alpha1.SamplecontrollerV1alpha1Interface
 }

@@ -45,7 +45,7 @@ func (c *Clientset) SamplecontrollerV1alpha1() samplecontrollerv1alpha1.Sampleco
 }

 // Discovery retrieves the DiscoveryClient
-func (c *Clientset) Discovery() discovery.DiscoveryInterface {
+func (c *Clientset) Discovery() discovery.DiscoveryInterfaces {
 	if c == nil {
 		return nil
 	}
@@ -72,7 +72,7 @@ type Clientset struct {
 	tracker   testing.ObjectTracker
 }

-func (c *Clientset) Discovery() discovery.DiscoveryInterface {
+func (c *Clientset) Discovery() discovery.DiscoveryInterfaces {
 	return c.discovery
 }
Author	SHA1	Message	Date
Kubernetes Publisher	1dee8b0f02	Merge pull request #140385 from dims/update-cadvisor-v0.60.4 bump github.com/google/cadvisor/lib from v0.60.3 to v0.60.4 Kubernetes-commit: 0fe889a76062e58098cb7582ee7aa91cf2649812	2026-07-10 11:00:35 +00:00
Davanum SrinivasandKubernetes Publisher	f31c2534ac	bump github.com/google/cadvisor/lib from v0.60.3 to v0.60.4 The new cadvisor version requires newer golang.org/x modules. Module version selection raised crypto, mod, net, sync, sys, term, text, and tools. golang.org/x/net moves from a pseudo-version to the v0.57.0 release, which includes the http2 fixes the pseudo-version pointed at. cadvisor/lib no longer depends on github.com/gogo/protobuf. This change removes cadvisor/lib from the gogo/protobuf dependants list in hack/unwanted-dependencies.json. Kubernetes-commit: c2e122037dfaa8c5e4e7951c155df282236d30f4	2026-07-10 08:24:03 +05:30
Kubernetes Publisher	97841ef0a5	Merge pull request #140337 from liggitt/ttrpc Bump github.com/containerd/ttrpc to v1.2.9 Kubernetes-commit: 880ed81cdf7d8cf490f4c72ce07b529d098a9263	2026-07-09 10:52:19 +00:00
Jordan LiggittandKubernetes Publisher	81aead6c77	Bump github.com/containerd/ttrpc to v1.2.9 Kubernetes-commit: 863777a6cf007b35dc16ad81b2e0475feed2fc77	2026-07-08 16:23:51 -04:00
Kubernetes Publisher	77c6776970	Merge pull request #140294 from jpbetz/revert-smd-306 Bump SMD to v6.4.2 to revert #306 to fix regression in SSA for nullable container types Kubernetes-commit: 63373922a5b5ade70edbf12bee45b2b00d93230a	2026-07-08 02:52:17 +00:00
Joe BetzandKubernetes Publisher	5b2f27d05a	Bump sigs.k8s.io/structured-merge-diff/v6 to v6.4.2 Kubernetes-commit: 51033909f53c62483cff47a1a4e73b7f50fd9af1	2026-07-07 18:41:07 -04:00
Kubernetes Publisher	7e64d481a6	Merge pull request #129109 from pohly/log-client-go-restmapper-discovery restmapper + discovery: add context-aware APIs Kubernetes-commit: b308e6c5067486765de78de1dc809fb30b0b68c3	2026-07-01 11:52:41 +00:00
Kubernetes Publisher	99aed8af90	Merge pull request #140021 from dims/conntrack-cpuset kube-proxy: detect host CPU count via cpuset.NumCPU instead of cadvisor Kubernetes-commit: 04d5d2647dc7fd1e8f0cd6a61244d18642af9522	2026-06-26 18:16:38 +00:00
Davanum SrinivasandKubernetes Publisher	a8015da736	kube-proxy: detect host CPU count via cpuset.NumCPU instead of cadvisor detectNumCPU sized nf_conntrack_max using github.com/google/cadvisor/lib machine topology. nf_conntrack_max is host-wide, so it must be sized from the node's CPU count, not runtime.NumCPU(): the latter honors the process cpuset and undercounts when kube-proxy runs under a static CPU policy, which is the behavior cadvisor worked around (kubernetes/kubernetes#99225). Use cpuset.NumCPU() from k8s.io/utils, which reads the node's online CPU count from /sys/devices/system/cpu/online, with a runtime.NumCPU() fallback. This drops the cadvisor dependency from pkg/proxy/conntrack and bumps k8s.io/utils to pick up cpuset.NumCPU. Kubernetes-commit: 92ce184653f03c312915993d7fde93d8e65602c1	2026-06-25 14:04:01 -04:00
Patrick OhlyandKubernetes Publisher	2c2851f221	client-go: expose all discovery methods The underlying implementation has both. Exposing that in the result of Discovery() makes it easier for consumers to call the WithContext methods because they don't need to wrap with ToDiscoveryInterfaceWithContext(). This is a breaking Go API change because tests which implement the interface have to be updated. Kubernetes-commit: d8f70b87cec6888420e778bca1ea8022a6617140	2026-03-18 14:24:10 +01:00