Skip to content

Commit 3e981a3

Browse files
andyzhangxandyzhangx
authored
Merge pull request #1368 from andyzhangx/CVE-2024-3177-1.24
[release-1.24] fix: CVE-2024-3177
2 parents a3058d1 + e351b98 commit 3e981a3

File tree

24 files changed

+311
-155
lines changed

24 files changed

+311
-155
lines changed

‎go.mod

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ require (
2929
golang.org/x/net v0.24.0
3030
google.golang.org/grpc v1.59.0
3131
google.golang.org/protobuf v1.33.0
32-
k8s.io/api v0.29.3
33-
k8s.io/apimachinery v0.29.3
34-
k8s.io/client-go v0.29.3
35-
k8s.io/component-base v0.29.3
32+
k8s.io/api v0.29.4
33+
k8s.io/apimachinery v0.29.4
34+
k8s.io/client-go v0.29.4
35+
k8s.io/component-base v0.29.4
3636
k8s.io/klog/v2 v2.120.1
37-
k8s.io/kubernetes v1.29.0
38-
k8s.io/mount-utils v0.29.0
37+
k8s.io/kubernetes v1.29.4
38+
k8s.io/mount-utils v0.29.4
3939
k8s.io/utils v0.0.0-20231127182322-b307cd553661
4040
sigs.k8s.io/cloud-provider-azure v1.27.1-0.20240418020948-86cfc443b48c
4141
sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.0.4
@@ -146,15 +146,15 @@ require (
146146
gopkg.in/yaml.v2 v2.4.0 // indirect
147147
gopkg.in/yaml.v3 v3.0.1 // indirect
148148
k8s.io/apiextensions-apiserver v0.0.0 // indirect
149-
k8s.io/apiserver v0.29.3
149+
k8s.io/apiserver v0.29.4
150150
k8s.io/cloud-provider v0.29.3 // indirect
151-
k8s.io/component-helpers v0.29.3 // indirect
152-
k8s.io/controller-manager v0.29.3 // indirect
153-
k8s.io/kms v0.29.3 // indirect
151+
k8s.io/component-helpers v0.29.4 // indirect
152+
k8s.io/controller-manager v0.29.4 // indirect
153+
k8s.io/kms v0.29.4 // indirect
154154
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
155155
k8s.io/kubectl v0.0.0 // indirect
156156
k8s.io/kubelet v0.29.3 // indirect
157-
k8s.io/pod-security-admission v0.29.0
157+
k8s.io/pod-security-admission v0.29.4
158158
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 // indirect
159159
sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.0.13
160160
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
@@ -170,33 +170,33 @@ require (
170170
)
171171

172172
replace (
173-
k8s.io/api => k8s.io/api v0.29.0
174-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.0
175-
k8s.io/apimachinery => k8s.io/apimachinery v0.29.0
176-
k8s.io/apiserver => k8s.io/apiserver v0.29.0
177-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.29.0
178-
k8s.io/client-go => k8s.io/client-go v0.29.0
179-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.29.0
180-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.29.0
181-
k8s.io/code-generator => k8s.io/code-generator v0.29.0
182-
k8s.io/component-base => k8s.io/component-base v0.29.0
183-
k8s.io/component-helpers => k8s.io/component-helpers v0.29.0
184-
k8s.io/controller-manager => k8s.io/controller-manager v0.29.0
185-
k8s.io/cri-api => k8s.io/cri-api v0.29.0
186-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.29.0
187-
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.29.0
188-
k8s.io/endpointslice => k8s.io/endpointslice v0.29.0
189-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.29.0
190-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.29.0
191-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.29.0
192-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.29.0
193-
k8s.io/kubectl => k8s.io/kubectl v0.29.0
194-
k8s.io/kubelet => k8s.io/kubelet v0.29.0
195-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.29.0
196-
k8s.io/metrics => k8s.io/metrics v0.29.0
197-
k8s.io/mount-utils => k8s.io/mount-utils v0.29.0
198-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.29.0
199-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.0
200-
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.29.0
201-
k8s.io/sample-controller => k8s.io/sample-controller v0.29.0
173+
k8s.io/api => k8s.io/api v0.29.4
174+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.4
175+
k8s.io/apimachinery => k8s.io/apimachinery v0.29.4
176+
k8s.io/apiserver => k8s.io/apiserver v0.29.4
177+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.29.4
178+
k8s.io/client-go => k8s.io/client-go v0.29.4
179+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.29.4
180+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.29.4
181+
k8s.io/code-generator => k8s.io/code-generator v0.29.4
182+
k8s.io/component-base => k8s.io/component-base v0.29.4
183+
k8s.io/component-helpers => k8s.io/component-helpers v0.29.4
184+
k8s.io/controller-manager => k8s.io/controller-manager v0.29.4
185+
k8s.io/cri-api => k8s.io/cri-api v0.29.4
186+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.29.4
187+
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.29.4
188+
k8s.io/endpointslice => k8s.io/endpointslice 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
202202
)

‎go.sum

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -426,42 +426,42 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C
426426
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
427427
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
428428
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
429-
k8s.io/api v0.29.0 h1:NiCdQMY1QOp1H8lfRyeEf8eOwV6+0xA6XEE44ohDX2A=
430-
k8s.io/api v0.29.0/go.mod h1:sdVmXoz2Bo/cb77Pxi71IPTSErEW32xa4aXwKH7gfBA=
431-
k8s.io/apiextensions-apiserver v0.29.0 h1:0VuspFG7Hj+SxyF/Z/2T0uFbI5gb5LRgEyUVE3Q4lV0=
432-
k8s.io/apiextensions-apiserver v0.29.0/go.mod h1:TKmpy3bTS0mr9pylH0nOt/QzQRrW7/h7yLdRForMZwc=
433-
k8s.io/apimachinery v0.29.0 h1:+ACVktwyicPz0oc6MTMLwa2Pw3ouLAfAon1wPLtG48o=
434-
k8s.io/apimachinery v0.29.0/go.mod h1:eVBxQ/cwiJxH58eK/jd/vAk4mrxmVlnpBH5J2GbMeis=
435-
k8s.io/apiserver v0.29.0 h1:Y1xEMjJkP+BIi0GSEv1BBrf1jLU9UPfAnnGGbbDdp7o=
436-
k8s.io/apiserver v0.29.0/go.mod h1:31n78PsRKPmfpee7/l9NYEv67u6hOL6AfcE761HapDM=
437-
k8s.io/client-go v0.29.0 h1:KmlDtFcrdUzOYrBhXHgKw5ycWzc3ryPX5mQe0SkG3y8=
438-
k8s.io/client-go v0.29.0/go.mod h1:yLkXH4HKMAywcrD82KMSmfYg2DlE8mepPR4JGSo5n38=
439-
k8s.io/cloud-provider v0.29.0 h1:Qgk/jHsSKGRk/ltTlN6e7eaNuuamLROOzVBd0RPp94M=
440-
k8s.io/cloud-provider v0.29.0/go.mod h1:gBCt7YYKFV4oUcJ/0xF9lS/9il4MxKunJ+ZKvh39WGo=
441-
k8s.io/component-base v0.29.0 h1:T7rjd5wvLnPBV1vC4zWd/iWRbV8Mdxs+nGaoaFzGw3s=
442-
k8s.io/component-base v0.29.0/go.mod h1:sADonFTQ9Zc9yFLghpDpmNXEdHyQmFIGbiuZbqAXQ1M=
443-
k8s.io/component-helpers v0.29.0 h1:Y8W70NGeitKxWwhsPo/vEQbQx5VqJV+3xfLpP3V1VxU=
444-
k8s.io/component-helpers v0.29.0/go.mod h1:j2coxVfmzTOXWSE6sta0MTgNSr572Dcx68F6DD+8fWc=
445-
k8s.io/controller-manager v0.29.0 h1:kEv9sKLnjDkoSqeouWp2lZ8P33an5wrDJpOMqoyD7pc=
446-
k8s.io/controller-manager v0.29.0/go.mod h1:UKtadWkULF5bfX7vu3hHppzY/hz88C03t70GItg/x08=
447-
k8s.io/csi-translation-lib v0.29.0 h1:we4X1yUlDikvm5Rv0dwMuPHNw6KwjwsQiAuOPWXha8M=
448-
k8s.io/csi-translation-lib v0.29.0/go.mod h1:Cp6t3CNBSm1dXS17V8IImUjkqfIB6KCj8Fs8wf6uyTA=
429+
k8s.io/api v0.29.4 h1:WEnF/XdxuCxdG3ayHNRR8yH3cI1B/llkWBma6bq4R3w=
430+
k8s.io/api v0.29.4/go.mod h1:DetSv0t4FBTcEpfA84NJV3g9a7+rSzlUHk5ADAYHUv0=
431+
k8s.io/apiextensions-apiserver v0.29.4 h1:M7hbuHU/ckbibR7yPbe6DyNWgTFKNmZDbdZKD8q1Smk=
432+
k8s.io/apiextensions-apiserver v0.29.4/go.mod h1:TTDC9fB+0kHY2rogf5hgBR03KBKCwED+GHUsXGpR7SM=
433+
k8s.io/apimachinery v0.29.4 h1:RaFdJiDmuKs/8cm1M6Dh1Kvyh59YQFDcFuFTSmXes6Q=
434+
k8s.io/apimachinery v0.29.4/go.mod h1:i3FJVwhvSp/6n8Fl4K97PJEP8C+MM+aoDq4+ZJBf70Y=
435+
k8s.io/apiserver v0.29.4 h1:wPwGOO58GQOpRiZu59P5eRoDcB7QtV+QBglkRiXwCiM=
436+
k8s.io/apiserver v0.29.4/go.mod h1:VqTF9t98HVfhKZVRohCPezsdUt9u2g3bHKftxGcXoRo=
437+
k8s.io/client-go v0.29.4 h1:79ytIedxVfyXV8rpH3jCBW0u+un0fxHDwX5F9K8dPR8=
438+
k8s.io/client-go v0.29.4/go.mod h1:kC1thZQ4zQWYwldsfI088BbK6RkxK+aF5ebV8y9Q4tk=
439+
k8s.io/cloud-provider v0.29.4 h1:XRKl818NKQWan4UZ7fXFAkEJLJkBFq5sQROrbLbryM4=
440+
k8s.io/cloud-provider v0.29.4/go.mod h1:sC7wyt5z5IRoNuU9JhEuMdRnhDEz6cWAJCyMcNUH9X8=
441+
k8s.io/component-base v0.29.4 h1:xeKzuuHI/1tjleu5jycDAcYbhAxeGHCQBZUY2eRIkOo=
442+
k8s.io/component-base v0.29.4/go.mod h1:pYjt+oEZP9gtmwSikwAJgfSBikqKX2gOqRat0QjmQt0=
443+
k8s.io/component-helpers v0.29.4 h1:lbVFhywtv64KlaIYTKszkHaFAqwCjNn7xyRTeWorzfI=
444+
k8s.io/component-helpers v0.29.4/go.mod h1:rMOVMGYEju7/GKMV0USfYAYJBIQdxlMMN1VFl/Mf2so=
445+
k8s.io/controller-manager v0.29.4 h1:rzEwLboRTXBZhYUY02nNhORHQlcXGDE3EPS2IZRd0cg=
446+
k8s.io/controller-manager v0.29.4/go.mod h1:XG6oraSxieDl6XBdO2HnkA6DwEfoCKS3OCpqO4Xb0zU=
447+
k8s.io/csi-translation-lib v0.29.4 h1:ad0SlFsd0iB3PyXiAVVN4KxsTqgmPEHQyYGbJVQP1rA=
448+
k8s.io/csi-translation-lib v0.29.4/go.mod h1:xdLMENgzc213O3qba2fWYPgBv3JiPqRfjsRanu2Te64=
449449
k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw=
450450
k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
451-
k8s.io/kms v0.29.3 h1:ReljsAUhYlm2spdT4yXmY+9a8x8dc/OT4mXvwQPPteQ=
452-
k8s.io/kms v0.29.3/go.mod h1:TBGbJKpRUMk59neTMDMddjIDL+D4HuFUbpuiuzmOPg0=
451+
k8s.io/kms v0.29.4 h1:cFGEoCLwoXk/eqYZppLZxybCdmEWeRKMCbm9f13IdRQ=
452+
k8s.io/kms v0.29.4/go.mod h1:vWVImKkJd+1BQY4tBwdfSwjQBiLrnbNtHADcDEDQFtk=
453453
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/AuzbMm96cd3YHRTU83I780=
454454
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA=
455-
k8s.io/kubectl v0.29.0 h1:Oqi48gXjikDhrBF67AYuZRTcJV4lg2l42GmvsP7FmYI=
456-
k8s.io/kubectl v0.29.0/go.mod h1:0jMjGWIcMIQzmUaMgAzhSELv5WtHo2a8pq67DtviAJs=
457-
k8s.io/kubelet v0.29.0 h1:SX5hlznTBcGIrS1scaf8r8p6m3e475KMifwt9i12iOk=
458-
k8s.io/kubelet v0.29.0/go.mod h1:kvKS2+Bz2tgDOG1S1q0TH2z1DasNuVF+8p6Aw7xvKkI=
459-
k8s.io/kubernetes v1.29.0 h1:DOLN7g8+nnAYBi8JHoW0+/MCrZKDPIqAxzLCXDXd0cg=
460-
k8s.io/kubernetes v1.29.0/go.mod h1:9kztbUQf9stVDcIYXx+BX3nuGCsAQDsuClkGMpPs3pA=
461-
k8s.io/mount-utils v0.29.0 h1:KcUE0bFHONQC10V3SuLWQ6+l8nmJggw9lKLpDftIshI=
462-
k8s.io/mount-utils v0.29.0/go.mod h1:N3lDK/G1B8R/IkAt4NhHyqB07OqEr7P763z3TNge94U=
463-
k8s.io/pod-security-admission v0.29.0 h1:tY/ldtkbBCulMYVSWg6ZDLlgDYDWy6rLj8e/AgmwSj4=
464-
k8s.io/pod-security-admission v0.29.0/go.mod h1:bGIeKCzU0Q0Nl185NHmqcMCiOjTcqTrBfAQaeupwq0E=
455+
k8s.io/kubectl v0.29.4 h1:2LFrAznoDZjN8JFMSUcuhER5o+yjTLzWWbOiDzVjmd8=
456+
k8s.io/kubectl v0.29.4/go.mod h1:YTKRF9y1/ccqZ2bnpOWaJD8V7johKqZR/qOMq+0pfxU=
457+
k8s.io/kubelet v0.29.4 h1:6fTt4sTd5xqTtIhVoS7PkiFUBevQsyu3ZmENVvwY62M=
458+
k8s.io/kubelet v0.29.4/go.mod h1:lAu6Z17pxKwgM+9hsgGkqFjYTOhbc0dnZ6GNnlbjYW0=
459+
k8s.io/kubernetes v1.29.4 h1:n4VCbX9cUhxHI+zw+m2iZlzT73/mrEJBHIMeauh9g4U=
460+
k8s.io/kubernetes v1.29.4/go.mod h1:28sDhcb87LX5z3GWAKYmLrhrifxi4W9bEWua4DRTIvk=
461+
k8s.io/mount-utils v0.29.4 h1:tW/URea4gtXlaVW7VObr52NQhS+z3SXTg1GUaFZjRL4=
462+
k8s.io/mount-utils v0.29.4/go.mod h1:SHUMR9n3b6tLgEmlyT36cL6fV6Sjwa5CJhc0guCXvb0=
463+
k8s.io/pod-security-admission v0.29.4 h1:XatfG2zbye9SRaHQhE7EdiIu462ak3TctnkvdrUVk7I=
464+
k8s.io/pod-security-admission v0.29.4/go.mod h1:PNErt3eRnzVx2zxIdYmgk7vBos5Qm4c8U5QXKvXFfxQ=
465465
k8s.io/utils v0.0.0-20231127182322-b307cd553661 h1:FepOBzJ0GXm8t0su67ln2wAZjbQ6RxQGZDnzuLcrUTI=
466466
k8s.io/utils v0.0.0-20231127182322-b307cd553661/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
467467
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 h1:TgtAeesdhpm2SGwkQasmbeqDo8th5wOBA5h/AjTKA4I=

‎vendor/k8s.io/api/core/v1/generated.proto

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/api/core/v1/types.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/api/core/v1/types_swagger_doc_generated.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/apimachinery/pkg/util/httpstream/wsstream/conn.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/apiserver/pkg/admission/plugin/cel/composition.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/apiserver/pkg/admission/plugin/validatingadmissionpolicy/controller_reconcile.go

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

‎vendor/k8s.io/apiserver/pkg/cel/environment/base.go

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

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

Lines changed: 17 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)