Skip to content

Commit 6448686

Browse files
authored
Merge pull request #2280 from marquiz/devel/deps
deps: bump k8s.io to v1.34
2 parents 4c1a5ce + 6ceb476 commit 6448686

File tree

7 files changed

+172
-196
lines changed

7 files changed

+172
-196
lines changed

go.mod

Lines changed: 65 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,17 @@ require (
2525
golang.org/x/net v0.43.0
2626
golang.org/x/time v0.12.0
2727
google.golang.org/grpc v1.75.0
28-
k8s.io/api v0.33.4
29-
k8s.io/apiextensions-apiserver v0.33.4
30-
k8s.io/apimachinery v0.33.4
31-
k8s.io/client-go v0.33.4
32-
k8s.io/component-base v0.33.4
28+
k8s.io/api v0.34.1
29+
k8s.io/apiextensions-apiserver v0.34.1
30+
k8s.io/apimachinery v0.34.1
31+
k8s.io/client-go v0.34.1
32+
k8s.io/component-base v0.34.1
3333
k8s.io/klog/v2 v2.130.1
34-
k8s.io/kubectl v0.33.4
35-
k8s.io/kubelet v0.33.4
36-
k8s.io/kubernetes v1.33.4
37-
k8s.io/pod-security-admission v0.33.4
38-
k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e
34+
k8s.io/kubectl v0.34.1
35+
k8s.io/kubelet v0.34.1
36+
k8s.io/kubernetes v1.34.1
37+
k8s.io/pod-security-admission v0.34.1
38+
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
3939
oras.land/oras-go/v2 v2.6.0
4040
sigs.k8s.io/node-feature-discovery/api/nfd v0.0.0-00010101000000-000000000000
4141
sigs.k8s.io/yaml v1.6.0
@@ -44,7 +44,6 @@ require (
4444
require (
4545
cel.dev/expr v0.24.0 // indirect
4646
dario.cat/mergo v1.0.1 // indirect
47-
github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab // indirect
4847
github.com/Masterminds/goutils v1.1.1 // indirect
4948
github.com/Microsoft/go-winio v0.6.2 // indirect
5049
github.com/NYTimes/gziphandler v1.1.1 // indirect
@@ -55,23 +54,15 @@ require (
5554
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
5655
github.com/cespare/xxhash/v2 v2.3.0 // indirect
5756
github.com/chigopher/pathlib v0.19.1 // indirect
58-
github.com/containerd/containerd/api v1.8.0 // indirect
59-
github.com/containerd/errdefs v1.0.0 // indirect
60-
github.com/containerd/errdefs/pkg v0.3.0 // indirect
61-
github.com/containerd/log v0.1.0 // indirect
62-
github.com/containerd/ttrpc v1.2.6 // indirect
63-
github.com/containerd/typeurl/v2 v2.2.2 // indirect
6457
github.com/coreos/go-semver v0.3.1 // indirect
6558
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
6659
github.com/cyphar/filepath-securejoin v0.4.1 // indirect
6760
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
6861
github.com/distribution/reference v0.6.0 // indirect
69-
github.com/docker/go-units v0.5.0 // indirect
70-
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
71-
github.com/euank/go-kmsg-parser v2.0.0+incompatible // indirect
62+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
7263
github.com/fatih/color v1.17.0 // indirect
7364
github.com/felixge/httpsnoop v1.0.4 // indirect
74-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
65+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
7566
github.com/go-logr/logr v1.4.3 // indirect
7667
github.com/go-logr/stdr v1.2.2 // indirect
7768
github.com/go-ole/go-ole v1.2.6 // indirect
@@ -84,14 +75,13 @@ require (
8475
github.com/gogo/protobuf v1.3.2 // indirect
8576
github.com/golang/protobuf v1.5.4 // indirect
8677
github.com/google/btree v1.1.3 // indirect
87-
github.com/google/cadvisor v0.52.1 // indirect
88-
github.com/google/cel-go v0.23.2 // indirect
89-
github.com/google/gnostic-models v0.6.9 // indirect
78+
github.com/google/cel-go v0.26.0 // indirect
79+
github.com/google/gnostic-models v0.7.0 // indirect
9080
github.com/google/pprof v0.0.0-20250820193118-f64d9cf942d6 // indirect
9181
github.com/gopherjs/gopherjs v1.17.2 // indirect
9282
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
9383
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
94-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.24.0 // indirect
84+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
9585
github.com/hashicorp/hcl v1.0.0 // indirect
9686
github.com/huandu/xstrings v1.5.0 // indirect
9787
github.com/iancoleman/strcase v0.3.0 // indirect
@@ -101,14 +91,12 @@ require (
10191
github.com/josharian/intern v1.0.0 // indirect
10292
github.com/json-iterator/go v1.1.12 // indirect
10393
github.com/jtolds/gls v4.20.0+incompatible // indirect
104-
github.com/karrick/godirwalk v1.17.0 // indirect
10594
github.com/kylelemons/godebug v1.1.0 // indirect
10695
github.com/magiconair/properties v1.8.9 // indirect
10796
github.com/mailru/easyjson v0.7.7 // indirect
10897
github.com/mattn/go-colorable v0.1.14 // indirect
10998
github.com/mattn/go-isatty v0.0.20 // indirect
11099
github.com/mattn/go-runewidth v0.0.16 // indirect
111-
github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible // indirect
112100
github.com/mitchellh/copystructure v1.2.0 // indirect
113101
github.com/mitchellh/go-homedir v1.1.0 // indirect
114102
github.com/mitchellh/mapstructure v1.5.0 // indirect
@@ -117,13 +105,12 @@ require (
117105
github.com/moby/sys/mountinfo v0.7.2 // indirect
118106
github.com/moby/sys/userns v0.1.0 // indirect
119107
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
120-
github.com/modern-go/reflect2 v1.0.2 // indirect
108+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
121109
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
122110
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
123111
github.com/opencontainers/cgroups v0.0.1 // indirect
124112
github.com/opencontainers/go-digest v1.0.0 // indirect
125113
github.com/opencontainers/runtime-spec v1.2.1 // indirect
126-
github.com/opencontainers/selinux v1.11.1 // indirect
127114
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
128115
github.com/pkg/errors v0.9.1 // indirect
129116
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
@@ -148,19 +135,19 @@ require (
148135
github.com/vektra/mockery/v2 v2.52.2 // indirect
149136
github.com/x448/float16 v0.8.4 // indirect
150137
github.com/yusufpapurcu/wmi v1.2.4 // indirect
151-
go.etcd.io/etcd/api/v3 v3.5.21 // indirect
152-
go.etcd.io/etcd/client/pkg/v3 v3.5.21 // indirect
153-
go.etcd.io/etcd/client/v3 v3.5.21 // indirect
138+
go.etcd.io/etcd/api/v3 v3.6.4 // indirect
139+
go.etcd.io/etcd/client/pkg/v3 v3.6.4 // indirect
140+
go.etcd.io/etcd/client/v3 v3.6.4 // indirect
154141
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
155-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.58.0 // indirect
142+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
156143
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
157144
go.opentelemetry.io/otel v1.37.0 // indirect
158-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 // indirect
159-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0 // indirect
145+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 // indirect
146+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0 // indirect
160147
go.opentelemetry.io/otel/metric v1.37.0 // indirect
161148
go.opentelemetry.io/otel/sdk v1.37.0 // indirect
162149
go.opentelemetry.io/otel/trace v1.37.0 // indirect
163-
go.opentelemetry.io/proto/otlp v1.4.0 // indirect
150+
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
164151
go.uber.org/automaxprocs v1.6.0 // indirect
165152
go.uber.org/multierr v1.11.0 // indirect
166153
go.uber.org/zap v1.27.0 // indirect
@@ -186,56 +173,56 @@ require (
186173
gopkg.in/yaml.v2 v2.4.0 // indirect
187174
gopkg.in/yaml.v3 v3.0.1 // indirect
188175
howett.net/plist v1.0.2-0.20250314012144-ee69052608d9 // indirect
189-
k8s.io/apiserver v0.33.4 // indirect
190-
k8s.io/cloud-provider v0.33.4 // indirect
191-
k8s.io/code-generator v0.33.4 // indirect
192-
k8s.io/component-helpers v0.33.4 // indirect
193-
k8s.io/controller-manager v0.33.4 // indirect
194-
k8s.io/cri-api v0.33.4 // indirect
195-
k8s.io/cri-client v0.33.4 // indirect
196-
k8s.io/csi-translation-lib v0.33.4 // indirect
197-
k8s.io/dynamic-resource-allocation v0.33.4 // indirect
198-
k8s.io/gengo/v2 v2.0.0-20250207200755-1244d31929d7 // indirect
199-
k8s.io/kms v0.33.4 // indirect
200-
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
201-
k8s.io/kube-scheduler v0.33.4 // indirect
202-
k8s.io/mount-utils v0.33.4 // indirect
176+
k8s.io/apiserver v0.34.1 // indirect
177+
k8s.io/cloud-provider v0.34.1 // indirect
178+
k8s.io/code-generator v0.34.1 // indirect
179+
k8s.io/component-helpers v0.34.1 // indirect
180+
k8s.io/controller-manager v0.34.1 // indirect
181+
k8s.io/cri-api v0.34.1 // indirect
182+
k8s.io/cri-client v0.34.1 // indirect
183+
k8s.io/csi-translation-lib v0.34.1 // indirect
184+
k8s.io/dynamic-resource-allocation v0.34.1 // indirect
185+
k8s.io/gengo/v2 v2.0.0-20250604051438-85fd79dbfd9f // indirect
186+
k8s.io/kms v0.34.1 // indirect
187+
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
188+
k8s.io/kube-scheduler v0.34.1 // indirect
189+
k8s.io/mount-utils v0.34.1 // indirect
203190
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
204191
sigs.k8s.io/controller-tools v0.16.3 // indirect
205-
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
192+
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
206193
sigs.k8s.io/randfill v1.0.0 // indirect
207-
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
194+
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
208195
)
209196

210197
// The k8s "sub-"packages do not have 'semver' compatible versions. Thus, we
211198
// need to override with commits (corresponding their kubernetes-* tags)
212199
replace (
213-
k8s.io/api => k8s.io/api v0.33.4
214-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.33.4
215-
k8s.io/apimachinery => k8s.io/apimachinery v0.33.4
216-
k8s.io/apiserver => k8s.io/apiserver v0.33.4
217-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.33.4
218-
k8s.io/client-go => k8s.io/client-go v0.33.4
219-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.33.4
220-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.33.4
221-
k8s.io/code-generator => k8s.io/code-generator v0.33.4
222-
k8s.io/component-base => k8s.io/component-base v0.33.4
223-
k8s.io/component-helpers => k8s.io/component-helpers v0.33.4
224-
k8s.io/controller-manager => k8s.io/controller-manager v0.33.4
225-
k8s.io/cri-api => k8s.io/cri-api v0.33.4
226-
k8s.io/cri-client => k8s.io/cri-client v0.33.4
227-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.33.4
228-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.33.4
229-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.33.4
230-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.33.4
231-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.33.4
232-
k8s.io/kubectl => k8s.io/kubectl v0.33.4
233-
k8s.io/kubelet => k8s.io/kubelet v0.33.4
234-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.33.4
235-
k8s.io/metrics => k8s.io/metrics v0.33.4
236-
k8s.io/mount-utils => k8s.io/mount-utils v0.33.4
237-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.33.4
238-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.33.4
200+
k8s.io/api => k8s.io/api v0.34.1
201+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.34.1
202+
k8s.io/apimachinery => k8s.io/apimachinery v0.34.1
203+
k8s.io/apiserver => k8s.io/apiserver v0.34.1
204+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.34.1
205+
k8s.io/client-go => k8s.io/client-go v0.34.1
206+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.34.1
207+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.34.1
208+
k8s.io/code-generator => k8s.io/code-generator v0.34.1
209+
k8s.io/component-base => k8s.io/component-base v0.34.1
210+
k8s.io/component-helpers => k8s.io/component-helpers v0.34.1
211+
k8s.io/controller-manager => k8s.io/controller-manager v0.34.1
212+
k8s.io/cri-api => k8s.io/cri-api v0.34.1
213+
k8s.io/cri-client => k8s.io/cri-client v0.34.1
214+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.34.1
215+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.34.1
216+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.34.1
217+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.34.1
218+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.34.1
219+
k8s.io/kubectl => k8s.io/kubectl v0.34.1
220+
k8s.io/kubelet => k8s.io/kubelet v0.34.1
221+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.34.1
222+
k8s.io/metrics => k8s.io/metrics v0.34.1
223+
k8s.io/mount-utils => k8s.io/mount-utils v0.34.1
224+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.34.1
225+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.34.1
239226
sigs.k8s.io/node-feature-discovery/api/nfd => ./api/nfd
240227
)
241228

0 commit comments

Comments
 (0)