Skip to content

Commit 5a1ca39

Browse files
authored
Merge pull request kubernetes-csi#1251 from dfajmon/bump-origin-master
update kubernetes to 1.32
2 parents dd15a75 + e8bc200 commit 5a1ca39

File tree

1,400 files changed

+62391
-47514
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,400 files changed

+62391
-47514
lines changed

go.mod

+26-40
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,22 @@ require (
66
github.com/container-storage-interface/spec v1.11.0
77
github.com/evanphx/json-patch v5.9.0+incompatible
88
github.com/golang/mock v1.6.0
9-
github.com/kubernetes-csi/csi-lib-utils v0.19.0
9+
github.com/kubernetes-csi/csi-lib-utils v0.20.0
1010
github.com/kubernetes-csi/csi-test/v5 v5.3.1
11-
github.com/kubernetes-csi/external-snapshotter/client/v8 v8.0.0
11+
github.com/kubernetes-csi/external-snapshotter/client/v8 v8.2.0
1212
github.com/prometheus/client_golang v1.20.5
1313
github.com/prometheus/client_model v0.6.1
14-
github.com/prometheus/common v0.60.1
15-
google.golang.org/grpc v1.68.0
16-
google.golang.org/protobuf v1.35.2
17-
k8s.io/api v0.31.3
18-
k8s.io/apimachinery v0.31.3
19-
k8s.io/apiserver v0.31.3
20-
k8s.io/client-go v0.31.3
21-
k8s.io/component-base v0.31.3
22-
k8s.io/component-helpers v0.31.0
14+
github.com/prometheus/common v0.61.0
15+
google.golang.org/grpc v1.69.0
16+
google.golang.org/protobuf v1.36.0
17+
k8s.io/api v0.32.0
18+
k8s.io/apimachinery v0.32.0
19+
k8s.io/apiserver v0.32.0
20+
k8s.io/client-go v0.32.0
21+
k8s.io/component-base v0.32.0
22+
k8s.io/component-helpers v0.32.0
2323
k8s.io/klog/v2 v2.130.1
24-
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
24+
k8s.io/utils v0.0.0-20241210054802-24370beab758
2525
)
2626

2727
require (
@@ -37,18 +37,16 @@ require (
3737
github.com/go-openapi/jsonreference v0.21.0 // indirect
3838
github.com/go-openapi/swag v0.23.0 // indirect
3939
github.com/gogo/protobuf v1.3.2 // indirect
40-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
4140
github.com/golang/protobuf v1.5.4 // indirect
4241
github.com/google/gnostic-models v0.6.9 // indirect
4342
github.com/google/go-cmp v0.6.0 // indirect
4443
github.com/google/gofuzz v1.2.0 // indirect
4544
github.com/google/uuid v1.6.0 // indirect
46-
github.com/imdario/mergo v0.3.13 // indirect
4745
github.com/inconshreveable/mousetrap v1.1.0 // indirect
4846
github.com/josharian/intern v1.0.0 // indirect
4947
github.com/json-iterator/go v1.1.12 // indirect
5048
github.com/klauspost/compress v1.17.11 // indirect
51-
github.com/mailru/easyjson v0.7.7 // indirect
49+
github.com/mailru/easyjson v0.9.0 // indirect
5250
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
5351
github.com/modern-go/reflect2 v1.0.2 // indirect
5452
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
@@ -57,37 +55,25 @@ require (
5755
github.com/spf13/cobra v1.8.1 // indirect
5856
github.com/spf13/pflag v1.0.5 // indirect
5957
github.com/x448/float16 v0.8.4 // indirect
60-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.57.0 // indirect
61-
go.opentelemetry.io/otel v1.32.0 // indirect
62-
go.opentelemetry.io/otel/metric v1.32.0 // indirect
63-
go.opentelemetry.io/otel/trace v1.32.0 // indirect
64-
golang.org/x/net v0.31.0 // indirect
58+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
59+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.58.0 // indirect
60+
go.opentelemetry.io/otel v1.33.0 // indirect
61+
go.opentelemetry.io/otel/metric v1.33.0 // indirect
62+
go.opentelemetry.io/otel/trace v1.33.0 // indirect
63+
golang.org/x/net v0.32.0 // indirect
6564
golang.org/x/oauth2 v0.24.0 // indirect
66-
golang.org/x/sys v0.27.0 // indirect
67-
golang.org/x/term v0.26.0 // indirect
68-
golang.org/x/text v0.20.0 // indirect
65+
golang.org/x/sys v0.28.0 // indirect
66+
golang.org/x/term v0.27.0 // indirect
67+
golang.org/x/text v0.21.0 // indirect
6968
golang.org/x/time v0.8.0 // indirect
70-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect
69+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241216192217-9240e9c98484 // indirect
7170
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
7271
gopkg.in/inf.v0 v0.9.1 // indirect
73-
gopkg.in/yaml.v2 v2.4.0 // indirect
7472
gopkg.in/yaml.v3 v3.0.1 // indirect
75-
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
76-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
77-
sigs.k8s.io/structured-merge-diff/v4 v4.4.3 // indirect
73+
k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 // indirect
74+
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
75+
sigs.k8s.io/structured-merge-diff/v4 v4.5.0 // indirect
7876
sigs.k8s.io/yaml v1.4.0 // indirect
7977
)
8078

8179
replace github.com/kubernetes-csi/external-snapshotter/client/v8 => ./client
82-
83-
replace k8s.io/api => k8s.io/api v0.31.0
84-
85-
replace k8s.io/apimachinery => k8s.io/apimachinery v0.31.0
86-
87-
replace k8s.io/client-go => k8s.io/client-go v0.31.0
88-
89-
replace k8s.io/code-generator => k8s.io/code-generator v0.31.0
90-
91-
replace k8s.io/component-base => k8s.io/component-base v0.31.0
92-
93-
replace k8s.io/component-helpers => k8s.io/component-helpers v0.31.0

0 commit comments

Comments
 (0)