Skip to content

Commit 23dd3f1

Browse files
authored
Merge pull request #1330 from dobsonj/k8s-1.34-bump
Bump k8s dependencies to v1.34.0
2 parents 32db64f + ce8ac62 commit 23dd3f1

File tree

1,029 files changed

+93831
-34223
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,029 files changed

+93831
-34223
lines changed

go.mod

Lines changed: 94 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -2,36 +2,37 @@ module github.com/kubernetes-csi/external-snapshotter/v8
22

33
go 1.24.0
44

5-
toolchain go1.24.4
5+
toolchain go1.24.6
66

77
require (
88
github.com/container-storage-interface/spec v1.11.0
99
github.com/evanphx/json-patch v5.9.0+incompatible
10-
github.com/fsnotify/fsnotify v1.7.0
10+
github.com/fsnotify/fsnotify v1.9.0
1111
github.com/golang/mock v1.6.0
12+
github.com/google/go-cmp v0.7.0
1213
github.com/kubernetes-csi/csi-lib-utils v0.22.0
1314
github.com/kubernetes-csi/csi-test/v5 v5.3.1
1415
github.com/kubernetes-csi/external-snapshotter/client/v8 v8.2.0
1516
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822
1617
github.com/prometheus/client_golang v1.22.0
1718
github.com/prometheus/client_model v0.6.1
1819
github.com/prometheus/common v0.62.0
19-
google.golang.org/grpc v1.69.0
20+
google.golang.org/grpc v1.72.1
2021
google.golang.org/protobuf v1.36.5
21-
k8s.io/api v0.33.2
22-
k8s.io/apiextensions-apiserver v0.33.2
23-
k8s.io/apimachinery v0.33.2
24-
k8s.io/apiserver v0.33.2
25-
k8s.io/client-go v0.33.2
26-
k8s.io/component-base v0.33.2
27-
k8s.io/component-helpers v0.33.0
22+
k8s.io/api v0.34.0
23+
k8s.io/apiextensions-apiserver v0.34.0
24+
k8s.io/apimachinery v0.34.0
25+
k8s.io/apiserver v0.34.0
26+
k8s.io/client-go v0.34.0
27+
k8s.io/component-base v0.34.0
28+
k8s.io/component-helpers v0.34.0
2829
k8s.io/klog/v2 v2.130.1
29-
k8s.io/utils v0.0.0-20241210054802-24370beab758
30-
sigs.k8s.io/yaml v1.4.0
30+
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
31+
sigs.k8s.io/yaml v1.6.0
3132
)
3233

3334
require (
34-
cel.dev/expr v0.19.1 // indirect
35+
cel.dev/expr v0.24.0 // indirect
3536
github.com/NYTimes/gziphandler v1.1.1 // indirect
3637
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
3738
github.com/beorn7/perks v1.0.1 // indirect
@@ -41,9 +42,9 @@ require (
4142
github.com/coreos/go-semver v0.3.1 // indirect
4243
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
4344
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
44-
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
45+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
4546
github.com/felixge/httpsnoop v1.0.4 // indirect
46-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
47+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
4748
github.com/go-logr/logr v1.4.2 // indirect
4849
github.com/go-logr/stdr v1.2.2 // indirect
4950
github.com/go-logr/zapr v1.3.0 // indirect
@@ -52,41 +53,43 @@ require (
5253
github.com/go-openapi/swag v0.23.0 // indirect
5354
github.com/gogo/protobuf v1.3.2 // indirect
5455
github.com/golang/protobuf v1.5.4 // indirect
55-
github.com/google/cel-go v0.23.2 // indirect
56-
github.com/google/gnostic-models v0.6.9 // indirect
57-
github.com/google/go-cmp v0.7.0 // indirect
56+
github.com/google/cel-go v0.26.0 // indirect
57+
github.com/google/gnostic-models v0.7.0 // indirect
5858
github.com/google/uuid v1.6.0 // indirect
5959
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
60-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.24.0 // indirect
60+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
6161
github.com/inconshreveable/mousetrap v1.1.0 // indirect
6262
github.com/josharian/intern v1.0.0 // indirect
6363
github.com/json-iterator/go v1.1.12 // indirect
6464
github.com/kylelemons/godebug v1.1.0 // indirect
6565
github.com/mailru/easyjson v0.9.0 // indirect
6666
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
67-
github.com/modern-go/reflect2 v1.0.2 // indirect
67+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
6868
github.com/pkg/errors v0.9.1 // indirect
69+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
6970
github.com/prometheus/procfs v0.15.1 // indirect
70-
github.com/spf13/cobra v1.8.1 // indirect
71-
github.com/spf13/pflag v1.0.5 // indirect
71+
github.com/spf13/cobra v1.9.1 // indirect
72+
github.com/spf13/pflag v1.0.6 // indirect
7273
github.com/stoewer/go-strcase v1.3.0 // indirect
7374
github.com/x448/float16 v0.8.4 // indirect
74-
go.etcd.io/etcd/api/v3 v3.5.21 // indirect
75-
go.etcd.io/etcd/client/pkg/v3 v3.5.21 // indirect
76-
go.etcd.io/etcd/client/v3 v3.5.21 // indirect
75+
go.etcd.io/etcd/api/v3 v3.6.4 // indirect
76+
go.etcd.io/etcd/client/pkg/v3 v3.6.4 // indirect
77+
go.etcd.io/etcd/client/v3 v3.6.4 // indirect
7778
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
78-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.58.0 // indirect
79+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
7980
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
80-
go.opentelemetry.io/otel v1.33.0 // indirect
81-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 // indirect
82-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0 // indirect
83-
go.opentelemetry.io/otel/metric v1.33.0 // indirect
84-
go.opentelemetry.io/otel/sdk v1.33.0 // indirect
85-
go.opentelemetry.io/otel/trace v1.33.0 // indirect
86-
go.opentelemetry.io/proto/otlp v1.4.0 // indirect
81+
go.opentelemetry.io/otel v1.35.0 // indirect
82+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 // indirect
83+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0 // indirect
84+
go.opentelemetry.io/otel/metric v1.35.0 // indirect
85+
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
86+
go.opentelemetry.io/otel/trace v1.35.0 // indirect
87+
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
8788
go.uber.org/automaxprocs v1.6.0 // indirect
8889
go.uber.org/multierr v1.11.0 // indirect
8990
go.uber.org/zap v1.27.0 // indirect
91+
go.yaml.in/yaml/v2 v2.4.2 // indirect
92+
go.yaml.in/yaml/v3 v3.0.4 // indirect
9093
golang.org/x/crypto v0.37.0 // indirect
9194
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
9295
golang.org/x/net v0.39.0 // indirect
@@ -96,32 +99,78 @@ require (
9699
golang.org/x/term v0.31.0 // indirect
97100
golang.org/x/text v0.24.0 // indirect
98101
golang.org/x/time v0.9.0 // indirect
99-
google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
100-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241216192217-9240e9c98484 // indirect
102+
google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb // indirect
103+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb // indirect
101104
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
102105
gopkg.in/inf.v0 v0.9.1 // indirect
103106
gopkg.in/yaml.v3 v3.0.1 // indirect
104-
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
107+
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
105108
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
106109
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
107110
sigs.k8s.io/randfill v1.0.0 // indirect
108-
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
111+
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
109112
)
110113

111114
replace github.com/kubernetes-csi/external-snapshotter/client/v8 => ./client
112115

113-
replace k8s.io/api => k8s.io/api v0.33.0
116+
replace k8s.io/api => k8s.io/api v0.34.0
114117

115-
replace k8s.io/apimachinery => k8s.io/apimachinery v0.33.0
118+
replace k8s.io/apimachinery => k8s.io/apimachinery v0.34.0
116119

117-
replace k8s.io/apiserver => k8s.io/apiserver v0.33.0
120+
replace k8s.io/apiserver => k8s.io/apiserver v0.34.0
118121

119-
replace k8s.io/client-go => k8s.io/client-go v0.33.0
122+
replace k8s.io/client-go => k8s.io/client-go v0.34.0
120123

121-
replace k8s.io/code-generator => k8s.io/code-generator v0.33.0
124+
replace k8s.io/code-generator => k8s.io/code-generator v0.34.0
122125

123-
replace k8s.io/component-base => k8s.io/component-base v0.33.0
126+
replace k8s.io/component-base => k8s.io/component-base v0.34.0
124127

125-
replace k8s.io/component-helpers => k8s.io/component-helpers v0.33.0
128+
replace k8s.io/component-helpers => k8s.io/component-helpers v0.34.0
126129

127-
replace k8s.io/kms => k8s.io/kms v0.33.0
130+
replace k8s.io/kms => k8s.io/kms v0.34.0
131+
132+
replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.34.0
133+
134+
replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.34.0
135+
136+
replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.34.0
137+
138+
replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.34.0
139+
140+
replace k8s.io/controller-manager => k8s.io/controller-manager v0.34.0
141+
142+
replace k8s.io/cri-api => k8s.io/cri-api v0.34.0
143+
144+
replace k8s.io/cri-client => k8s.io/cri-client v0.34.0
145+
146+
replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.34.0
147+
148+
replace k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.34.0
149+
150+
replace k8s.io/endpointslice => k8s.io/endpointslice v0.34.0
151+
152+
replace k8s.io/externaljwt => k8s.io/externaljwt v0.34.0
153+
154+
replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.34.0
155+
156+
replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.34.0
157+
158+
replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.34.0
159+
160+
replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.34.0
161+
162+
replace k8s.io/kubectl => k8s.io/kubectl v0.34.0
163+
164+
replace k8s.io/kubelet => k8s.io/kubelet v0.34.0
165+
166+
replace k8s.io/metrics => k8s.io/metrics v0.34.0
167+
168+
replace k8s.io/mount-utils => k8s.io/mount-utils v0.34.0
169+
170+
replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.34.0
171+
172+
replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.34.0
173+
174+
replace k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.34.0
175+
176+
replace k8s.io/sample-controller => k8s.io/sample-controller v0.34.0

0 commit comments

Comments
 (0)