Skip to content

Commit 0692a73

Browse files
jaurukayrus
andauthored
[all] update deps to 1.35 (#3044)
* bump dockerfile images * bump k8s deps * latest cgroups go depencency is not compatible with kubernetes 1.35 * deps: fix incorrectly bumped deps --------- Co-authored-by: pýrus <kayrus@users.noreply.github.com>
1 parent 20e8042 commit 0692a73

File tree

3 files changed

+160
-75
lines changed

3 files changed

+160
-75
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ ARG DISTROLESS_IMAGE=registry.k8s.io/build-image/go-runner:v2.4.0-go1.25.5-bookw
2626

2727
# We use Alpine as the source for default CA certificates and some output
2828
# images
29-
ARG ALPINE_IMAGE=alpine:3.22.1
29+
ARG ALPINE_IMAGE=alpine:3.23.2
3030

3131
# cinder-csi-plugin uses Debian as a base image
3232
ARG DEBIAN_IMAGE=registry.k8s.io/build-image/debian-base:bookworm-v1.0.6

go.mod

Lines changed: 53 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ require (
1212
github.com/kubernetes-csi/csi-test/v5 v5.0.0
1313
github.com/mitchellh/go-homedir v1.1.0
1414
github.com/mitchellh/mapstructure v1.5.0
15-
github.com/onsi/ginkgo/v2 v2.26.0
15+
github.com/onsi/ginkgo/v2 v2.27.2
1616
github.com/onsi/gomega v1.38.2
1717
github.com/sirupsen/logrus v1.9.3
1818
github.com/spf13/cobra v1.10.1
@@ -28,52 +28,64 @@ require (
2828
gopkg.in/gcfg.v1 v1.2.3
2929
gopkg.in/godo.v2 v2.0.9
3030
gopkg.in/yaml.v2 v2.4.0
31-
k8s.io/api v0.34.2
32-
k8s.io/apimachinery v0.34.2
33-
k8s.io/apiserver v0.34.2
34-
k8s.io/client-go v0.34.2
35-
k8s.io/cloud-provider v0.34.2
36-
k8s.io/component-base v0.34.2
31+
k8s.io/api v0.35.0
32+
k8s.io/apimachinery v0.35.0
33+
k8s.io/apiserver v0.35.0
34+
k8s.io/client-go v0.35.0
35+
k8s.io/cloud-provider v0.35.0
36+
k8s.io/component-base v0.35.0
3737
k8s.io/klog/v2 v2.130.1
38-
k8s.io/kms v0.34.2
39-
k8s.io/kubernetes v1.34.2
40-
k8s.io/mount-utils v0.34.2
38+
k8s.io/kms v0.35.0
39+
k8s.io/kubernetes v1.35.0
40+
k8s.io/mount-utils v0.35.0
4141
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4
4242
software.sslmate.com/src/go-pkcs12 v0.6.0
4343
)
4444

4545
// the below fixes the "go list -m all" execution
4646
replace (
47-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.34.2
48-
k8s.io/cri-client => k8s.io/cri-client v0.34.2
49-
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.34.2
50-
k8s.io/endpointslice => k8s.io/endpointslice v0.34.2
51-
k8s.io/externaljwt => k8s.io/externaljwt v0.34.2
52-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.34.2
53-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.34.2
54-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.34.2
55-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.34.2
56-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.34.2
47+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.35.0
48+
k8s.io/cri-client => k8s.io/cri-client v0.35.0
49+
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.35.0
50+
k8s.io/endpointslice => k8s.io/endpointslice v0.35.0
51+
k8s.io/externaljwt => k8s.io/externaljwt v0.35.0
52+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.35.0
53+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.35.0
54+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.35.0
55+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.35.0
56+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.35.0
5757
)
5858

5959
require (
6060
cel.dev/expr v0.24.0 // indirect
6161
cyphar.com/go-pathrs v0.2.1 // indirect
6262
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
63+
github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab // indirect
6364
github.com/Masterminds/semver/v3 v3.4.0 // indirect
6465
github.com/MichaelTJones/walk v0.0.0-20161122175330-4748e29d5718 // indirect
66+
github.com/Microsoft/go-winio v0.6.2 // indirect
67+
github.com/Microsoft/hnslib v0.1.1 // indirect
6568
github.com/NYTimes/gziphandler v1.1.1 // indirect
6669
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
70+
github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2 // indirect
6771
github.com/beorn7/perks v1.0.1 // indirect
6872
github.com/blang/semver/v4 v4.0.0 // indirect
6973
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
7074
github.com/cespare/xxhash/v2 v2.3.0 // indirect
75+
github.com/containerd/containerd/api v1.9.0 // indirect
76+
github.com/containerd/errdefs v1.0.0 // indirect
77+
github.com/containerd/errdefs/pkg v0.3.0 // indirect
78+
github.com/containerd/log v0.1.0 // indirect
79+
github.com/containerd/ttrpc v1.2.7 // indirect
80+
github.com/containerd/typeurl/v2 v2.2.3 // indirect
7181
github.com/coreos/go-semver v0.3.1 // indirect
7282
github.com/coreos/go-systemd/v22 v22.6.0 // indirect
7383
github.com/cyphar/filepath-securejoin v0.6.0 // indirect
7484
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
7585
github.com/distribution/reference v0.6.0 // indirect
86+
github.com/docker/go-units v0.5.0 // indirect
7687
github.com/emicklei/go-restful/v3 v3.13.0 // indirect
88+
github.com/euank/go-kmsg-parser v2.0.0+incompatible // indirect
7789
github.com/felixge/httpsnoop v1.0.4 // indirect
7890
github.com/fsnotify/fsnotify v1.9.0 // indirect
7991
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
@@ -95,10 +107,12 @@ require (
95107
github.com/go-openapi/swag/yamlutils v0.25.1 // indirect
96108
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
97109
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
110+
github.com/godbus/dbus/v5 v5.1.0 // indirect
98111
github.com/gofrs/uuid/v5 v5.3.2 // indirect
99112
github.com/gogo/protobuf v1.3.2 // indirect
100113
github.com/golang/protobuf v1.5.4 // indirect
101114
github.com/google/btree v1.1.3 // indirect
115+
github.com/google/cadvisor v0.53.0 // indirect
102116
github.com/google/cel-go v0.26.1 // indirect
103117
github.com/google/gnostic-models v0.7.0 // indirect
104118
github.com/google/go-cmp v0.7.0 // indirect
@@ -108,23 +122,30 @@ require (
108122
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.3 // indirect
109123
github.com/inconshreveable/mousetrap v1.1.0 // indirect
110124
github.com/json-iterator/go v1.1.12 // indirect
125+
github.com/karrick/godirwalk v1.17.0 // indirect
111126
github.com/kylelemons/godebug v1.1.0 // indirect
112127
github.com/mgutz/str v1.2.0 // indirect
128+
github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible // indirect
113129
github.com/moby/spdystream v0.5.0 // indirect
114130
github.com/moby/sys/mountinfo v0.7.2 // indirect
131+
github.com/moby/sys/userns v0.1.0 // indirect
115132
github.com/moby/term v0.5.2 // indirect
116133
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
117134
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
118135
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
119136
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
137+
github.com/opencontainers/cgroups v0.0.3 // indirect
120138
github.com/opencontainers/go-digest v1.0.0 // indirect
139+
github.com/opencontainers/image-spec v1.1.1 // indirect
140+
github.com/opencontainers/runtime-spec v1.2.1 // indirect
121141
github.com/opencontainers/selinux v1.13.0 // indirect
122142
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
123143
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
124144
github.com/prometheus/client_golang v1.23.2 // indirect
125145
github.com/prometheus/client_model v0.6.2 // indirect
126146
github.com/prometheus/common v0.67.1 // indirect
127147
github.com/prometheus/procfs v0.17.0 // indirect
148+
github.com/robfig/cron/v3 v3.0.1 // indirect
128149
github.com/sagikazarmark/locafero v0.12.0 // indirect
129150
github.com/spf13/afero v1.15.0 // indirect
130151
github.com/spf13/cast v1.10.0 // indirect
@@ -136,6 +157,7 @@ require (
136157
go.etcd.io/etcd/client/pkg/v3 v3.6.5 // indirect
137158
go.etcd.io/etcd/client/v3 v3.6.5 // indirect
138159
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
160+
go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/otelrestful v0.44.0 // indirect
139161
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0 // indirect
140162
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect
141163
go.opentelemetry.io/otel v1.38.0 // indirect
@@ -145,7 +167,6 @@ require (
145167
go.opentelemetry.io/otel/sdk v1.38.0 // indirect
146168
go.opentelemetry.io/otel/trace v1.38.0 // indirect
147169
go.opentelemetry.io/proto/otlp v1.8.0 // indirect
148-
go.uber.org/automaxprocs v1.6.0 // indirect
149170
go.uber.org/multierr v1.11.0 // indirect
150171
go.uber.org/zap v1.27.0 // indirect
151172
go.yaml.in/yaml/v2 v2.4.3 // indirect
@@ -165,14 +186,18 @@ require (
165186
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
166187
gopkg.in/warnings.v0 v0.1.2 // indirect
167188
gopkg.in/yaml.v3 v3.0.1 // indirect
168-
k8s.io/apiextensions-apiserver v0.34.2 // indirect
169-
k8s.io/component-helpers v0.34.2 // indirect
170-
k8s.io/controller-manager v0.34.2 // indirect
171-
k8s.io/csi-translation-lib v0.34.2 // indirect
189+
k8s.io/apiextensions-apiserver v0.35.0 // indirect
190+
k8s.io/component-helpers v0.35.0 // indirect
191+
k8s.io/controller-manager v0.35.0 // indirect
192+
k8s.io/cri-api v0.35.0 // indirect
193+
k8s.io/cri-client v0.0.0 // indirect
194+
k8s.io/csi-translation-lib v0.35.0 // indirect
195+
k8s.io/dynamic-resource-allocation v0.35.0 // indirect
172196
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect
173-
k8s.io/kubectl v0.34.2 // indirect
174-
k8s.io/kubelet v0.34.2 // indirect
175-
k8s.io/pod-security-admission v0.34.2 // indirect
197+
k8s.io/kube-scheduler v0.0.0 // indirect
198+
k8s.io/kubectl v0.35.0 // indirect
199+
k8s.io/kubelet v0.35.0 // indirect
200+
k8s.io/pod-security-admission v0.35.0 // indirect
176201
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.33.0 // indirect
177202
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
178203
sigs.k8s.io/randfill v1.0.0 // indirect

0 commit comments

Comments
 (0)