Skip to content

Commit e081d1f

Browse files
authored
Merge pull request kubernetes-sigs#2054 from andyzhangx/CVE-2025-4563-1.26
[release-1.26] fix: CVE-2025-4563
2 parents 2ca6ee0 + 219d241 commit e081d1f

File tree

10 files changed

+51
-11
lines changed

10 files changed

+51
-11
lines changed

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ require (
3737
k8s.io/client-go v0.32.4
3838
k8s.io/component-base v0.32.4
3939
k8s.io/klog/v2 v2.130.1
40-
k8s.io/kubernetes v1.32.2
40+
k8s.io/kubernetes v1.32.6
4141
k8s.io/mount-utils v0.32.2
4242
k8s.io/pod-security-admission v0.31.1
4343
k8s.io/utils v0.0.0-20250502105355-0f33e8f1c979
@@ -221,7 +221,7 @@ replace (
221221
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.32.2
222222
k8s.io/kubectl => k8s.io/kubectl v0.32.2
223223
k8s.io/kubelet => k8s.io/kubelet v0.32.2
224-
k8s.io/kubernetes => k8s.io/kubernetes v1.32.2
224+
k8s.io/kubernetes => k8s.io/kubernetes v1.32.6
225225
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.32.2
226226
k8s.io/metrics => k8s.io/metrics v0.32.2
227227
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.32.2

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -511,8 +511,8 @@ k8s.io/kubectl v0.32.2 h1:TAkag6+XfSBgkqK9I7ZvwtF0WVtUAvK8ZqTt+5zi1Us=
511511
k8s.io/kubectl v0.32.2/go.mod h1:+h/NQFSPxiDZYX/WZaWw9fwYezGLISP0ud8nQKg+3g8=
512512
k8s.io/kubelet v0.32.2 h1:WFTSYdt3BB1aTApDuKNI16x/4MYqqX8WBBBBh3KupDg=
513513
k8s.io/kubelet v0.32.2/go.mod h1:cC1ms5RS+lu0ckVr6AviCQXHLSPKEBC3D5oaCBdTGkI=
514-
k8s.io/kubernetes v1.32.2 h1:mShetlA102UpjRVSGzB+5vjJwy8oPy8FMWrkTH5f37o=
515-
k8s.io/kubernetes v1.32.2/go.mod h1:tiIKO63GcdPRBHW2WiUFm3C0eoLczl3f7qi56Dm1W8I=
514+
k8s.io/kubernetes v1.32.6 h1:tp1gRjOqZjaoFBek5PN6eSmODdS1QRrH5UKiFP8ZByg=
515+
k8s.io/kubernetes v1.32.6/go.mod h1:REY0Gok66BTTrbGyZaFMNKO9JhxvgBDW9B7aksWRFoY=
516516
k8s.io/mount-utils v0.32.2 h1:aDwp+ucWiVnDr/LpRg88/dsXf/vm6gI1VZkYH3+3+Vw=
517517
k8s.io/mount-utils v0.32.2/go.mod h1:Kun5c2svjAPx0nnvJKYQWhfeNW+O0EpzHgRhDcYoSY0=
518518
k8s.io/pod-security-admission v0.32.2 h1:zDfAb/t0LbNU3z0ZMHtCb1zp8x05gWCGhmBYpUptm9A=

vendor/k8s.io/kubernetes/pkg/apis/core/validation/validation.go

Lines changed: 7 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/features/kube_features.go

Lines changed: 6 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/features/versioned_kube_features.go

Lines changed: 4 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/kubelet/config/common.go

Lines changed: 6 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/util/kernel/constants.go

Lines changed: 0 additions & 4 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/util/resize_util.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/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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1691,7 +1691,7 @@ k8s.io/kubelet/pkg/apis/pluginregistration/v1
16911691
k8s.io/kubelet/pkg/apis/podresources/v1
16921692
k8s.io/kubelet/pkg/apis/podresources/v1alpha1
16931693
k8s.io/kubelet/pkg/apis/stats/v1alpha1
1694-
# k8s.io/kubernetes v1.32.2 => k8s.io/kubernetes v1.32.2
1694+
# k8s.io/kubernetes v1.32.6 => k8s.io/kubernetes v1.32.6
16951695
## explicit; go 1.23.0
16961696
k8s.io/kubernetes/pkg/api/legacyscheme
16971697
k8s.io/kubernetes/pkg/api/service
@@ -2052,7 +2052,7 @@ sigs.k8s.io/yaml/goyaml.v2
20522052
# k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.32.2
20532053
# k8s.io/kubectl => k8s.io/kubectl v0.32.2
20542054
# k8s.io/kubelet => k8s.io/kubelet v0.32.2
2055-
# k8s.io/kubernetes => k8s.io/kubernetes v1.32.2
2055+
# k8s.io/kubernetes => k8s.io/kubernetes v1.32.6
20562056
# k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.32.2
20572057
# k8s.io/metrics => k8s.io/metrics v0.32.2
20582058
# k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.32.2

0 commit comments

Comments
 (0)