Skip to content

Commit b175003

Browse files
authored
Merge pull request #866 from andyzhangx/CVE-2025-0426
fix: CVE-2025-0426
2 parents e230b7f + 94198d3 commit b175003

File tree

2,808 files changed

+190376
-77690
lines changed

Some content is hidden

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

2,808 files changed

+190376
-77690
lines changed

go.mod

Lines changed: 61 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ require (
1212
golang.org/x/net v0.37.0
1313
google.golang.org/grpc v1.71.0
1414
google.golang.org/protobuf v1.36.5
15-
k8s.io/api v0.28.12
16-
k8s.io/apimachinery v0.28.12
17-
k8s.io/client-go v0.28.12
15+
k8s.io/api v0.31.6
16+
k8s.io/apimachinery v0.31.6
17+
k8s.io/client-go v0.31.6
1818
k8s.io/klog/v2 v2.130.1
19-
k8s.io/kubernetes v1.28.12
19+
k8s.io/kubernetes v1.31.6
2020
k8s.io/mount-utils v0.32.0
2121
k8s.io/pod-security-admission v0.0.0
2222
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
@@ -26,77 +26,82 @@ require (
2626

2727
require go.opentelemetry.io/auto/sdk v1.1.0 // indirect
2828

29+
require (
30+
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
31+
github.com/distribution/reference v0.5.0 // indirect
32+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
33+
github.com/gorilla/websocket v1.5.0 // indirect
34+
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
35+
github.com/x448/float16 v0.8.4 // indirect
36+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
37+
)
38+
2939
require (
3040
github.com/NYTimes/gziphandler v1.1.1 // indirect
31-
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
3241
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
3342
github.com/beorn7/perks v1.0.1 // indirect
3443
github.com/blang/semver/v4 v4.0.0 // indirect
35-
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
44+
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
3645
github.com/cespare/xxhash/v2 v2.3.0 // indirect
3746
github.com/coreos/go-semver v0.3.1 // indirect
3847
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
3948
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
40-
github.com/docker/distribution v2.8.2+incompatible // indirect
41-
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
42-
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
49+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
4350
github.com/felixge/httpsnoop v1.0.4 // indirect
4451
github.com/fsnotify/fsnotify v1.7.0 // indirect
4552
github.com/go-logr/logr v1.4.2 // indirect
4653
github.com/go-logr/stdr v1.2.2 // indirect
4754
github.com/go-openapi/jsonpointer v0.19.6 // indirect
4855
github.com/go-openapi/jsonreference v0.20.2 // indirect
49-
github.com/go-openapi/swag v0.22.3 // indirect
56+
github.com/go-openapi/swag v0.22.4 // indirect
5057
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
5158
github.com/gogo/protobuf v1.3.2 // indirect
5259
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
5360
github.com/golang/protobuf v1.5.4 // indirect
54-
github.com/google/cel-go v0.16.1 // indirect
61+
github.com/google/cel-go v0.20.1 // indirect
5562
github.com/google/gnostic-models v0.6.8 // indirect
5663
github.com/google/go-cmp v0.6.0 // indirect
5764
github.com/google/gofuzz v1.2.0 // indirect
5865
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
5966
github.com/google/uuid v1.6.0 // indirect
6067
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
61-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
68+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
6269
github.com/imdario/mergo v0.3.6 // indirect
6370
github.com/inconshreveable/mousetrap v1.1.0 // indirect
6471
github.com/josharian/intern v1.0.0 // indirect
6572
github.com/json-iterator/go v1.1.12 // indirect
6673
github.com/mailru/easyjson v0.7.7 // indirect
67-
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
68-
github.com/moby/spdystream v0.2.0 // indirect
74+
github.com/moby/spdystream v0.4.0 // indirect
6975
github.com/moby/sys/mountinfo v0.7.2 // indirect
7076
github.com/moby/sys/userns v0.1.0 // indirect
7177
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
7278
github.com/modern-go/reflect2 v1.0.2 // indirect
7379
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
7480
github.com/opencontainers/go-digest v1.0.0 // indirect
75-
github.com/opencontainers/selinux v1.10.0 // indirect
81+
github.com/opencontainers/selinux v1.11.0 // indirect
7682
github.com/pkg/errors v0.9.1 // indirect
7783
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
78-
github.com/prometheus/client_golang v1.16.0 // indirect
79-
github.com/prometheus/client_model v0.4.0 // indirect
80-
github.com/prometheus/common v0.44.0 // indirect
81-
github.com/prometheus/procfs v0.10.1 // indirect
82-
github.com/spf13/cobra v1.8.0 // indirect
84+
github.com/prometheus/client_golang v1.19.1 // indirect
85+
github.com/prometheus/client_model v0.6.1 // indirect
86+
github.com/prometheus/common v0.55.0 // indirect
87+
github.com/prometheus/procfs v0.15.1 // indirect
88+
github.com/spf13/cobra v1.8.1 // indirect
8389
github.com/spf13/pflag v1.0.5 // indirect
8490
github.com/stoewer/go-strcase v1.2.0 // indirect
85-
go.etcd.io/etcd/api/v3 v3.5.9 // indirect
86-
go.etcd.io/etcd/client/pkg/v3 v3.5.9 // indirect
87-
go.etcd.io/etcd/client/v3 v3.5.9 // indirect
88-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 // indirect
89-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.0 // indirect
91+
go.etcd.io/etcd/api/v3 v3.5.14 // indirect
92+
go.etcd.io/etcd/client/pkg/v3 v3.5.14 // indirect
93+
go.etcd.io/etcd/client/v3 v3.5.14 // indirect
94+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect
95+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
9096
go.opentelemetry.io/otel v1.34.0 // indirect
91-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.20.0 // indirect
92-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.20.0 // indirect
97+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
98+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect
9399
go.opentelemetry.io/otel/metric v1.34.0 // indirect
94100
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
95101
go.opentelemetry.io/otel/trace v1.34.0 // indirect
96-
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
97-
go.uber.org/atomic v1.10.0 // indirect
102+
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
98103
go.uber.org/multierr v1.11.0 // indirect
99-
go.uber.org/zap v1.19.0 // indirect
104+
go.uber.org/zap v1.26.0 // indirect
100105
golang.org/x/crypto v0.36.0 // indirect
101106
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
102107
golang.org/x/mod v0.24.0
@@ -115,34 +120,35 @@ require (
115120
gopkg.in/yaml.v2 v2.4.0 // indirect
116121
gopkg.in/yaml.v3 v3.0.1 // indirect
117122
k8s.io/apiextensions-apiserver v0.0.0 // indirect
118-
k8s.io/apiserver v0.28.9 // indirect
119-
k8s.io/cloud-provider v0.28.9 // indirect
120-
k8s.io/component-base v0.28.9 // indirect
121-
k8s.io/component-helpers v0.28.9 // indirect
122-
k8s.io/controller-manager v0.28.9 // indirect
123-
k8s.io/kms v0.28.9 // indirect
124-
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
123+
k8s.io/apiserver v0.31.6 // indirect
124+
k8s.io/cloud-provider v0.31.6 // indirect
125+
k8s.io/component-base v0.31.6 // indirect
126+
k8s.io/component-helpers v0.31.6 // indirect
127+
k8s.io/controller-manager v0.31.6 // indirect
128+
k8s.io/kms v0.31.6 // indirect
129+
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
125130
k8s.io/kubectl v0.0.0 // indirect
126-
k8s.io/kubelet v0.28.9 // indirect
127-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect
131+
k8s.io/kubelet v0.31.6 // indirect
132+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
128133
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
129-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
134+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
130135
)
131136

132137
replace (
133-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.28.9
134-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.28.9
135-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.28.9
136-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.28.9
137-
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.28.9
138-
k8s.io/endpointslice => k8s.io/endpointslice v0.28.9
139-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.28.9
140-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.28.9
141-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.28.9
142-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.28.9
143-
k8s.io/kubectl => k8s.io/kubectl v0.28.9
144-
k8s.io/kubelet => k8s.io/kubelet v0.28.9
145-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.28.9
146-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.28.9
147-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.28.9
138+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.31.6
139+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.31.6
140+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.31.6
141+
k8s.io/cri-client => k8s.io/cri-client v0.31.6
142+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.31.6
143+
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.31.6
144+
k8s.io/endpointslice => k8s.io/endpointslice v0.31.6
145+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.31.6
146+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.31.6
147+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.31.6
148+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.31.6
149+
k8s.io/kubectl => k8s.io/kubectl v0.31.6
150+
k8s.io/kubelet => k8s.io/kubelet v0.31.6
151+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.31.6
152+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.31.6
153+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.31.6
148154
)

0 commit comments

Comments
 (0)