Skip to content

Commit 45c46b3

Browse files
authored
Merge pull request #806 from andyzhangx/CVE-2024-5321
fix: CVE-2024-5321
2 parents ea7b175 + 9313bc8 commit 45c46b3

File tree

24 files changed

+170
-131
lines changed

24 files changed

+170
-131
lines changed

go.mod

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ require (
1818
github.com/stretchr/testify v1.9.0
1919
golang.org/x/net v0.27.0
2020
google.golang.org/grpc v1.65.0
21-
k8s.io/api v0.28.9
22-
k8s.io/apimachinery v0.28.9
23-
k8s.io/client-go v0.28.9
24-
k8s.io/component-base v0.28.9
21+
k8s.io/api v0.28.12
22+
k8s.io/apimachinery v0.28.12
23+
k8s.io/client-go v0.28.12
24+
k8s.io/component-base v0.28.12
2525
k8s.io/klog/v2 v2.110.1
26-
k8s.io/kubernetes v1.28.9
26+
k8s.io/kubernetes v1.28.12
2727
k8s.io/mount-utils v0.29.3
2828
k8s.io/pod-security-admission v0.28.8
2929
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
@@ -126,33 +126,33 @@ require (
126126
gopkg.in/yaml.v2 v2.4.0 // indirect
127127
gopkg.in/yaml.v3 v3.0.1 // indirect
128128
k8s.io/apiextensions-apiserver v0.0.0 // indirect
129-
k8s.io/apiserver v0.28.9 // indirect
130-
k8s.io/cloud-provider v0.28.9 // indirect
131-
k8s.io/component-helpers v0.28.9 // indirect
132-
k8s.io/controller-manager v0.28.9 // indirect
133-
k8s.io/kms v0.28.9 // indirect
129+
k8s.io/apiserver v0.28.12 // indirect
130+
k8s.io/cloud-provider v0.28.12 // indirect
131+
k8s.io/component-helpers v0.28.12 // indirect
132+
k8s.io/controller-manager v0.28.12 // indirect
133+
k8s.io/kms v0.28.12 // indirect
134134
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
135135
k8s.io/kubectl v0.0.0 // indirect
136-
k8s.io/kubelet v0.28.9 // indirect
136+
k8s.io/kubelet v0.28.12 // indirect
137137
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect
138138
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
139139
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
140140
)
141141

142142
replace (
143-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.28.9
144-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.28.9
145-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.28.9
146-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.28.9
147-
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.28.9
148-
k8s.io/endpointslice => k8s.io/endpointslice v0.28.9
143+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.28.12
144+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.28.12
145+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.28.12
146+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.28.12
147+
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.28.12
148+
k8s.io/endpointslice => k8s.io/endpointslice v0.28.12
149149
k8s.io/gengo => k8s.io/gengo v0.0.0-20200114144118-36b2048a9120
150-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.28.9
151-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.28.9
152-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.28.9
153-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.28.9
154-
k8s.io/kubectl => k8s.io/kubectl v0.28.9
155-
k8s.io/kubelet => k8s.io/kubelet v0.28.9
156-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.28.9
157-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.28.9
150+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.28.12
151+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.28.12
152+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.28.12
153+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.28.12
154+
k8s.io/kubectl => k8s.io/kubectl v0.28.12
155+
k8s.io/kubelet => k8s.io/kubelet v0.28.12
156+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.28.12
157+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.28.12
158158
)

go.sum

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -436,38 +436,38 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
436436
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
437437
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
438438
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
439-
k8s.io/api v0.28.9 h1:E7VEXXCAlSrp+08zq4zgd+ko6Ttu0Mw+XoXlIkDTVW0=
440-
k8s.io/api v0.28.9/go.mod h1:AnCsDYf3SHjfa8mPG5LGYf+iF4mie+3peLQR51MMCgw=
441-
k8s.io/apiextensions-apiserver v0.28.9 h1:yzPHp+4IASHeu7XIPkAKJrY4UjWdjiAjOcQMd6oNKj0=
442-
k8s.io/apiextensions-apiserver v0.28.9/go.mod h1:Rjhvq5y3JESdZgV2UOByldyefCfRrUguVpBLYOAIbVs=
443-
k8s.io/apimachinery v0.28.9 h1:aXz4Zxsw+Pk4KhBerAtKRxNN1uSMWKfciL/iOdBfXvA=
444-
k8s.io/apimachinery v0.28.9/go.mod h1:zUG757HaKs6Dc3iGtKjzIpBfqTM4yiRsEe3/E7NX15o=
445-
k8s.io/apiserver v0.28.9 h1:koPXvgSXRBDxKJQjJGdZNgPsT9lQv6scJJFipd1m86E=
446-
k8s.io/apiserver v0.28.9/go.mod h1:D51I37WBZojJhmLcjNVE4GSVrjiUHP+yq+N5KvKn2wY=
447-
k8s.io/client-go v0.28.9 h1:mmMvejwc/KDjMLmDpyaxkWNzlWRCJ6ht7Qsbsnwn39Y=
448-
k8s.io/client-go v0.28.9/go.mod h1:GFDy3rUNId++WGrr0hRaBrs+y1eZz5JtVZODEalhRMo=
449-
k8s.io/cloud-provider v0.28.9 h1:FBW4Ii1NdXCHKprzkM8/s5BpxvLgJmYrZTNJABsVX7Y=
450-
k8s.io/cloud-provider v0.28.9/go.mod h1:7tFyiftAlSARvJS6mzZQQKKDQA81asNQ2usg35R3Exo=
451-
k8s.io/component-base v0.28.9 h1:ySM2PR8Z/xaUSG1Akd3yM6dqUezTltI7S5aV41MMuuc=
452-
k8s.io/component-base v0.28.9/go.mod h1:QtWzscEhCKRfHV24/S+11BwWjVxhC6fd3RYoEgZcWFU=
453-
k8s.io/component-helpers v0.28.9 h1:knX9F2nRoxF4wplgXO4C5tE4/k7HGszK3177Tm4+CUc=
454-
k8s.io/component-helpers v0.28.9/go.mod h1:TdAkLbywEDE2CB5h8LbM/W03T3k8wvqAaoPcEZrr6Z4=
455-
k8s.io/controller-manager v0.28.9 h1:muAtmO2mDN7pDkAJQMknvWy+WQhkvvi/jK1V82+qbLw=
456-
k8s.io/controller-manager v0.28.9/go.mod h1:RYP65K6GWLRWYZR7PRRaStfvgeXkhCGZwJsxRPuaDV0=
457-
k8s.io/csi-translation-lib v0.28.9 h1:zl93l7wk0iwKInyRJfaodvsWf1z8QtWCN9a5OqHeT3o=
458-
k8s.io/csi-translation-lib v0.28.9/go.mod h1:eOniPQitdkuyVh+gtktg3yeDJQu/IidIUSMadDPLhak=
439+
k8s.io/api v0.28.12 h1:C2hpsaso18pqn0Dmkfnbv/YCctozTC3KGGuZ6bF7zhQ=
440+
k8s.io/api v0.28.12/go.mod h1:qjswI+whxvf9LAKD4sEYHfy+WgHGWeH+H5sCRQMwZAQ=
441+
k8s.io/apiextensions-apiserver v0.28.12 h1:6GA64rylk5q0mbXfHHFVgfL1jx/4p6RU+Y+ni2DUuZc=
442+
k8s.io/apiextensions-apiserver v0.28.12/go.mod h1:Len29ySvb/fnrXvioTxg2l6iFi97B53Bm3/jBMBllCE=
443+
k8s.io/apimachinery v0.28.12 h1:VepMEVOi9o7L/4wMAXJq+3BK9tqBIeerTB+HSOTKeo0=
444+
k8s.io/apimachinery v0.28.12/go.mod h1:zUG757HaKs6Dc3iGtKjzIpBfqTM4yiRsEe3/E7NX15o=
445+
k8s.io/apiserver v0.28.12 h1:fvZItMw20ySP/QAU5//Ov1pJFyvrr8abeUsh3ZyF8FI=
446+
k8s.io/apiserver v0.28.12/go.mod h1:46S3UWu620UhP5skPJ+WQWC3iWCrl1AiYJPyHxVueE4=
447+
k8s.io/client-go v0.28.12 h1:li7iRPRQF3vDki6gTxT/kXWJvw3BkJSdjVPVhDTZQec=
448+
k8s.io/client-go v0.28.12/go.mod h1:yEzH2Z+nEGlrnKyHJWcJsbOr5tGdIj04dj1TVQOg0wE=
449+
k8s.io/cloud-provider v0.28.12 h1:AJd4BgDjagX6WSm5fMRA/V0rH9rteIkx7j6Jg2z9yNQ=
450+
k8s.io/cloud-provider v0.28.12/go.mod h1:SFM1GGNoLGXROMWyuU+ovUzqVUmUk0Y8Y7O4yYnhf/M=
451+
k8s.io/component-base v0.28.12 h1:ZNq6QFFGCPjaAzWqYHaQRoAY5seoK3vP0pZOjgxOzNc=
452+
k8s.io/component-base v0.28.12/go.mod h1:8zI5TmGuHX6R5Lay61Ox7wb+dsEENl0NBmVSiHMQu1c=
453+
k8s.io/component-helpers v0.28.12 h1:tHF4FcM/CxviA684futgMXhQeC2NOFPvHVKseixc7Cs=
454+
k8s.io/component-helpers v0.28.12/go.mod h1:VbQ5E9qnr8alyAS3b3pqXKvkEOJKoj6z6PA8S+6Wlws=
455+
k8s.io/controller-manager v0.28.12 h1:A/A14ErMuTuBW8myUCSfDr2QG5qS90ZV2DohyueAN8A=
456+
k8s.io/controller-manager v0.28.12/go.mod h1:SEIMkdUzB4saf4sdTU2wzST6PU9zHGsTDwhoM/pVoko=
457+
k8s.io/csi-translation-lib v0.28.12 h1:lrWqfa3AiOg3EIw/q0xPWg1ZqQyDfD1rGe5J4QFx+hA=
458+
k8s.io/csi-translation-lib v0.28.12/go.mod h1:SXEFryzUH27XNbiI46Qz5IhfG68Pyiah8/zGrnKNrn8=
459459
k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0=
460460
k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo=
461-
k8s.io/kms v0.28.9 h1:ApCWJulBl+uFRTr2jtTpG1lffmqqMuLnOH/RUbtO4UY=
462-
k8s.io/kms v0.28.9/go.mod h1:VgyAIRMFqZX9lHyixecU/JTI0wnPD1wCIlquvlXRJ+Y=
461+
k8s.io/kms v0.28.12 h1:YEcJWelR7ChLI7le/slHpeIkx7v6MoPkITo3JyL8s1M=
462+
k8s.io/kms v0.28.12/go.mod h1:EZtSJo9PoqEe/aB/X5sXPRl5LHukSuXlDrDnY76lJjY=
463463
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 h1:LyMgNKD2P8Wn1iAwQU5OhxCKlKJy0sHc+PcDwFB24dQ=
464464
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9/go.mod h1:wZK2AVp1uHCp4VamDVgBP2COHZjqD1T68Rf0CM3YjSM=
465-
k8s.io/kubectl v0.28.9 h1:FTf/aapuuFxPmt8gYUeqUmcsgG0gKC2ei6n+TO5sGOw=
466-
k8s.io/kubectl v0.28.9/go.mod h1:ip/zTUr1MM/H2M+YbPHnSKLt0x6kb85SJtRSjwEGDfs=
467-
k8s.io/kubelet v0.28.9 h1:76v00fFLeniz27kXhGGUIxONdwa9LKcD2Jd5cXYAZko=
468-
k8s.io/kubelet v0.28.9/go.mod h1:46P39DFjI+E59nU2OgpatyS3oWy58ClulKO6riZ/97o=
469-
k8s.io/kubernetes v1.28.9 h1:I4sYGQJOuxEo4/QWoY7M8kDB7O0HcH266t6o6mR6ogg=
470-
k8s.io/kubernetes v1.28.9/go.mod h1:chlmcCDBnOA/y+572cw8dO0Rci1wiA8bm5+zhPdFLCk=
465+
k8s.io/kubectl v0.28.12 h1:CyGVOUO83jYxwLI5XtBFNoerAQj47fnEDrCPKWxlAi8=
466+
k8s.io/kubectl v0.28.12/go.mod h1:KzG7ROxXnUqfS6S+xJIIbd6WMpFYNByyxqNkIhxS6Qs=
467+
k8s.io/kubelet v0.28.12 h1:ACRS1b6XxIxAJoOJ95bsy0qm0DoxD6h/Dwi4U6Pot74=
468+
k8s.io/kubelet v0.28.12/go.mod h1:DYlF/KqAA4WoiBElCjeDKGv2K37FLTUmTWyxMDv9s8A=
469+
k8s.io/kubernetes v1.28.12 h1:DtWB8ZjoYiN/PXD4qDXFppf9IouVUavn6r3S+3NMUkU=
470+
k8s.io/kubernetes v1.28.12/go.mod h1:chlmcCDBnOA/y+572cw8dO0Rci1wiA8bm5+zhPdFLCk=
471471
k8s.io/mount-utils v0.29.3 h1:iEcqPP7Vv8UClH8nnMfovtmy/04fIloRW9JuSXykoZ0=
472472
k8s.io/mount-utils v0.29.3/go.mod h1:9IWJTMe8tG0MYMLEp60xK9GYVeCdA3g4LowmnVi+t9Y=
473473
k8s.io/pod-security-admission v0.28.8 h1:A61fnzRmIhYRv1AUKYkljxYJVxDAypA4dARb39xBJ4I=

vendor/k8s.io/apiserver/pkg/storage/cacher/watch_cache.go

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

vendor/k8s.io/apiserver/pkg/storage/etcd3/metrics/metrics.go

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

vendor/k8s.io/cloud-provider/cloud.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/securitycontext/util.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/storage/utils/create.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/test/e2e/testing-manifests/storage-csi/external-attacher/rbac.yaml

Lines changed: 2 additions & 2 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/testing-manifests/storage-csi/external-health-monitor/external-health-monitor-controller/rbac.yaml

Lines changed: 2 additions & 2 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/testing-manifests/storage-csi/external-provisioner/rbac.yaml

Lines changed: 9 additions & 5 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/testing-manifests/storage-csi/external-resizer/rbac.yaml

Lines changed: 7 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/testing-manifests/storage-csi/external-snapshotter/csi-snapshotter/rbac-csi-snapshotter.yaml

Lines changed: 16 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/test/e2e/testing-manifests/storage-csi/hostpath/README.md

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

0 commit comments

Comments
 (0)