Merge pull request #140021 from dims/conntrack-cpuset

kube-proxy: detect host CPU count via cpuset.NumCPU instead of cadvisor

Kubernetes-commit: 04d5d2647dc7fd1e8f0cd6a61244d18642af9522
This commit is contained in:
Kubernetes Publisher
2026-06-26 16:26:32 +00:00
2 changed files with 12 additions and 12 deletions

8
go.mod
View File

@@ -23,12 +23,12 @@ require (
golang.org/x/time v0.15.0
google.golang.org/protobuf v1.36.12-0.20260120151049-f2248ac996af
gopkg.in/evanphx/json-patch.v4 v4.13.0
k8s.io/api v0.0.0-20260625205934-e272d17aacf4
k8s.io/apimachinery v0.0.0-20260624005338-0cde5273b917
k8s.io/api v0.0.0-20260626173204-0669b8f44d17
k8s.io/apimachinery v0.0.0-20260626172716-6fa8dff7b19f
k8s.io/klog/v2 v2.140.0
k8s.io/kube-openapi v0.0.0-20260618221249-bc653b64f974
k8s.io/streaming v0.0.0-20260602192112-0a84e25f8e5e
k8s.io/utils v0.0.0-20260210185600-b8788abfbbc2
k8s.io/streaming v0.0.0-20260626172358-68009e8e6aa5
k8s.io/utils v0.0.0-20260626114624-be93311217bd
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730
sigs.k8s.io/randfill v1.0.0
sigs.k8s.io/structured-merge-diff/v6 v6.4.0

16
go.sum
View File

@@ -118,18 +118,18 @@ 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-20260625205934-e272d17aacf4 h1:VgLZj/odgcL+hv5DGCu1A7fV3RvONREpuAtPXxwkbzA=
k8s.io/api v0.0.0-20260625205934-e272d17aacf4/go.mod h1:beQEcM0rvbYfI1OdO9Uob8EUWitM73pjoMO2OTzyyeA=
k8s.io/apimachinery v0.0.0-20260624005338-0cde5273b917 h1:U05DtxqHAE0xH+k1PYzsEOyR7d6zBD2cDTaub3+6CSk=
k8s.io/apimachinery v0.0.0-20260624005338-0cde5273b917/go.mod h1:s2qMFi6yEsMcAS8Gm608ftRHgiVR/tKK/Rj1hZRaFWE=
k8s.io/api v0.0.0-20260626173204-0669b8f44d17 h1:ugKw3OKEv7LEx9Qy1DyqAZ8coG+a97DrX9yghW7Ert4=
k8s.io/api v0.0.0-20260626173204-0669b8f44d17/go.mod h1:7NNJfcrPo0BNrOSUudMNZpLxWf/OYIRNbwS+/yAaJwg=
k8s.io/apimachinery v0.0.0-20260626172716-6fa8dff7b19f h1:WAFkshKyNvj5avlHoK0nhd0B0G+O+YUH3ntvUkUmDsE=
k8s.io/apimachinery v0.0.0-20260626172716-6fa8dff7b19f/go.mod h1:T9tvL1Yxf+TRVyTz+Q7KtLAncCr9xxxx1zrF6g/QuR0=
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/streaming v0.0.0-20260602192112-0a84e25f8e5e h1:hk+SAa1pedjgwlCSfpcY0gHgGddPjfy0hX/ZQglt7js=
k8s.io/streaming v0.0.0-20260602192112-0a84e25f8e5e/go.mod h1:QN1+yCAfxcSvo0908Z3rFKkA5Xlr3KgUZAGwKuR6qQk=
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/streaming v0.0.0-20260626172358-68009e8e6aa5 h1:2UYbfhga5Ubjp9vPIkhgQQbm00bn5amqG773wSCoQwI=
k8s.io/streaming v0.0.0-20260626172358-68009e8e6aa5/go.mod h1:jksMJuFO/NrJlKuDkIomVgAJnK+Yu9h8KTrkZ8ESiac=
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=