Skip to content

Commit e2d90af

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #1325 from AndrewSirenko/dep-bump
Upgrade dependencies ahead of new external-provisioner release
2 parents 780a57c + 8ea8784 commit e2d90af

File tree

3,043 files changed

+324920
-74601
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,043 files changed

+324920
-74601
lines changed

‎cmd/csi-provisioner/csi-provisioner.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ import (
5454
_ "k8s.io/component-base/metrics/prometheus/workqueue" // register work queues in the default legacy registry
5555
csitrans "k8s.io/csi-translation-lib"
5656
"k8s.io/klog/v2"
57-
"sigs.k8s.io/sig-storage-lib-external-provisioner/v10/controller"
58-
libmetrics "sigs.k8s.io/sig-storage-lib-external-provisioner/v10/controller/metrics"
57+
"sigs.k8s.io/sig-storage-lib-external-provisioner/v11/controller"
58+
libmetrics "sigs.k8s.io/sig-storage-lib-external-provisioner/v11/controller/metrics"
5959

6060
"github.com/kubernetes-csi/csi-lib-utils/leaderelection"
6161
"github.com/kubernetes-csi/csi-lib-utils/metrics"
@@ -600,9 +600,8 @@ func main() {
600600
}()
601601
}
602602

603-
logger := klog.FromContext(ctx)
604603
provisionController = controller.NewProvisionController(
605-
logger,
604+
ctx,
606605
clientset,
607606
provisionerName,
608607
csiProvisioner,

‎go.mod

Lines changed: 123 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -1,78 +1,93 @@
11
module github.com/kubernetes-csi/external-provisioner/v5
22

3-
go 1.22.5
3+
go 1.23.1
44

55
require (
6-
github.com/container-storage-interface/spec v1.10.0
6+
github.com/container-storage-interface/spec v1.11.0
77
github.com/golang/mock v1.6.0
88
github.com/google/gofuzz v1.2.0 // indirect
99
github.com/google/uuid v1.6.0 // indirect
10-
github.com/imdario/mergo v0.3.16 // indirect
11-
github.com/kubernetes-csi/csi-lib-utils v0.19.0
10+
github.com/kubernetes-csi/csi-lib-utils v0.20.0
1211
github.com/kubernetes-csi/csi-test/v5 v5.3.1
1312
github.com/kubernetes-csi/external-snapshotter/client/v8 v8.2.0
1413
github.com/miekg/dns v1.1.62 // indirect
15-
github.com/prometheus/client_golang v1.19.1
14+
github.com/prometheus/client_golang v1.20.5
1615
github.com/spf13/pflag v1.0.5
17-
github.com/stretchr/testify v1.9.0
18-
google.golang.org/grpc v1.67.1
19-
google.golang.org/protobuf v1.35.1
20-
k8s.io/api v0.31.0
21-
k8s.io/apimachinery v0.31.0
22-
k8s.io/apiserver v0.31.0
23-
k8s.io/client-go v0.31.0
24-
k8s.io/component-base v0.31.0
25-
k8s.io/component-helpers v0.31.0
26-
k8s.io/csi-translation-lib v0.31.0
16+
github.com/stretchr/testify v1.10.0
17+
google.golang.org/grpc v1.69.2
18+
google.golang.org/protobuf v1.36.2
19+
k8s.io/api v0.32.0
20+
k8s.io/apimachinery v0.32.0
21+
k8s.io/apiserver v0.32.0
22+
k8s.io/client-go v0.32.0
23+
k8s.io/component-base v0.32.0
24+
k8s.io/component-helpers v0.32.0
25+
k8s.io/csi-translation-lib v0.32.0
2726
k8s.io/klog/v2 v2.130.1
28-
sigs.k8s.io/controller-runtime v0.19.0
29-
sigs.k8s.io/gateway-api v1.1.0
30-
sigs.k8s.io/sig-storage-lib-external-provisioner/v10 v10.0.1
27+
sigs.k8s.io/controller-runtime v0.19.4
28+
sigs.k8s.io/gateway-api v1.2.1
3129
)
3230

3331
require (
32+
github.com/go-logr/logr v1.4.2
3433
github.com/google/go-cmp v0.6.0
35-
github.com/onsi/ginkgo/v2 v2.21.0
36-
github.com/onsi/gomega v1.34.2
37-
k8s.io/kubernetes v1.31.0
34+
github.com/onsi/ginkgo/v2 v2.22.2
35+
github.com/onsi/gomega v1.36.2
36+
k8s.io/kubernetes v1.32.0
37+
sigs.k8s.io/sig-storage-lib-external-provisioner/v11 v11.0.1
3838
)
3939

4040
require (
41+
cel.dev/expr v0.19.1 // indirect
42+
github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab // indirect
43+
github.com/Microsoft/go-winio v0.6.2 // indirect
4144
github.com/NYTimes/gziphandler v1.1.1 // indirect
4245
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
4346
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
4447
github.com/beorn7/perks v1.0.1 // indirect
4548
github.com/blang/semver/v4 v4.0.0 // indirect
4649
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
4750
github.com/cespare/xxhash/v2 v2.3.0 // indirect
51+
github.com/containerd/containerd/api v1.8.0 // indirect
52+
github.com/containerd/errdefs v1.0.0 // indirect
53+
github.com/containerd/log v0.1.0 // indirect
54+
github.com/containerd/ttrpc v1.2.7 // indirect
4855
github.com/coreos/go-semver v0.3.1 // indirect
4956
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
57+
github.com/cyphar/filepath-securejoin v0.3.6 // indirect
5058
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
5159
github.com/distribution/reference v0.6.0 // indirect
60+
github.com/docker/go-units v0.5.0 // indirect
5261
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
62+
github.com/euank/go-kmsg-parser v2.0.0+incompatible // indirect
5363
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
5464
github.com/felixge/httpsnoop v1.0.4 // indirect
5565
github.com/fsnotify/fsnotify v1.8.0 // indirect
5666
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
57-
github.com/go-logr/logr v1.4.2 // indirect
5867
github.com/go-logr/stdr v1.2.2 // indirect
5968
github.com/go-openapi/jsonpointer v0.21.0 // indirect
6069
github.com/go-openapi/jsonreference v0.21.0 // indirect
6170
github.com/go-openapi/swag v0.23.0 // indirect
6271
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
72+
github.com/godbus/dbus/v5 v5.1.0 // indirect
6373
github.com/gogo/protobuf v1.3.2 // indirect
64-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
6574
github.com/golang/protobuf v1.5.4 // indirect
66-
github.com/google/cel-go v0.20.1 // indirect
67-
github.com/google/gnostic-models v0.6.8 // indirect
68-
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db // indirect
75+
github.com/google/btree v1.1.3 // indirect
76+
github.com/google/cadvisor v0.51.0 // indirect
77+
github.com/google/cel-go v0.22.1 // indirect
78+
github.com/google/gnostic-models v0.6.9 // indirect
79+
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
6980
github.com/gorilla/websocket v1.5.3 // indirect
7081
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
71-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.23.0 // indirect
82+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1 // indirect
7283
github.com/inconshreveable/mousetrap v1.1.0 // indirect
7384
github.com/josharian/intern v1.0.0 // indirect
7485
github.com/json-iterator/go v1.1.12 // indirect
75-
github.com/mailru/easyjson v0.7.7 // indirect
86+
github.com/karrick/godirwalk v1.17.0 // indirect
87+
github.com/klauspost/compress v1.17.11 // indirect
88+
github.com/kylelemons/godebug v1.1.0 // indirect
89+
github.com/mailru/easyjson v0.9.0 // indirect
90+
github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible // indirect
7691
github.com/moby/spdystream v0.5.0 // indirect
7792
github.com/moby/sys/mountinfo v0.7.2 // indirect
7893
github.com/moby/sys/userns v0.1.0 // indirect
@@ -81,119 +96,131 @@ require (
8196
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
8297
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
8398
github.com/opencontainers/go-digest v1.0.0 // indirect
84-
github.com/opencontainers/runc v1.2.1 // indirect
99+
github.com/opencontainers/image-spec v1.1.0 // indirect
100+
github.com/opencontainers/runc v1.2.4 // indirect
101+
github.com/opencontainers/runtime-spec v1.2.0 // indirect
85102
github.com/opencontainers/selinux v1.11.1 // indirect
86103
github.com/pkg/errors v0.9.1 // indirect
87104
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
88105
github.com/prometheus/client_model v0.6.1 // indirect
89-
github.com/prometheus/common v0.55.0 // indirect
106+
github.com/prometheus/common v0.61.0 // indirect
90107
github.com/prometheus/procfs v0.15.1 // indirect
108+
github.com/sirupsen/logrus v1.9.3 // indirect
91109
github.com/spf13/cobra v1.8.1 // indirect
92110
github.com/stoewer/go-strcase v1.3.0 // indirect
93111
github.com/x448/float16 v0.8.4 // indirect
94-
go.etcd.io/etcd/api/v3 v3.5.16 // indirect
95-
go.etcd.io/etcd/client/pkg/v3 v3.5.16 // indirect
96-
go.etcd.io/etcd/client/v3 v3.5.16 // indirect
97-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.56.0 // indirect
98-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0 // indirect
99-
go.opentelemetry.io/otel v1.31.0 // indirect
100-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.31.0 // indirect
101-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.31.0 // indirect
102-
go.opentelemetry.io/otel/metric v1.31.0 // indirect
103-
go.opentelemetry.io/otel/sdk v1.31.0 // indirect
104-
go.opentelemetry.io/otel/trace v1.31.0 // indirect
105-
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
112+
go.etcd.io/etcd/api/v3 v3.5.17 // indirect
113+
go.etcd.io/etcd/client/pkg/v3 v3.5.17 // indirect
114+
go.etcd.io/etcd/client/v3 v3.5.17 // indirect
115+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
116+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.58.0 // indirect
117+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
118+
go.opentelemetry.io/otel v1.33.0 // indirect
119+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 // indirect
120+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0 // indirect
121+
go.opentelemetry.io/otel/metric v1.33.0 // indirect
122+
go.opentelemetry.io/otel/sdk v1.33.0 // indirect
123+
go.opentelemetry.io/otel/trace v1.33.0 // indirect
124+
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
106125
go.uber.org/multierr v1.11.0 // indirect
107126
go.uber.org/zap v1.27.0 // indirect
108-
golang.org/x/crypto v0.31.0 // indirect
109-
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
110-
golang.org/x/mod v0.21.0 // indirect
111-
golang.org/x/net v0.30.0 // indirect
112-
golang.org/x/oauth2 v0.23.0 // indirect
127+
golang.org/x/crypto v0.32.0 // indirect
128+
golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 // indirect
129+
golang.org/x/mod v0.22.0 // indirect
130+
golang.org/x/net v0.34.0 // indirect
131+
golang.org/x/oauth2 v0.25.0 // indirect
113132
golang.org/x/sync v0.10.0 // indirect
114-
golang.org/x/sys v0.28.0 // indirect
115-
golang.org/x/term v0.27.0 // indirect
133+
golang.org/x/sys v0.29.0 // indirect
134+
golang.org/x/term v0.28.0 // indirect
116135
golang.org/x/text v0.21.0 // indirect
117-
golang.org/x/time v0.7.0 // indirect
118-
golang.org/x/tools v0.26.0 // indirect
136+
golang.org/x/time v0.9.0 // indirect
137+
golang.org/x/tools v0.29.0 // indirect
119138
google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
120-
google.golang.org/genproto/googleapis/api v0.0.0-20241021214115-324edc3d5d38 // indirect
121-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38 // indirect
139+
google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422 // indirect
140+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250106144421-5f5ef82da422 // indirect
122141
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
123142
gopkg.in/inf.v0 v0.9.1 // indirect
124143
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
125-
gopkg.in/yaml.v2 v2.4.0 // indirect
126144
gopkg.in/yaml.v3 v3.0.1 // indirect
127-
k8s.io/apiextensions-apiserver v0.31.0 // indirect
128-
k8s.io/cloud-provider v0.30.0 // indirect
129-
k8s.io/controller-manager v0.31.0 // indirect
130-
k8s.io/kms v0.31.0 // indirect
131-
k8s.io/kube-openapi v0.0.0-20240730131305-7a9a4e85957e // indirect
132-
k8s.io/kubectl v0.31.0 // indirect
133-
k8s.io/kubelet v0.31.0 // indirect
134-
k8s.io/mount-utils v0.31.0 // indirect
135-
k8s.io/pod-security-admission v0.31.0 // indirect
136-
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
137-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
138-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
139-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
145+
k8s.io/apiextensions-apiserver v0.32.0 // indirect
146+
k8s.io/cloud-provider v0.32.0 // indirect
147+
k8s.io/controller-manager v0.32.0 // indirect
148+
k8s.io/cri-api v0.32.0 // indirect
149+
k8s.io/cri-client v0.32.0 // indirect
150+
k8s.io/dynamic-resource-allocation v0.32.0 // indirect
151+
k8s.io/kms v0.32.0 // indirect
152+
k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 // indirect
153+
k8s.io/kube-scheduler v0.32.0 // indirect
154+
k8s.io/kubectl v0.32.0 // indirect
155+
k8s.io/kubelet v0.32.0 // indirect
156+
k8s.io/mount-utils v0.32.0 // indirect
157+
k8s.io/pod-security-admission v0.32.0 // indirect
158+
k8s.io/utils v0.0.0-20241210054802-24370beab758 // indirect
159+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.1 // indirect
160+
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
161+
sigs.k8s.io/structured-merge-diff/v4 v4.5.0 // indirect
140162
sigs.k8s.io/yaml v1.4.0 // indirect
141163
)
142164

143-
replace k8s.io/api => k8s.io/api v0.31.0
165+
replace k8s.io/api => k8s.io/api v0.32.0
144166

145-
replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.31.0
167+
replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.32.0
146168

147-
replace k8s.io/apimachinery => k8s.io/apimachinery v0.31.0
169+
replace k8s.io/apimachinery => k8s.io/apimachinery v0.32.0
148170

149-
replace k8s.io/apiserver => k8s.io/apiserver v0.31.0
171+
replace k8s.io/apiserver => k8s.io/apiserver v0.32.0
150172

151-
replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.31.0
173+
replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.32.0
152174

153-
replace k8s.io/client-go => k8s.io/client-go v0.31.0
175+
replace k8s.io/client-go => k8s.io/client-go v0.32.0
154176

155-
replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.31.0
177+
replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.32.0
156178

157-
replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.31.0
179+
replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.32.0
158180

159-
replace k8s.io/code-generator => k8s.io/code-generator v0.31.0
181+
replace k8s.io/code-generator => k8s.io/code-generator v0.32.0
160182

161-
replace k8s.io/component-base => k8s.io/component-base v0.31.0
183+
replace k8s.io/component-base => k8s.io/component-base v0.32.0
162184

163-
replace k8s.io/component-helpers => k8s.io/component-helpers v0.31.0
185+
replace k8s.io/component-helpers => k8s.io/component-helpers v0.32.0
164186

165-
replace k8s.io/controller-manager => k8s.io/controller-manager v0.31.0
187+
replace k8s.io/controller-manager => k8s.io/controller-manager v0.32.0
166188

167-
replace k8s.io/cri-api => k8s.io/cri-api v0.31.0
189+
replace k8s.io/cri-api => k8s.io/cri-api v0.32.0
168190

169-
replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.31.0
191+
replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.32.0
170192

171-
replace k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.31.0
193+
replace k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.32.0
172194

173-
replace k8s.io/endpointslice => k8s.io/endpointslice v0.31.0
195+
replace k8s.io/endpointslice => k8s.io/endpointslice v0.32.0
174196

175-
replace k8s.io/kms => k8s.io/kms v0.31.0
197+
replace k8s.io/kms => k8s.io/kms v0.32.0
176198

177-
replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.31.0
199+
replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.32.0
178200

179-
replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.31.0
201+
replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.32.0
180202

181-
replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.31.0
203+
replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.32.0
182204

183-
replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.31.0
205+
replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.32.0
184206

185-
replace k8s.io/kubectl => k8s.io/kubectl v0.31.0
207+
replace k8s.io/kubectl => k8s.io/kubectl v0.32.0
186208

187-
replace k8s.io/kubelet => k8s.io/kubelet v0.31.0
209+
replace k8s.io/kubelet => k8s.io/kubelet v0.32.0
188210

189-
replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.31.0
211+
replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.32.0
190212

191-
replace k8s.io/metrics => k8s.io/metrics v0.31.0
213+
replace k8s.io/metrics => k8s.io/metrics v0.32.0
192214

193-
replace k8s.io/mount-utils => k8s.io/mount-utils v0.31.0
215+
replace k8s.io/mount-utils => k8s.io/mount-utils v0.32.0
194216

195-
replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.31.0
217+
replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.32.0
196218

197-
replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.31.0
219+
replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.32.0
198220

199-
replace k8s.io/cri-client => k8s.io/cri-client v0.31.0
221+
replace k8s.io/cri-client => k8s.io/cri-client v0.32.0
222+
223+
replace k8s.io/externaljwt => k8s.io/externaljwt v0.32.0
224+
225+
// TODO remove when github.com/google/cadvisor upgrades to errdefs v1.0.0
226+
replace github.com/containerd/errdefs v1.0.0 => github.com/containerd/errdefs v0.1.0

0 commit comments

Comments
 (0)