Skip to content

Commit 9ce75fb

Browse files
authored
Merge pull request #926 from andyzhangx/CVE-2025-0426
fix: CVE-2025-0426
2 parents a71b8cf + e2112c6 commit 9ce75fb

File tree

660 files changed

+35780
-20363
lines changed

Some content is hidden

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

660 files changed

+35780
-20363
lines changed

go.mod

Lines changed: 42 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ require (
2020
github.com/pborman/uuid v1.2.1
2121
github.com/pelletier/go-toml v1.7.0
2222
github.com/stretchr/testify v1.9.0
23-
golang.org/x/net v0.33.0
23+
golang.org/x/net v0.37.0
2424
google.golang.org/grpc v1.65.0
25-
k8s.io/api v0.28.12
26-
k8s.io/apimachinery v0.28.12
27-
k8s.io/client-go v0.28.12
28-
k8s.io/component-base v0.28.12
25+
k8s.io/api v0.29.14
26+
k8s.io/apimachinery v0.29.14
27+
k8s.io/client-go v0.29.14
28+
k8s.io/component-base v0.29.14
2929
k8s.io/klog/v2 v2.130.1
30-
k8s.io/kubernetes v1.28.12
30+
k8s.io/kubernetes v1.29.14
3131
k8s.io/mount-utils v0.32.0
3232
k8s.io/pod-security-admission v0.28.8
3333
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
@@ -52,7 +52,7 @@ require (
5252
github.com/coreos/go-semver v0.3.1 // indirect
5353
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
5454
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
55-
github.com/docker/distribution v2.8.2+incompatible // indirect
55+
github.com/distribution/reference v0.5.0 // indirect
5656
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
5757
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
5858
github.com/felixge/httpsnoop v1.0.4 // indirect
@@ -66,12 +66,13 @@ require (
6666
github.com/gogo/protobuf v1.3.2 // indirect
6767
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
6868
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
69-
github.com/google/cel-go v0.16.1 // indirect
69+
github.com/google/cel-go v0.17.7 // indirect
7070
github.com/google/gnostic-models v0.6.8 // indirect
7171
github.com/google/go-cmp v0.6.0 // indirect
7272
github.com/google/gofuzz v1.2.0 // indirect
7373
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
7474
github.com/google/uuid v1.6.0 // indirect
75+
github.com/gorilla/websocket v1.5.0 // indirect
7576
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
7677
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
7778
github.com/imdario/mergo v0.3.6 // indirect
@@ -86,8 +87,9 @@ require (
8687
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
8788
github.com/modern-go/reflect2 v1.0.2 // indirect
8889
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
90+
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
8991
github.com/opencontainers/go-digest v1.0.0 // indirect
90-
github.com/opencontainers/selinux v1.10.0 // indirect
92+
github.com/opencontainers/selinux v1.11.0 // indirect
9193
github.com/pkg/errors v0.9.1 // indirect
9294
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
9395
github.com/prometheus/client_golang v1.16.0 // indirect
@@ -97,9 +99,9 @@ require (
9799
github.com/spf13/cobra v1.8.0 // indirect
98100
github.com/spf13/pflag v1.0.5 // indirect
99101
github.com/stoewer/go-strcase v1.2.0 // indirect
100-
go.etcd.io/etcd/api/v3 v3.5.9 // indirect
101-
go.etcd.io/etcd/client/pkg/v3 v3.5.9 // indirect
102-
go.etcd.io/etcd/client/v3 v3.5.9 // indirect
102+
go.etcd.io/etcd/api/v3 v3.5.10 // indirect
103+
go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect
104+
go.etcd.io/etcd/client/v3 v3.5.10 // indirect
103105
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 // indirect
104106
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.0 // indirect
105107
go.opentelemetry.io/otel v1.20.0 // indirect
@@ -112,14 +114,14 @@ require (
112114
go.uber.org/atomic v1.10.0 // indirect
113115
go.uber.org/multierr v1.11.0 // indirect
114116
go.uber.org/zap v1.19.0 // indirect
115-
golang.org/x/crypto v0.31.0 // indirect
117+
golang.org/x/crypto v0.36.0 // indirect
116118
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
117119
golang.org/x/mod v0.19.0 // indirect
118120
golang.org/x/oauth2 v0.20.0 // indirect
119-
golang.org/x/sync v0.10.0 // indirect
120-
golang.org/x/sys v0.28.0 // indirect
121-
golang.org/x/term v0.27.0 // indirect
122-
golang.org/x/text v0.21.0 // indirect
121+
golang.org/x/sync v0.12.0 // indirect
122+
golang.org/x/sys v0.31.0 // indirect
123+
golang.org/x/term v0.30.0 // indirect
124+
golang.org/x/text v0.23.0 // indirect
123125
golang.org/x/time v0.3.0 // indirect
124126
golang.org/x/tools v0.23.0 // indirect
125127
google.golang.org/genproto v0.0.0-20231016165738-49dd2c1f3d0b // indirect
@@ -131,33 +133,33 @@ require (
131133
gopkg.in/yaml.v2 v2.4.0 // indirect
132134
gopkg.in/yaml.v3 v3.0.1 // indirect
133135
k8s.io/apiextensions-apiserver v0.0.0 // indirect
134-
k8s.io/apiserver v0.28.12 // indirect
135-
k8s.io/cloud-provider v0.28.12 // indirect
136-
k8s.io/component-helpers v0.28.12 // indirect
137-
k8s.io/controller-manager v0.28.12 // indirect
138-
k8s.io/kms v0.28.12 // indirect
139-
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
136+
k8s.io/apiserver v0.29.14 // indirect
137+
k8s.io/cloud-provider v0.29.14 // indirect
138+
k8s.io/component-helpers v0.29.14 // indirect
139+
k8s.io/controller-manager v0.29.14 // indirect
140+
k8s.io/kms v0.29.14 // indirect
141+
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
140142
k8s.io/kubectl v0.0.0 // indirect
141-
k8s.io/kubelet v0.28.12 // indirect
142-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect
143+
k8s.io/kubelet v0.29.14 // indirect
144+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 // indirect
143145
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
144-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
146+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
145147
)
146148

147149
replace (
148-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.28.12
149-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.28.12
150-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.28.12
151-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.28.12
152-
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.28.12
153-
k8s.io/endpointslice => k8s.io/endpointslice v0.28.12
150+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.14
151+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.29.14
152+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.29.14
153+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.29.14
154+
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.29.14
155+
k8s.io/endpointslice => k8s.io/endpointslice v0.29.14
154156
k8s.io/gengo => k8s.io/gengo v0.0.0-20200114144118-36b2048a9120
155-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.28.12
156-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.28.12
157-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.28.12
158-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.28.12
159-
k8s.io/kubectl => k8s.io/kubectl v0.28.12
160-
k8s.io/kubelet => k8s.io/kubelet v0.28.12
161-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.28.12
162-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.28.12
157+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.29.14
158+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.29.14
159+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.29.14
160+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.29.14
161+
k8s.io/kubectl => k8s.io/kubectl v0.29.14
162+
k8s.io/kubelet => k8s.io/kubelet v0.29.14
163+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.29.14
164+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.14
163165
)

0 commit comments

Comments
 (0)