Skip to content

Commit 43d4666

Browse files
andyzhangxandyzhangx
authored
Merge pull request #1835 from andyzhangx/CVE-2025-0426-1.25
[release-1.25] fix: CVE-2025-0426
2 parents b92bd6f + 1128ad1 commit 43d4666

File tree

17 files changed

+145
-132
lines changed

17 files changed

+145
-132
lines changed

‎go.mod

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ require (
3030
google.golang.org/protobuf v1.36.3
3131
k8s.io/api v0.32.1
3232
k8s.io/apimachinery v0.32.1
33-
k8s.io/apiserver v0.31.3
33+
k8s.io/apiserver v0.31.6
3434
k8s.io/client-go v0.32.1
35-
k8s.io/component-base v0.31.3
35+
k8s.io/component-base v0.31.6
3636
k8s.io/klog/v2 v2.130.1
3737
k8s.io/kubernetes v1.31.1
3838
k8s.io/mount-utils v0.32.0
@@ -158,49 +158,49 @@ require (
158158
gopkg.in/yaml.v2 v2.4.0 // indirect
159159
gopkg.in/yaml.v3 v3.0.1 // indirect
160160
k8s.io/apiextensions-apiserver v0.0.0 // indirect
161-
k8s.io/cloud-provider v0.31.3 // indirect
162-
k8s.io/component-helpers v0.31.3 // indirect
163-
k8s.io/controller-manager v0.31.3 // indirect
161+
k8s.io/cloud-provider v0.31.6 // indirect
162+
k8s.io/component-helpers v0.31.6 // indirect
163+
k8s.io/controller-manager v0.31.6 // indirect
164164
k8s.io/kms v0.32.0-alpha.0 // indirect
165165
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
166166
k8s.io/kubectl v0.31.1 // indirect
167-
k8s.io/kubelet v0.31.3 // indirect
167+
k8s.io/kubelet v0.31.6 // indirect
168168
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
169169
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
170170
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
171171
)
172172

173173
replace (
174-
k8s.io/api => k8s.io/api v0.31.3
175-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.31.3
176-
k8s.io/apimachinery => k8s.io/apimachinery v0.31.3
177-
k8s.io/apiserver => k8s.io/apiserver v0.31.3
178-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.31.3
179-
k8s.io/client-go => k8s.io/client-go v0.31.3
180-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.31.3
181-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.31.3
182-
k8s.io/code-generator => k8s.io/code-generator v0.31.3
183-
k8s.io/component-base => k8s.io/component-base v0.31.3
184-
k8s.io/component-helpers => k8s.io/component-helpers v0.31.3
185-
k8s.io/controller-manager => k8s.io/controller-manager v0.31.3
186-
k8s.io/cri-api => k8s.io/cri-api v0.31.3
187-
k8s.io/cri-client => k8s.io/cri-client v0.31.3
188-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.31.3
189-
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.31.3
190-
k8s.io/endpointslice => k8s.io/endpointslice v0.31.3
191-
k8s.io/kms => k8s.io/kms v0.31.3
192-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.31.3
193-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.31.3
194-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.31.3
195-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.31.3
196-
k8s.io/kubectl => k8s.io/kubectl v0.31.3
197-
k8s.io/kubelet => k8s.io/kubelet v0.31.3
198-
k8s.io/kubernetes => k8s.io/kubernetes v1.31.3
199-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.31.3
200-
k8s.io/metrics => k8s.io/metrics v0.31.3
201-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.31.3
202-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.31.3
203-
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.31.3
204-
k8s.io/sample-controller => k8s.io/sample-controller v0.31.3
174+
k8s.io/api => k8s.io/api v0.31.6
175+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.31.6
176+
k8s.io/apimachinery => k8s.io/apimachinery v0.31.6
177+
k8s.io/apiserver => k8s.io/apiserver v0.31.6
178+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.31.6
179+
k8s.io/client-go => k8s.io/client-go v0.31.6
180+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.31.6
181+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.31.6
182+
k8s.io/code-generator => k8s.io/code-generator v0.31.6
183+
k8s.io/component-base => k8s.io/component-base v0.31.6
184+
k8s.io/component-helpers => k8s.io/component-helpers v0.31.6
185+
k8s.io/controller-manager => k8s.io/controller-manager v0.31.6
186+
k8s.io/cri-api => k8s.io/cri-api v0.31.6
187+
k8s.io/cri-client => k8s.io/cri-client v0.31.6
188+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.31.6
189+
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.31.6
190+
k8s.io/endpointslice => k8s.io/endpointslice v0.31.6
191+
k8s.io/kms => k8s.io/kms v0.31.6
192+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.31.6
193+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.31.6
194+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.31.6
195+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.31.6
196+
k8s.io/kubectl => k8s.io/kubectl v0.31.6
197+
k8s.io/kubelet => k8s.io/kubelet v0.31.6
198+
k8s.io/kubernetes => k8s.io/kubernetes v1.31.6
199+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.31.6
200+
k8s.io/metrics => k8s.io/metrics v0.31.6
201+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.31.6
202+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.31.6
203+
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.31.6
204+
k8s.io/sample-controller => k8s.io/sample-controller v0.31.6
205205
sigs.k8s.io/structured-merge-diff/v4 => sigs.k8s.io/structured-merge-diff/v4 v4.4.1
206206
)

‎go.sum

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -430,42 +430,42 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
430430
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
431431
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
432432
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
433-
k8s.io/api v0.31.3 h1:umzm5o8lFbdN/hIXbrK9oRpOproJO62CV1zqxXrLgk8=
434-
k8s.io/api v0.31.3/go.mod h1:UJrkIp9pnMOI9K2nlL6vwpxRzzEX5sWgn8kGQe92kCE=
435-
k8s.io/apiextensions-apiserver v0.31.3 h1:+GFGj2qFiU7rGCsA5o+p/rul1OQIq6oYpQw4+u+nciE=
436-
k8s.io/apiextensions-apiserver v0.31.3/go.mod h1:2DSpFhUZZJmn/cr/RweH1cEVVbzFw9YBu4T+U3mf1e4=
437-
k8s.io/apimachinery v0.31.3 h1:6l0WhcYgasZ/wk9ktLq5vLaoXJJr5ts6lkaQzgeYPq4=
438-
k8s.io/apimachinery v0.31.3/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
439-
k8s.io/apiserver v0.31.3 h1:+1oHTtCB+OheqFEz375D0IlzHZ5VeQKX1KGXnx+TTuY=
440-
k8s.io/apiserver v0.31.3/go.mod h1:PrxVbebxrxQPFhJk4powDISIROkNMKHibTg9lTRQ0Qg=
441-
k8s.io/client-go v0.31.3 h1:CAlZuM+PH2cm+86LOBemaJI/lQ5linJ6UFxKX/SoG+4=
442-
k8s.io/client-go v0.31.3/go.mod h1:2CgjPUTpv3fE5dNygAr2NcM8nhHzXvxB8KL5gYc3kJs=
443-
k8s.io/cloud-provider v0.31.3 h1:7C3CHQUUwnv/HWWVIaibZH06iPg663RYQ6C6Zy4FnO8=
444-
k8s.io/cloud-provider v0.31.3/go.mod h1:c7csKppoVb9Ej6upJ28AvHy4B3BtlRMzXfgezsDdPKw=
445-
k8s.io/component-base v0.31.3 h1:DMCXXVx546Rfvhj+3cOm2EUxhS+EyztH423j+8sOwhQ=
446-
k8s.io/component-base v0.31.3/go.mod h1:xME6BHfUOafRgT0rGVBGl7TuSg8Z9/deT7qq6w7qjIU=
447-
k8s.io/component-helpers v0.31.3 h1:0zGPD2PrekhFWgmz85XxlMEl7dfhlKC1tERZDe3onQc=
448-
k8s.io/component-helpers v0.31.3/go.mod h1:HZ1HZx2TKXM7xSUV2cR9L5yDoyZPhhHQNaE3BPBLPUQ=
449-
k8s.io/controller-manager v0.31.3 h1:TyUav69iNYwLGwA96JDhusoZoGRdh1sdrLjXmWTcPgs=
450-
k8s.io/controller-manager v0.31.3/go.mod h1:yuhec+dbXmBz+4c32kxJxmcauB+1pjO2ttfYODWuv18=
451-
k8s.io/csi-translation-lib v0.31.3 h1:hxcPRNdtEsk766jCXSKjgH1V8jUNx5tVqdooQ1Ars/M=
452-
k8s.io/csi-translation-lib v0.31.3/go.mod h1:0B1gQwd868XUIDwJYy5gB2jDXWEwlcWvSsfcQEgzbRk=
433+
k8s.io/api v0.31.6 h1:ocWG/UhC9Mqp5oEfYWy9wCddbZiZyBAFTlBt0LVlhDg=
434+
k8s.io/api v0.31.6/go.mod h1:i16xSiKMgVIVhsJMxfWq0mJbXA+Z7KhjPgYmwT41hl4=
435+
k8s.io/apiextensions-apiserver v0.31.6 h1:v9sqyWlrgFZpAPdEb/bEiXfM98TfSppwRF0X/uWKXh0=
436+
k8s.io/apiextensions-apiserver v0.31.6/go.mod h1:QVH3CFwqzGZtwsxPYzJlA/Qiwgb5FXmRMGls3CjzvbI=
437+
k8s.io/apimachinery v0.31.6 h1:Pn96A0wHD0X8+l7QTdAzdLQPrpav1s8rU6A+v2/9UEY=
438+
k8s.io/apimachinery v0.31.6/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
439+
k8s.io/apiserver v0.31.6 h1:FEhEGLsz1PbMOHeQZDbOUlMh36zRZbjgKwJCoMhdGmw=
440+
k8s.io/apiserver v0.31.6/go.mod h1:dpFh+xqFQ02O8vLYCIqoiV7sJIpZsUULeNuag6Y9HGo=
441+
k8s.io/client-go v0.31.6 h1:51HT40qVIZ13BrHKeWxFuU52uoPnFhxTYJnv4+LTgp4=
442+
k8s.io/client-go v0.31.6/go.mod h1:MEq7JQJelUQ0/4fMoPEUrc/OOFyGo/9LmGA38H6O6xY=
443+
k8s.io/cloud-provider v0.31.6 h1:5vVMyf/m/n8ij/GmSJLRcatchmciRr0gs4peBcxqvKk=
444+
k8s.io/cloud-provider v0.31.6/go.mod h1:iT6kIEMEXrTIvRBAaRU5qefRzgPaSV6kwTc6mjhhnEw=
445+
k8s.io/component-base v0.31.6 h1:FgI25PuZtCp2n7AFpOaDpMQOLieFdrpAbpeoZu7VhDI=
446+
k8s.io/component-base v0.31.6/go.mod h1:aVRrh8lAI1kSShFmwcKLhc3msQoUcmFWPBDf0sXaISM=
447+
k8s.io/component-helpers v0.31.6 h1:Af8BcE6pElKlLaerwW9s04jTQVFa66wmI1pkaNfDWzE=
448+
k8s.io/component-helpers v0.31.6/go.mod h1:6CRV6M+7R13eqtz4FBm2ty9eH+QajDcP3y0Bklzh2FA=
449+
k8s.io/controller-manager v0.31.6 h1:HQRUV6nogHo2N7vr3cgVNjZ+wvHIMvxEMjTeCrHitE4=
450+
k8s.io/controller-manager v0.31.6/go.mod h1:0HDNTZVapQFa9G96jNxrU99ht7fQJVEKBXDzqKDMez0=
451+
k8s.io/csi-translation-lib v0.31.6 h1:mBkF3AG8pRcwZv8SY7qT1JWznRsmYjZfT5Lxel9nN4Q=
452+
k8s.io/csi-translation-lib v0.31.6/go.mod h1:I2F51irYJyt78so7wdral65B7PB7jR3keZ2MpB78mWw=
453453
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
454454
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
455-
k8s.io/kms v0.31.3 h1:XCFmiJn5CCKs8xoOLpCmu42Ubm/KW85wNHybGFcSAYc=
456-
k8s.io/kms v0.31.3/go.mod h1:OZKwl1fan3n3N5FFxnW5C4V3ygrah/3YXeJWS3O6+94=
455+
k8s.io/kms v0.31.6 h1:p7OY+9Hp8nPtgzm0vT9TrERNigQQSu8tkgWqn+GvB2w=
456+
k8s.io/kms v0.31.6/go.mod h1:OZKwl1fan3n3N5FFxnW5C4V3ygrah/3YXeJWS3O6+94=
457457
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f h1:GA7//TjRY9yWGy1poLzYYJJ4JRdzg3+O6e8I+e+8T5Y=
458458
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f/go.mod h1:R/HEjbvWI0qdfb8viZUeVZm0X6IZnxAydC7YU42CMw4=
459-
k8s.io/kubectl v0.31.3 h1:3r111pCjPsvnR98oLLxDMwAeM6OPGmPty6gSKaLTQes=
460-
k8s.io/kubectl v0.31.3/go.mod h1:lhMECDCbJN8He12qcKqs2QfmVo9Pue30geovBVpH5fs=
461-
k8s.io/kubelet v0.31.3 h1:DIXRAmvVGp42mV2vpA1GCLU6oO8who0/vp3Oq6kSpbI=
462-
k8s.io/kubelet v0.31.3/go.mod h1:KSdbEfNy5VzqUlAHlytA/fH12s+sE1u8fb/8JY9sL/8=
463-
k8s.io/kubernetes v1.31.3 h1:oqb7HdfnTelrGlZ6ziNugvQ/L/aJWR704114EAhUn9Q=
464-
k8s.io/kubernetes v1.31.3/go.mod h1:9xmT2buyTYj8TRKwRae7FcuY8k5+xlxv7VivvO0KKfs=
459+
k8s.io/kubectl v0.31.6 h1:ngzql/UugqpEbeeyQX678BlVHXks19JR3CFjwKnWuFI=
460+
k8s.io/kubectl v0.31.6/go.mod h1:m6OXbx9s0sZiaZrfHHSEmJUD5CjWPA5+cVg0GZnVdzM=
461+
k8s.io/kubelet v0.31.6 h1:lxVvyLNDcb/QTpQNkDySk3iscgq4zubeSZs3cF6PmaA=
462+
k8s.io/kubelet v0.31.6/go.mod h1:BPghO52ilF7UzFEVBmYFOxdVtLge0P1gixjz84lBzzc=
463+
k8s.io/kubernetes v1.31.6 h1:zVhgWDFHmIj51o5sNARmjdgNvpq4K2Smya8pS5vxqlc=
464+
k8s.io/kubernetes v1.31.6/go.mod h1:9xmT2buyTYj8TRKwRae7FcuY8k5+xlxv7VivvO0KKfs=
465465
k8s.io/mount-utils v0.32.0 h1:KOQAhPzJICATXnc6XCkWoexKbkOexRnMCUW8APFfwg4=
466466
k8s.io/mount-utils v0.32.0/go.mod h1:Kun5c2svjAPx0nnvJKYQWhfeNW+O0EpzHgRhDcYoSY0=
467-
k8s.io/pod-security-admission v0.31.3 h1:8NzEV0HtdStX367AuSKfRMIZHn0hT4xuz8xNEf7/zO8=
468-
k8s.io/pod-security-admission v0.31.3/go.mod h1:YMIcTe/7f9R9d+3ErCMMM3Wtbj9ejKo7Z9S0OxZQrRg=
467+
k8s.io/pod-security-admission v0.31.6 h1:5WnXyl+UNmQb73O0L1w82uaUEPuvp+sxdhXRiOLdCkY=
468+
k8s.io/pod-security-admission v0.31.6/go.mod h1:b+ZpSSR+XMx3t9Pvy/GdcXoI0CEpiWGT7IGAhcOBcGM=
469469
k8s.io/utils v0.0.0-20241210054802-24370beab758 h1:sdbE21q2nlQtFh65saZY+rRM6x6aJJI8IUa1AmH/qa0=
470470
k8s.io/utils v0.0.0-20241210054802-24370beab758/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
471471
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 h1:2770sDpzrjjsAtVhSeUFseziht227YAWYHLGNM8QPwY=

‎vendor/k8s.io/apiserver/pkg/server/filters/maxinflight.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/client-go/tools/remotecommand/v4.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/kubernetes/pkg/features/kube_features.go

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/kubernetes/pkg/volume/util/device_util_linux.go

Lines changed: 6 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/kubernetes/pkg/volume/util/recyclerclient/recycler_client.go

Lines changed: 4 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/kubernetes/test/e2e/framework/debug/resource_usage_gatherer.go

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/kubernetes/test/e2e/framework/flake_reporting_util.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/kubernetes/test/e2e/framework/framework.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)