Skip to content

Commit 505c6aa

Browse files
authored
Merge pull request #2279 from andyzhangx/CVE-2025-13281-1.26
[release-1.26] fix: CVE-2025-13281
2 parents 1cf6f04 + b5aac04 commit 505c6aa

File tree

9 files changed

+159
-31
lines changed

9 files changed

+159
-31
lines changed

go.mod

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ require (
3737
k8s.io/client-go v0.32.8
3838
k8s.io/component-base v0.32.8
3939
k8s.io/klog/v2 v2.130.1
40-
k8s.io/kubernetes v1.32.8
40+
k8s.io/kubernetes v1.32.10
4141
k8s.io/mount-utils v0.32.8
4242
k8s.io/pod-security-admission v0.31.1
4343
k8s.io/utils v0.0.0-20250502105355-0f33e8f1c979
@@ -222,7 +222,6 @@ replace (
222222
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.32.8
223223
k8s.io/kubectl => k8s.io/kubectl v0.32.8
224224
k8s.io/kubelet => k8s.io/kubelet v0.32.8
225-
k8s.io/kubernetes => k8s.io/kubernetes v1.32.8
226225
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.32.8
227226
k8s.io/metrics => k8s.io/metrics v0.32.8
228227
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.32.8

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -513,8 +513,8 @@ k8s.io/kubectl v0.32.8 h1:X6I2Rmd+RZvtu+BRplREUTkIYgUc87s87m/kZsbKC7s=
513513
k8s.io/kubectl v0.32.8/go.mod h1:RbwOkKZdxIFzhFIxXY3on/n6aaSXCc353iJ0IXb4DvU=
514514
k8s.io/kubelet v0.32.8 h1:9N4DRmcNFBNnS62Nf8If7wiCtkaSrR7tTsXPe0DC0aI=
515515
k8s.io/kubelet v0.32.8/go.mod h1:8cRHXzRmXftGJrvR3e32jGiqStzVrK6hPgoQqdjvEAE=
516-
k8s.io/kubernetes v1.32.8 h1:NePHsWPIT9NQZ9w5QT/chJMuwjFFGGZxalvD6FlOjlw=
517-
k8s.io/kubernetes v1.32.8/go.mod h1:REY0Gok66BTTrbGyZaFMNKO9JhxvgBDW9B7aksWRFoY=
516+
k8s.io/kubernetes v1.32.10 h1:yiRa8DyKp4Yrbv028MP6kpp5N1N3eO8Hp/tSCbBGIPE=
517+
k8s.io/kubernetes v1.32.10/go.mod h1:o2pRStsMR7Uq62zcugfUEQsxnuyFt9r8migMrbsVH00=
518518
k8s.io/mount-utils v0.32.8 h1:xe/0LiH2URGPM4dTyhvivRdUiUfyssPeUODRekw3Pxg=
519519
k8s.io/mount-utils v0.32.8/go.mod h1:Kun5c2svjAPx0nnvJKYQWhfeNW+O0EpzHgRhDcYoSY0=
520520
k8s.io/pod-security-admission v0.32.8 h1:nSyjXGZWq9CWr4ehXxNTIlC6I8P0f9aIqcz+9DCFw1Y=

vendor/k8s.io/kubernetes/pkg/securitycontext/util.go

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

vendor/k8s.io/kubernetes/pkg/securitycontext/util_darwin.go

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

vendor/k8s.io/kubernetes/pkg/securitycontext/util_linux.go

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

vendor/k8s.io/kubernetes/pkg/securitycontext/util_windows.go

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

vendor/k8s.io/kubernetes/pkg/volume/plugins.go

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

vendor/k8s.io/kubernetes/test/utils/image/manifest.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/modules.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1709,7 +1709,7 @@ k8s.io/kubelet/pkg/apis/pluginregistration/v1
17091709
k8s.io/kubelet/pkg/apis/podresources/v1
17101710
k8s.io/kubelet/pkg/apis/podresources/v1alpha1
17111711
k8s.io/kubelet/pkg/apis/stats/v1alpha1
1712-
# k8s.io/kubernetes v1.32.8 => k8s.io/kubernetes v1.32.8
1712+
# k8s.io/kubernetes v1.32.10
17131713
## explicit; go 1.23.0
17141714
k8s.io/kubernetes/pkg/api/legacyscheme
17151715
k8s.io/kubernetes/pkg/api/service
@@ -2070,7 +2070,6 @@ sigs.k8s.io/yaml/goyaml.v2
20702070
# k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.32.8
20712071
# k8s.io/kubectl => k8s.io/kubectl v0.32.8
20722072
# k8s.io/kubelet => k8s.io/kubelet v0.32.8
2073-
# k8s.io/kubernetes => k8s.io/kubernetes v1.32.8
20742073
# k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.32.8
20752074
# k8s.io/metrics => k8s.io/metrics v0.32.8
20762075
# k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.32.8

0 commit comments

Comments
 (0)