Skip to content

Commit 1897f23

Browse files
authored
Merge pull request #1501 from andyzhangx/CVE-2024-5321-1.23
[release-1.23] fix: CVE-2024-5321
2 parents 78001b6 + 6791181 commit 1897f23

File tree

27 files changed

+365
-166
lines changed

27 files changed

+365
-166
lines changed

go.mod

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ require (
2222
golang.org/x/net v0.27.0
2323
google.golang.org/grpc v1.65.0
2424
google.golang.org/protobuf v1.34.2
25-
k8s.io/api v0.29.4
26-
k8s.io/apimachinery v0.29.4
27-
k8s.io/client-go v0.29.4
28-
k8s.io/component-base v0.29.4
25+
k8s.io/api v0.29.7
26+
k8s.io/apimachinery v0.29.7
27+
k8s.io/client-go v0.29.7
28+
k8s.io/component-base v0.29.7
2929
k8s.io/klog/v2 v2.120.1
30-
k8s.io/kubernetes v1.29.4
31-
k8s.io/mount-utils v0.29.4
30+
k8s.io/kubernetes v1.29.7
31+
k8s.io/mount-utils v0.29.7
3232
k8s.io/utils v0.0.0-20231127182322-b307cd553661
3333
sigs.k8s.io/cloud-provider-azure v1.27.1-0.20240312050048-978ce44d3559
3434
sigs.k8s.io/yaml v1.4.0
@@ -42,8 +42,8 @@ require (
4242
github.com/onsi/ginkgo/v2 v2.17.1
4343
github.com/pkg/errors v0.9.1
4444
github.com/satori/go.uuid v1.2.0
45-
k8s.io/apiserver v0.29.4
46-
k8s.io/pod-security-admission v0.29.4
45+
k8s.io/apiserver v0.29.7
46+
k8s.io/pod-security-admission v0.29.7
4747
sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.0.0-20240218020800-ba9f211f36bf
4848
)
4949

@@ -157,9 +157,9 @@ require (
157157
gopkg.in/yaml.v3 v3.0.1 // indirect
158158
k8s.io/apiextensions-apiserver v0.0.0 // indirect
159159
k8s.io/cloud-provider v0.29.2 // indirect
160-
k8s.io/component-helpers v0.29.4 // indirect
161-
k8s.io/controller-manager v0.29.4 // indirect
162-
k8s.io/kms v0.29.4 // indirect
160+
k8s.io/component-helpers v0.29.7 // indirect
161+
k8s.io/controller-manager v0.29.7 // indirect
162+
k8s.io/kms v0.29.7 // indirect
163163
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
164164
k8s.io/kubectl v0.0.0 // indirect
165165
k8s.io/kubelet v0.29.2 // indirect
@@ -172,31 +172,31 @@ require (
172172
replace (
173173
github.com/niemeyer/pretty => github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e
174174
go.etcd.io/etcd => go.etcd.io/etcd v0.0.0-20200410171415-59f5fb25a533
175-
k8s.io/api => k8s.io/api v0.29.4
176-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.4
177-
k8s.io/apimachinery => k8s.io/apimachinery v0.29.4
178-
k8s.io/apiserver => k8s.io/apiserver v0.29.4
179-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.29.4
180-
k8s.io/client-go => k8s.io/client-go v0.29.4
181-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.29.4
182-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.29.4
183-
k8s.io/code-generator => k8s.io/code-generator v0.29.4
184-
k8s.io/component-base => k8s.io/component-base v0.29.4
185-
k8s.io/component-helpers => k8s.io/component-helpers v0.29.4
186-
k8s.io/controller-manager => k8s.io/controller-manager v0.29.4
187-
k8s.io/cri-api => k8s.io/cri-api v0.29.4
188-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.29.4
189-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.29.4
190-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.29.4
191-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.29.4
192-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.29.4
193-
k8s.io/kubectl => k8s.io/kubectl v0.29.4
194-
k8s.io/kubelet => k8s.io/kubelet v0.29.4
195-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.29.4
196-
k8s.io/metrics => k8s.io/metrics v0.29.4
197-
k8s.io/mount-utils => k8s.io/mount-utils v0.29.4
198-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.29.4
199-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.4
200-
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.29.4
201-
k8s.io/sample-controller => k8s.io/sample-controller v0.29.4
175+
k8s.io/api => k8s.io/api v0.29.7
176+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.7
177+
k8s.io/apimachinery => k8s.io/apimachinery v0.29.7
178+
k8s.io/apiserver => k8s.io/apiserver v0.29.7
179+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.29.7
180+
k8s.io/client-go => k8s.io/client-go v0.29.7
181+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.29.7
182+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.29.7
183+
k8s.io/code-generator => k8s.io/code-generator v0.29.7
184+
k8s.io/component-base => k8s.io/component-base v0.29.7
185+
k8s.io/component-helpers => k8s.io/component-helpers v0.29.7
186+
k8s.io/controller-manager => k8s.io/controller-manager v0.29.7
187+
k8s.io/cri-api => k8s.io/cri-api v0.29.7
188+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.29.7
189+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.29.7
190+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.29.7
191+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.29.7
192+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.29.7
193+
k8s.io/kubectl => k8s.io/kubectl v0.29.7
194+
k8s.io/kubelet => k8s.io/kubelet v0.29.7
195+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.29.7
196+
k8s.io/metrics => k8s.io/metrics v0.29.7
197+
k8s.io/mount-utils => k8s.io/mount-utils v0.29.7
198+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.29.7
199+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.7
200+
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.29.7
201+
k8s.io/sample-controller => k8s.io/sample-controller v0.29.7
202202
)

go.sum

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -416,42 +416,42 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C
416416
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
417417
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
418418
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
419-
k8s.io/api v0.29.4 h1:WEnF/XdxuCxdG3ayHNRR8yH3cI1B/llkWBma6bq4R3w=
420-
k8s.io/api v0.29.4/go.mod h1:DetSv0t4FBTcEpfA84NJV3g9a7+rSzlUHk5ADAYHUv0=
421-
k8s.io/apiextensions-apiserver v0.29.4 h1:M7hbuHU/ckbibR7yPbe6DyNWgTFKNmZDbdZKD8q1Smk=
422-
k8s.io/apiextensions-apiserver v0.29.4/go.mod h1:TTDC9fB+0kHY2rogf5hgBR03KBKCwED+GHUsXGpR7SM=
423-
k8s.io/apimachinery v0.29.4 h1:RaFdJiDmuKs/8cm1M6Dh1Kvyh59YQFDcFuFTSmXes6Q=
424-
k8s.io/apimachinery v0.29.4/go.mod h1:i3FJVwhvSp/6n8Fl4K97PJEP8C+MM+aoDq4+ZJBf70Y=
425-
k8s.io/apiserver v0.29.4 h1:wPwGOO58GQOpRiZu59P5eRoDcB7QtV+QBglkRiXwCiM=
426-
k8s.io/apiserver v0.29.4/go.mod h1:VqTF9t98HVfhKZVRohCPezsdUt9u2g3bHKftxGcXoRo=
427-
k8s.io/client-go v0.29.4 h1:79ytIedxVfyXV8rpH3jCBW0u+un0fxHDwX5F9K8dPR8=
428-
k8s.io/client-go v0.29.4/go.mod h1:kC1thZQ4zQWYwldsfI088BbK6RkxK+aF5ebV8y9Q4tk=
429-
k8s.io/cloud-provider v0.29.4 h1:XRKl818NKQWan4UZ7fXFAkEJLJkBFq5sQROrbLbryM4=
430-
k8s.io/cloud-provider v0.29.4/go.mod h1:sC7wyt5z5IRoNuU9JhEuMdRnhDEz6cWAJCyMcNUH9X8=
431-
k8s.io/component-base v0.29.4 h1:xeKzuuHI/1tjleu5jycDAcYbhAxeGHCQBZUY2eRIkOo=
432-
k8s.io/component-base v0.29.4/go.mod h1:pYjt+oEZP9gtmwSikwAJgfSBikqKX2gOqRat0QjmQt0=
433-
k8s.io/component-helpers v0.29.4 h1:lbVFhywtv64KlaIYTKszkHaFAqwCjNn7xyRTeWorzfI=
434-
k8s.io/component-helpers v0.29.4/go.mod h1:rMOVMGYEju7/GKMV0USfYAYJBIQdxlMMN1VFl/Mf2so=
435-
k8s.io/controller-manager v0.29.4 h1:rzEwLboRTXBZhYUY02nNhORHQlcXGDE3EPS2IZRd0cg=
436-
k8s.io/controller-manager v0.29.4/go.mod h1:XG6oraSxieDl6XBdO2HnkA6DwEfoCKS3OCpqO4Xb0zU=
437-
k8s.io/csi-translation-lib v0.29.4 h1:ad0SlFsd0iB3PyXiAVVN4KxsTqgmPEHQyYGbJVQP1rA=
438-
k8s.io/csi-translation-lib v0.29.4/go.mod h1:xdLMENgzc213O3qba2fWYPgBv3JiPqRfjsRanu2Te64=
419+
k8s.io/api v0.29.7 h1:Q2/thp7YYESgy0MGzxT9RvA/6doLJHBXSFH8GGLxSbc=
420+
k8s.io/api v0.29.7/go.mod h1:mPimdbyuIjwoLtBEVIGVUYb4BKOE+44XHt/n4IqKsLA=
421+
k8s.io/apiextensions-apiserver v0.29.7 h1:X62u7vUGfwW5rYJB5jkZDr0uV2XSyEHJRdxnfD5PaLs=
422+
k8s.io/apiextensions-apiserver v0.29.7/go.mod h1:JzBXxlZKKdtEYGr4yiN+s0eXheCTYgKDay8JXPfSGoQ=
423+
k8s.io/apimachinery v0.29.7 h1:ICXzya58Q7hyEEfnTrbmdfX1n1schSepX2KUfC2/ykc=
424+
k8s.io/apimachinery v0.29.7/go.mod h1:i3FJVwhvSp/6n8Fl4K97PJEP8C+MM+aoDq4+ZJBf70Y=
425+
k8s.io/apiserver v0.29.7 h1:yvdZAZJ6Bmih8Iu8CqUB74otyPP0OM3XKzYzAFiWsY4=
426+
k8s.io/apiserver v0.29.7/go.mod h1:MjEld3ySZrQ4eOzf6OKANT/v8GvM3sb1e5vozXoIirs=
427+
k8s.io/client-go v0.29.7 h1:vTtiFrGBKlcBhxaeZC4eDrqui1e108nsTyue/KU63IY=
428+
k8s.io/client-go v0.29.7/go.mod h1:69BvVqdRozgR/9TP45u/oO0tfrdbP+I8RqrcCJQshzg=
429+
k8s.io/cloud-provider v0.29.7 h1:FqUe1KhLVy+4vPBE4M4IxNO63mBKbStxSUoSq2Xo/Ow=
430+
k8s.io/cloud-provider v0.29.7/go.mod h1:wtAdRffIlqraPEgsSi3e+sBO+o1WHHCnndGaG2VDlhc=
431+
k8s.io/component-base v0.29.7 h1:zXLJvZjvvDWdYmZCwZYk95E1Fd2oRXUz71mQukkRk5I=
432+
k8s.io/component-base v0.29.7/go.mod h1:ddLTpIrjazaRI1EG83M41GNcYEAdskuQmx4JOOSXCOg=
433+
k8s.io/component-helpers v0.29.7 h1:zLFeGg/Ab6QRC69xv08Syfnzc9ghgccp0gr5okb/r6M=
434+
k8s.io/component-helpers v0.29.7/go.mod h1:fBB9g4OrGCxo2+px6+kU4BPQ56WnBbL8n2NY6jIaMNY=
435+
k8s.io/controller-manager v0.29.7 h1:8FC9kQAm+BUTrAKyCS2uOaTXBytV3eEOIREfrFxaCjo=
436+
k8s.io/controller-manager v0.29.7/go.mod h1:lAua8GONLnkPAHPSzU0POmvHLhsKeHbjHnVtEQPfUno=
437+
k8s.io/csi-translation-lib v0.29.7 h1:6z1iFhTmVMK9mebK2eodvDCKv3bfL0OFu5z2C8YNvMI=
438+
k8s.io/csi-translation-lib v0.29.7/go.mod h1:+5ZOwRS5LUQOghtqv6QWWmadixbm697xNHZC318oVf4=
439439
k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw=
440440
k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
441-
k8s.io/kms v0.29.4 h1:cFGEoCLwoXk/eqYZppLZxybCdmEWeRKMCbm9f13IdRQ=
442-
k8s.io/kms v0.29.4/go.mod h1:vWVImKkJd+1BQY4tBwdfSwjQBiLrnbNtHADcDEDQFtk=
441+
k8s.io/kms v0.29.7 h1:4ELQdx7T4EPKbN/QMj6SeZizrEKapza5YF8e5XtZPv0=
442+
k8s.io/kms v0.29.7/go.mod h1:vWVImKkJd+1BQY4tBwdfSwjQBiLrnbNtHADcDEDQFtk=
443443
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/AuzbMm96cd3YHRTU83I780=
444444
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA=
445-
k8s.io/kubectl v0.29.4 h1:2LFrAznoDZjN8JFMSUcuhER5o+yjTLzWWbOiDzVjmd8=
446-
k8s.io/kubectl v0.29.4/go.mod h1:YTKRF9y1/ccqZ2bnpOWaJD8V7johKqZR/qOMq+0pfxU=
447-
k8s.io/kubelet v0.29.4 h1:6fTt4sTd5xqTtIhVoS7PkiFUBevQsyu3ZmENVvwY62M=
448-
k8s.io/kubelet v0.29.4/go.mod h1:lAu6Z17pxKwgM+9hsgGkqFjYTOhbc0dnZ6GNnlbjYW0=
449-
k8s.io/kubernetes v1.29.4 h1:n4VCbX9cUhxHI+zw+m2iZlzT73/mrEJBHIMeauh9g4U=
450-
k8s.io/kubernetes v1.29.4/go.mod h1:28sDhcb87LX5z3GWAKYmLrhrifxi4W9bEWua4DRTIvk=
451-
k8s.io/mount-utils v0.29.4 h1:tW/URea4gtXlaVW7VObr52NQhS+z3SXTg1GUaFZjRL4=
452-
k8s.io/mount-utils v0.29.4/go.mod h1:SHUMR9n3b6tLgEmlyT36cL6fV6Sjwa5CJhc0guCXvb0=
453-
k8s.io/pod-security-admission v0.29.4 h1:XatfG2zbye9SRaHQhE7EdiIu462ak3TctnkvdrUVk7I=
454-
k8s.io/pod-security-admission v0.29.4/go.mod h1:PNErt3eRnzVx2zxIdYmgk7vBos5Qm4c8U5QXKvXFfxQ=
445+
k8s.io/kubectl v0.29.7 h1:D+Jheug9M++zlt67cROZgxaIjrDdLqp9jkW/EYrXAoM=
446+
k8s.io/kubectl v0.29.7/go.mod h1:VOEJkcfKTO/X8xSSB6d2JXP/Qni6xtjuI3CUP52T9bM=
447+
k8s.io/kubelet v0.29.7 h1:YapoCGXAXRLCuRaEmCaHIbM6Ogw6dipRU+6ijMU+weo=
448+
k8s.io/kubelet v0.29.7/go.mod h1:6cnRnEhVk4WvZC1bsegIgxhluMHa/c0Php+1bWJabLQ=
449+
k8s.io/kubernetes v1.29.7 h1:cC7YHkNIbHJ6kxjeN6cLZDU4wFxuymyB89NZl3rKI3Y=
450+
k8s.io/kubernetes v1.29.7/go.mod h1:28sDhcb87LX5z3GWAKYmLrhrifxi4W9bEWua4DRTIvk=
451+
k8s.io/mount-utils v0.29.7 h1:M0LA8Tx8HtpwBy24fajiUsaklIiNi1tNrHpROxX4bLI=
452+
k8s.io/mount-utils v0.29.7/go.mod h1:SHUMR9n3b6tLgEmlyT36cL6fV6Sjwa5CJhc0guCXvb0=
453+
k8s.io/pod-security-admission v0.29.7 h1:GeL63bPR29TTmc9T9RNDR86Xi0gg0+jcISf+O+oIJDw=
454+
k8s.io/pod-security-admission v0.29.7/go.mod h1:2fZW4VgBjir4qas3JB13uZDpxvJM1n9zkKRfY6p89fI=
455455
k8s.io/utils v0.0.0-20231127182322-b307cd553661 h1:FepOBzJ0GXm8t0su67ln2wAZjbQ6RxQGZDnzuLcrUTI=
456456
k8s.io/utils v0.0.0-20231127182322-b307cd553661/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
457457
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 h1:TgtAeesdhpm2SGwkQasmbeqDo8th5wOBA5h/AjTKA4I=

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/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/pkg/util/filesystem/defaultfs.go

Lines changed: 2 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/pkg/util/filesystem/util_unix.go

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

0 commit comments

Comments
 (0)