Skip to content

Commit eb12fb8

Browse files
authored
Merge pull request #2786 from kubernetes-sigs/CVE-2025-5187-1.31
[release-1.31] fix: CVE-2025-5187
2 parents db6ecf9 + 5704b09 commit eb12fb8

File tree

1,829 files changed

+65649
-65065
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,829 files changed

+65649
-65065
lines changed

go.mod

Lines changed: 32 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ require (
3939
k8s.io/cloud-provider v0.32.0-alpha.0
4040
k8s.io/component-base v0.32.0-alpha.0
4141
k8s.io/klog/v2 v2.130.1
42-
k8s.io/kubernetes v1.30.10
42+
k8s.io/kubernetes v1.31.12
4343
k8s.io/mount-utils v0.32.0
44-
k8s.io/pod-security-admission v0.30.10
44+
k8s.io/pod-security-admission v0.31.12
4545
k8s.io/utils v0.0.0-20241210054802-24370beab758
4646
sigs.k8s.io/cloud-provider-azure v1.30.1-0.20250125112532-472fe964b519
4747
sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.5.9
@@ -52,8 +52,14 @@ require (
5252
require (
5353
github.com/Azure/msi-dataplane v0.4.2 // indirect
5454
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
55+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
5556
github.com/moby/sys/userns v0.1.0 // indirect
57+
github.com/x448/float16 v0.8.4 // indirect
5658
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
59+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
60+
k8s.io/apiserver v0.31.12 // indirect
61+
k8s.io/component-helpers v0.31.12 // indirect
62+
k8s.io/controller-manager v0.31.12 // indirect
5763
)
5864

5965
require (
@@ -78,7 +84,6 @@ require (
7884
github.com/AzureAD/microsoft-authentication-library-for-go v1.4.1 // indirect
7985
github.com/Microsoft/go-winio v0.6.1 // indirect
8086
github.com/NYTimes/gziphandler v1.1.1 // indirect
81-
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230512164433-5d1fd1a340c9 // indirect
8287
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
8388
github.com/beorn7/perks v1.0.1 // indirect
8489
github.com/blang/semver/v4 v4.0.0 // indirect
@@ -89,7 +94,6 @@ require (
8994
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
9095
github.com/distribution/reference v0.5.0 // indirect
9196
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
92-
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
9397
github.com/felixge/httpsnoop v1.0.4 // indirect
9498
github.com/fsnotify/fsnotify v1.8.0
9599
github.com/go-logr/logr v1.4.2 // indirect
@@ -171,9 +175,6 @@ require (
171175
gopkg.in/yaml.v2 v2.4.0 // indirect
172176
gopkg.in/yaml.v3 v3.0.1 // indirect
173177
k8s.io/apiextensions-apiserver v0.0.0 // indirect
174-
k8s.io/apiserver v0.32.0-alpha.0 // indirect
175-
k8s.io/component-helpers v0.32.0-alpha.0 // indirect
176-
k8s.io/controller-manager v0.32.0-alpha.0 // indirect
177178
k8s.io/kms v0.32.0-alpha.0 // indirect
178179
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
179180
k8s.io/kubectl v0.0.0 // indirect
@@ -184,29 +185,29 @@ require (
184185
)
185186

186187
replace (
187-
github.com/google/cel-go => github.com/google/cel-go v0.17.8
188-
k8s.io/api => k8s.io/api v0.30.10
189-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.30.10
190-
k8s.io/apimachinery => k8s.io/apimachinery v0.30.10
191-
k8s.io/apiserver => k8s.io/apiserver v0.30.10
192-
k8s.io/client-go => k8s.io/client-go v0.30.10
193-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.30.10
194-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.30.10
195-
k8s.io/component-base => k8s.io/component-base v0.30.10
196-
k8s.io/component-helpers => k8s.io/component-helpers v0.30.10
197-
k8s.io/controller-manager => k8s.io/controller-manager v0.30.10
198-
k8s.io/cri-api => k8s.io/cri-api v0.30.10
199-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.30.10
200-
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.30.10
201-
k8s.io/endpointslice => k8s.io/endpointslice v0.30.10
202-
k8s.io/kms => k8s.io/kms v0.30.10
203-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.30.10
204-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.30.10
205-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.30.10
206-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.30.10
207-
k8s.io/kubectl => k8s.io/kubectl v0.30.10
208-
k8s.io/kubelet => k8s.io/kubelet v0.30.10
209-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.30.10
210-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.30.10
188+
k8s.io/api => k8s.io/api v0.31.12
189+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.31.12
190+
k8s.io/apimachinery => k8s.io/apimachinery v0.31.12
191+
k8s.io/apiserver => k8s.io/apiserver v0.31.12
192+
k8s.io/client-go => k8s.io/client-go v0.31.12
193+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.31.12
194+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.31.12
195+
k8s.io/component-base => k8s.io/component-base v0.31.12
196+
k8s.io/component-helpers => k8s.io/component-helpers v0.31.12
197+
k8s.io/controller-manager => k8s.io/controller-manager v0.31.12
198+
k8s.io/cri-api => k8s.io/cri-api v0.31.12
199+
k8s.io/cri-client => k8s.io/cri-client v0.31.12
200+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.31.12
201+
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.31.12
202+
k8s.io/endpointslice => k8s.io/endpointslice v0.31.12
203+
k8s.io/kms => k8s.io/kms v0.31.12
204+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.31.12
205+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.31.12
206+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.31.12
207+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.31.12
208+
k8s.io/kubectl => k8s.io/kubectl v0.31.12
209+
k8s.io/kubelet => k8s.io/kubelet v0.31.12
210+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.31.12
211+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.31.12
211212
sigs.k8s.io/structured-merge-diff/v4 => sigs.k8s.io/structured-merge-diff/v4 v4.4.1
212213
)

0 commit comments

Comments
 (0)