Skip to content

Commit b1a8b4a

Browse files
authored
Merge pull request #2282 from ConnorJC3/fix-dep-bump
Bump dependencies and lock errdefs version to v0.1.0
2 parents 8de8412 + 2dd444d commit b1a8b4a

File tree

2 files changed

+63
-60
lines changed

2 files changed

+63
-60
lines changed

go.mod

+25-23
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ require (
1515
github.com/kubernetes-csi/csi-proxy/v2 v2.0.0-alpha.1
1616
github.com/kubernetes-csi/csi-test/v5 v5.3.1
1717
github.com/kubernetes-csi/external-snapshotter/client/v4 v4.2.0
18-
github.com/onsi/ginkgo/v2 v2.22.1
18+
github.com/onsi/ginkgo/v2 v2.22.2
1919
github.com/onsi/gomega v1.36.2
2020
github.com/prometheus/client_golang v1.20.5
2121
github.com/spf13/pflag v1.0.5
@@ -25,9 +25,9 @@ require (
2525
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0
2626
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0
2727
go.opentelemetry.io/otel/sdk v1.33.0
28-
golang.org/x/sys v0.28.0
28+
golang.org/x/sys v0.29.0
2929
google.golang.org/grpc v1.69.2
30-
google.golang.org/protobuf v1.36.1
30+
google.golang.org/protobuf v1.36.2
3131
k8s.io/api v0.32.0
3232
k8s.io/apimachinery v0.32.0
3333
k8s.io/client-go v0.32.0
@@ -59,13 +59,13 @@ require (
5959
github.com/blang/semver/v4 v4.0.0 // indirect
6060
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
6161
github.com/cespare/xxhash/v2 v2.3.0 // indirect
62-
github.com/containerd/containerd/api v1.7.19 // indirect
63-
github.com/containerd/errdefs v0.1.0 // indirect
62+
github.com/containerd/containerd/api v1.8.0 // indirect
63+
github.com/containerd/errdefs v1.0.0 // indirect
6464
github.com/containerd/log v0.1.0 // indirect
65-
github.com/containerd/ttrpc v1.2.5 // indirect
65+
github.com/containerd/ttrpc v1.2.7 // indirect
6666
github.com/coreos/go-semver v0.3.1 // indirect
6767
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
68-
github.com/cyphar/filepath-securejoin v0.3.5 // indirect
68+
github.com/cyphar/filepath-securejoin v0.3.6 // indirect
6969
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
7070
github.com/distribution/reference v0.6.0 // indirect
7171
github.com/docker/go-units v0.5.0 // indirect
@@ -84,7 +84,7 @@ require (
8484
github.com/godbus/dbus/v5 v5.1.0 // indirect
8585
github.com/gogo/protobuf v1.3.2 // indirect
8686
github.com/golang/protobuf v1.5.4 // indirect
87-
github.com/google/btree v1.0.1 // indirect
87+
github.com/google/btree v1.1.3 // indirect
8888
github.com/google/cadvisor v0.51.0 // indirect
8989
github.com/google/cel-go v0.22.1 // indirect
9090
github.com/google/gnostic-models v0.6.9 // indirect
@@ -109,7 +109,8 @@ require (
109109
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
110110
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
111111
github.com/opencontainers/go-digest v1.0.0 // indirect
112-
github.com/opencontainers/runc v1.2.3 // indirect
112+
github.com/opencontainers/image-spec v1.1.0 // indirect
113+
github.com/opencontainers/runc v1.2.4 // indirect
113114
github.com/opencontainers/runtime-spec v1.2.0 // indirect
114115
github.com/opencontainers/selinux v1.11.1 // indirect
115116
github.com/pkg/errors v0.9.1 // indirect
@@ -128,20 +129,20 @@ require (
128129
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
129130
go.opentelemetry.io/otel/metric v1.33.0 // indirect
130131
go.opentelemetry.io/otel/trace v1.33.0 // indirect
131-
go.opentelemetry.io/proto/otlp v1.4.0 // indirect
132+
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
132133
go.uber.org/multierr v1.11.0 // indirect
133134
go.uber.org/zap v1.27.0 // indirect
134-
golang.org/x/crypto v0.31.0 // indirect
135-
golang.org/x/exp v0.0.0-20241210194714-1829a127f884 // indirect
136-
golang.org/x/net v0.33.0 // indirect
137-
golang.org/x/oauth2 v0.24.0 // indirect
135+
golang.org/x/crypto v0.32.0 // indirect
136+
golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 // indirect
137+
golang.org/x/net v0.34.0 // indirect
138+
golang.org/x/oauth2 v0.25.0 // indirect
138139
golang.org/x/sync v0.10.0 // indirect
139-
golang.org/x/term v0.27.0 // indirect
140+
golang.org/x/term v0.28.0 // indirect
140141
golang.org/x/text v0.21.0 // indirect
141-
golang.org/x/time v0.8.0 // indirect
142-
golang.org/x/tools v0.28.0 // indirect
143-
google.golang.org/genproto/googleapis/api v0.0.0-20241219192143-6b3ec007d9bb // indirect
144-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241219192143-6b3ec007d9bb // indirect
142+
golang.org/x/time v0.9.0 // indirect
143+
golang.org/x/tools v0.29.0 // indirect
144+
google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422 // indirect
145+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250106144421-5f5ef82da422 // indirect
145146
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
146147
gopkg.in/inf.v0 v0.9.1 // indirect
147148
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
@@ -153,12 +154,12 @@ require (
153154
k8s.io/component-helpers v0.32.0 // indirect
154155
k8s.io/controller-manager v0.32.0 // indirect
155156
k8s.io/cri-api v0.32.0 // indirect
156-
k8s.io/cri-client v0.0.0 // indirect
157+
k8s.io/cri-client v0.32.0 // indirect
157158
k8s.io/csi-translation-lib v0.32.0 // indirect
158-
k8s.io/dynamic-resource-allocation v0.0.0 // indirect
159+
k8s.io/dynamic-resource-allocation v0.32.0 // indirect
159160
k8s.io/kms v0.32.0 // indirect
160-
k8s.io/kube-openapi v0.0.0-20241127205056-99599406b04f // indirect
161-
k8s.io/kube-scheduler v0.0.0 // indirect
161+
k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 // indirect
162+
k8s.io/kube-scheduler v0.32.0 // indirect
162163
k8s.io/kubectl v0.32.0 // indirect
163164
k8s.io/kubelet v0.32.0 // indirect
164165
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.1 // indirect
@@ -168,6 +169,7 @@ require (
168169
)
169170

170171
replace (
172+
github.com/containerd/errdefs => github.com/containerd/errdefs v0.1.0 // Mitigate errdefs breaking change (Remove after all depdendencies upgrade to v1.0.0)
171173
k8s.io/api => k8s.io/api v0.32.0
172174
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.32.0
173175
k8s.io/apimachinery => k8s.io/apimachinery v0.32.0

0 commit comments

Comments
 (0)