Skip to content

Commit e510170

Browse files
himehime
authored
Merge pull request #521 from hime/main
Apply CVE Fixes on main branch to run e2e tests
2 parents 8c4814e + 6be7e6f commit e510170

File tree

3,918 files changed

+377232
-128785
lines changed

Some content is hidden

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

3,918 files changed

+377232
-128785
lines changed

‎go.mod‎

Lines changed: 129 additions & 106 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/googlecloudplatform/gcs-fuse-csi-driver
22

3-
go 1.22.7
3+
go 1.23.0
44

55
require (
66
cloud.google.com/go/compute/metadata v0.5.0
@@ -12,177 +12,200 @@ require (
1212
github.com/google/uuid v1.6.0
1313
github.com/kubernetes-csi/csi-lib-utils v0.18.1
1414
github.com/kubernetes-csi/csi-test/v5 v5.2.0
15-
github.com/onsi/ginkgo/v2 v2.19.1
16-
github.com/onsi/gomega v1.34.1
17-
github.com/prometheus/client_golang v1.18.0
18-
github.com/prometheus/client_model v0.6.0
19-
github.com/prometheus/common v0.46.0
20-
golang.org/x/net v0.33.0
21-
golang.org/x/oauth2 v0.22.0
22-
golang.org/x/time v0.6.0
15+
github.com/onsi/ginkgo/v2 v2.22.0
16+
github.com/onsi/gomega v1.36.1
17+
github.com/prometheus/client_golang v1.19.1
18+
github.com/prometheus/client_model v0.6.1
19+
github.com/prometheus/common v0.55.0
20+
golang.org/x/net v0.37.0
21+
golang.org/x/oauth2 v0.23.0
22+
golang.org/x/time v0.7.0
2323
google.golang.org/api v0.190.0
2424
google.golang.org/grpc v1.65.0
2525
gopkg.in/yaml.v3 v3.0.1
26-
k8s.io/api v0.30.10
27-
k8s.io/apimachinery v0.30.10
28-
k8s.io/apiserver v0.30.10
29-
k8s.io/client-go v0.30.10
26+
k8s.io/api v0.32.2
27+
k8s.io/apimachinery v0.32.2
28+
k8s.io/apiserver v0.32.2
29+
k8s.io/client-go v0.32.2
3030
k8s.io/klog/v2 v2.130.1
31-
k8s.io/kubernetes v1.30.10
32-
k8s.io/mount-utils v0.30.3
33-
k8s.io/pod-security-admission v0.30.3
34-
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
31+
k8s.io/kubernetes v1.32.2
32+
k8s.io/mount-utils v0.32.2
33+
k8s.io/pod-security-admission v0.32.2
34+
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
3535
sigs.k8s.io/boskos v0.0.0-20240801013515-1221bfe2f633
36-
sigs.k8s.io/controller-runtime v0.18.4
36+
sigs.k8s.io/controller-runtime v0.20.2
3737
)
3838

3939
require (
40+
cel.dev/expr v0.18.0 // indirect
4041
cloud.google.com/go v0.115.0 // indirect
4142
cloud.google.com/go/auth v0.7.3 // indirect
4243
cloud.google.com/go/auth/oauth2adapt v0.2.3 // indirect
44+
github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab // indirect
45+
github.com/Microsoft/go-winio v0.6.2 // indirect
4346
github.com/NYTimes/gziphandler v1.1.1 // indirect
44-
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
47+
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
4548
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
4649
github.com/beorn7/perks v1.0.1 // indirect
4750
github.com/blang/semver/v4 v4.0.0 // indirect
4851
github.com/bombsimon/logrusr/v4 v4.1.0 // indirect
4952
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
5053
github.com/cespare/xxhash/v2 v2.3.0 // indirect
54+
github.com/containerd/containerd/api v1.7.19 // indirect
55+
github.com/containerd/errdefs v0.1.0 // indirect
56+
github.com/containerd/log v0.1.0 // indirect
57+
github.com/containerd/ttrpc v1.2.5 // indirect
5158
github.com/coreos/go-semver v0.3.1 // indirect
5259
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
60+
github.com/cyphar/filepath-securejoin v0.3.4 // indirect
5361
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
5462
github.com/distribution/reference v0.6.0 // indirect
55-
github.com/emicklei/go-restful/v3 v3.12.0 // indirect
56-
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
57-
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
63+
github.com/docker/go-units v0.5.0 // indirect
64+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
65+
github.com/euank/go-kmsg-parser v2.0.0+incompatible // indirect
66+
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
5867
github.com/felixge/httpsnoop v1.0.4 // indirect
5968
github.com/fsnotify/fsnotify v1.7.0 // indirect
69+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
6070
github.com/go-logr/stdr v1.2.2 // indirect
6171
github.com/go-openapi/jsonpointer v0.21.0 // indirect
62-
github.com/go-openapi/jsonreference v0.21.0 // indirect
72+
github.com/go-openapi/jsonreference v0.20.2 // indirect
6373
github.com/go-openapi/swag v0.23.0 // indirect
6474
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
75+
github.com/godbus/dbus/v5 v5.1.0 // indirect
6576
github.com/gogo/protobuf v1.3.2 // indirect
6677
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
6778
github.com/golang/protobuf v1.5.4 // indirect
68-
github.com/google/cel-go v0.17.8 // indirect
79+
github.com/google/btree v1.1.3 // indirect
80+
github.com/google/cadvisor v0.51.0 // indirect
81+
github.com/google/cel-go v0.22.0 // indirect
6982
github.com/google/gnostic-models v0.6.8 // indirect
7083
github.com/google/gofuzz v1.2.1-0.20210504230335-f78f29fc09ea // indirect
71-
github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect
84+
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db // indirect
7285
github.com/google/s2a-go v0.1.8 // indirect
7386
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
7487
github.com/googleapis/gax-go/v2 v2.13.0 // indirect
75-
github.com/gorilla/websocket v1.5.1 // indirect
88+
github.com/gorilla/websocket v1.5.0 // indirect
7689
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
77-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1 // indirect
90+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
7891
github.com/hashicorp/errwrap v1.1.0 // indirect
7992
github.com/hashicorp/go-multierror v1.1.1 // indirect
8093
github.com/hashicorp/hcl v1.0.0 // indirect
81-
github.com/imdario/mergo v0.3.16 // indirect
8294
github.com/inconshreveable/mousetrap v1.1.0 // indirect
8395
github.com/josharian/intern v1.0.0 // indirect
8496
github.com/json-iterator/go v1.1.12 // indirect
85-
github.com/magiconair/properties v1.8.7 // indirect
97+
github.com/karrick/godirwalk v1.17.0 // indirect
98+
github.com/magiconair/properties v1.8.5 // indirect
8699
github.com/mailru/easyjson v0.7.7 // indirect
100+
github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible // indirect
87101
github.com/mitchellh/mapstructure v1.5.0 // indirect
88-
github.com/moby/spdystream v0.2.0 // indirect
89-
github.com/moby/sys/mountinfo v0.7.1 // indirect
102+
github.com/moby/spdystream v0.5.0 // indirect
103+
github.com/moby/sys/mountinfo v0.7.2 // indirect
104+
github.com/moby/sys/userns v0.1.0 // indirect
90105
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
91106
github.com/modern-go/reflect2 v1.0.2 // indirect
92107
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
93108
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
94109
github.com/opencontainers/go-digest v1.0.0 // indirect
95-
github.com/opencontainers/selinux v1.11.0 // indirect
96-
github.com/pelletier/go-toml/v2 v2.2.1 // indirect
110+
github.com/opencontainers/runc v1.2.1 // indirect
111+
github.com/opencontainers/runtime-spec v1.2.0 // indirect
112+
github.com/opencontainers/selinux v1.11.1 // indirect
113+
github.com/pelletier/go-toml v1.9.3 // indirect
97114
github.com/pkg/errors v0.9.1 // indirect
98-
github.com/prometheus/procfs v0.13.0 // indirect
99-
github.com/sagikazarmark/locafero v0.4.0 // indirect
100-
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
115+
github.com/prometheus/procfs v0.15.1 // indirect
101116
github.com/sirupsen/logrus v1.9.3 // indirect
102-
github.com/sourcegraph/conc v0.3.0 // indirect
103-
github.com/spf13/afero v1.11.0 // indirect
104-
github.com/spf13/cast v1.6.0 // indirect
105-
github.com/spf13/cobra v1.8.0 // indirect
117+
github.com/spf13/afero v1.6.0 // indirect
118+
github.com/spf13/cast v1.3.1 // indirect
119+
github.com/spf13/cobra v1.8.1 // indirect
120+
github.com/spf13/jwalterweatherman v1.1.0 // indirect
106121
github.com/spf13/pflag v1.0.5 // indirect
107-
github.com/spf13/viper v1.18.2 // indirect
122+
github.com/spf13/viper v1.8.1 // indirect
108123
github.com/stoewer/go-strcase v1.3.0 // indirect
109-
github.com/subosito/gotenv v1.6.0 // indirect
110-
go.etcd.io/etcd/api/v3 v3.5.13 // indirect
111-
go.etcd.io/etcd/client/pkg/v3 v3.5.13 // indirect
112-
go.etcd.io/etcd/client/v3 v3.5.13 // indirect
124+
github.com/subosito/gotenv v1.2.0 // indirect
125+
github.com/x448/float16 v0.8.4 // indirect
126+
go.etcd.io/etcd/api/v3 v3.5.16 // indirect
127+
go.etcd.io/etcd/client/pkg/v3 v3.5.16 // indirect
128+
go.etcd.io/etcd/client/v3 v3.5.16 // indirect
113129
go.opencensus.io v0.24.0 // indirect
114-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.50.0 // indirect
115-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.50.0 // indirect
116-
go.opentelemetry.io/otel v1.25.0 // indirect
117-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.25.0 // indirect
118-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.25.0 // indirect
119-
go.opentelemetry.io/otel/metric v1.25.0 // indirect
120-
go.opentelemetry.io/otel/sdk v1.25.0 // indirect
121-
go.opentelemetry.io/otel/trace v1.25.0 // indirect
122-
go.opentelemetry.io/proto/otlp v1.2.0 // indirect
130+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect
131+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
132+
go.opentelemetry.io/otel v1.28.0 // indirect
133+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
134+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect
135+
go.opentelemetry.io/otel/metric v1.28.0 // indirect
136+
go.opentelemetry.io/otel/sdk v1.28.0 // indirect
137+
go.opentelemetry.io/otel/trace v1.28.0 // indirect
138+
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
123139
go.uber.org/multierr v1.11.0 // indirect
124140
go.uber.org/zap v1.27.0 // indirect
125-
go4.org v0.0.0-20230225012048-214862532bf5 // indirect
126-
golang.org/x/crypto v0.31.0 // indirect
141+
go4.org v0.0.0-20201209231011-d4a079459e60 // indirect
142+
golang.org/x/crypto v0.36.0 // indirect
127143
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
128-
golang.org/x/sync v0.10.0 // indirect
129-
golang.org/x/sys v0.28.0 // indirect
130-
golang.org/x/term v0.27.0 // indirect
131-
golang.org/x/text v0.21.0 // indirect
132-
golang.org/x/tools v0.23.0 // indirect
144+
golang.org/x/sync v0.12.0 // indirect
145+
golang.org/x/sys v0.31.0 // indirect
146+
golang.org/x/term v0.30.0 // indirect
147+
golang.org/x/text v0.23.0 // indirect
148+
golang.org/x/tools v0.26.0 // indirect
133149
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
134150
google.golang.org/genproto v0.0.0-20240730163845-b1a4ccb954bf // indirect
135-
google.golang.org/genproto/googleapis/api v0.0.0-20240725223205-93522f1f2a9f // indirect
136-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240730163845-b1a4ccb954bf // indirect
137-
google.golang.org/protobuf v1.34.2 // indirect
151+
google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7 // indirect
152+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 // indirect
153+
google.golang.org/protobuf v1.35.1 // indirect
154+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
138155
gopkg.in/inf.v0 v0.9.1 // indirect
139-
gopkg.in/ini.v1 v1.67.0 // indirect
156+
gopkg.in/ini.v1 v1.62.0 // indirect
140157
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
141158
gopkg.in/yaml.v2 v2.4.0 // indirect
142-
k8s.io/apiextensions-apiserver v0.30.3 // indirect
143-
k8s.io/cloud-provider v0.30.3 // indirect
144-
k8s.io/component-base v0.30.10 // indirect
145-
k8s.io/component-helpers v0.30.3 // indirect
146-
k8s.io/controller-manager v0.30.3 // indirect
147-
k8s.io/kms v0.30.10 // indirect
148-
k8s.io/kube-openapi v0.0.0-20240411171206-dc4e619f62f3 // indirect
149-
k8s.io/kubectl v0.30.3 // indirect
150-
k8s.io/kubelet v0.30.3 // indirect
151-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
152-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
159+
k8s.io/apiextensions-apiserver v0.32.1 // indirect
160+
k8s.io/cloud-provider v0.0.0 // indirect
161+
k8s.io/component-base v0.32.2 // indirect
162+
k8s.io/component-helpers v0.32.2 // indirect
163+
k8s.io/controller-manager v0.32.2 // indirect
164+
k8s.io/cri-api v0.32.2 // indirect
165+
k8s.io/cri-client v0.0.0 // indirect
166+
k8s.io/csi-translation-lib v0.0.0 // indirect
167+
k8s.io/dynamic-resource-allocation v0.0.0 // indirect
168+
k8s.io/kms v0.32.2 // indirect
169+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
170+
k8s.io/kube-scheduler v0.0.0 // indirect
171+
k8s.io/kubectl v0.0.0 // indirect
172+
k8s.io/kubelet v0.32.2 // indirect
173+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect
174+
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
153175
sigs.k8s.io/prow v0.0.0-20240619181241-cfb8754e0459 // indirect
154-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
176+
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
155177
sigs.k8s.io/yaml v1.4.0 // indirect
156178
)
157179

158180
replace (
159-
k8s.io/api => k8s.io/api v0.30.3
160-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.30.3
161-
k8s.io/apimachinery => k8s.io/apimachinery v0.30.3
162-
k8s.io/apiserver => k8s.io/apiserver v0.30.10
163-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.30.3
164-
k8s.io/client-go => k8s.io/client-go v0.30.3
165-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.30.3
166-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.30.3
167-
k8s.io/code-generator => k8s.io/code-generator v0.30.3
168-
k8s.io/component-base => k8s.io/component-base v0.30.3
169-
k8s.io/component-helpers => k8s.io/component-helpers v0.30.3
170-
k8s.io/controller-manager => k8s.io/controller-manager v0.30.3
171-
k8s.io/cri-api => k8s.io/cri-api v0.30.3
172-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.30.3
173-
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.30.3
174-
k8s.io/kms => k8s.io/kms v0.30.3
175-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.30.3
176-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.30.3
177-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.30.3
178-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.30.3
179-
k8s.io/kubectl => k8s.io/kubectl v0.30.3
180-
k8s.io/kubelet => k8s.io/kubelet v0.30.3
181-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.30.3
182-
k8s.io/metrics => k8s.io/metrics v0.30.3
183-
k8s.io/mount-utils => k8s.io/mount-utils v0.30.3
184-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.30.3
185-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.30.3
186-
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.30.3
187-
k8s.io/sample-controller => k8s.io/sample-controller v0.30.3
181+
k8s.io/api => k8s.io/api v0.32.2
182+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.32.2
183+
k8s.io/apimachinery => k8s.io/apimachinery v0.32.2
184+
k8s.io/apiserver => k8s.io/apiserver v0.32.2
185+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.32.2
186+
k8s.io/client-go => k8s.io/client-go v0.32.2
187+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.32.2
188+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.32.2
189+
k8s.io/code-generator => k8s.io/code-generator v0.32.2
190+
k8s.io/component-base => k8s.io/component-base v0.32.2
191+
k8s.io/component-helpers => k8s.io/component-helpers v0.32.2
192+
k8s.io/controller-manager => k8s.io/controller-manager v0.32.2
193+
k8s.io/cri-api => k8s.io/cri-api v0.32.2
194+
k8s.io/cri-client => k8s.io/cri-client v0.32.2
195+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.32.2
196+
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.32.2
197+
k8s.io/kms => k8s.io/kms v0.32.2
198+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.32.2
199+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.32.2
200+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.32.2
201+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.32.2
202+
k8s.io/kubectl => k8s.io/kubectl v0.32.2
203+
k8s.io/kubelet => k8s.io/kubelet v0.32.2
204+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.32.2
205+
k8s.io/metrics => k8s.io/metrics v0.32.2
206+
k8s.io/mount-utils => k8s.io/mount-utils v0.32.2
207+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.32.2
208+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.32.2
209+
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.32.2
210+
k8s.io/sample-controller => k8s.io/sample-controller v0.32.2
188211
)

0 commit comments

Comments
 (0)