Skip to content

Commit de19bd1

Browse files
tenzen-ytenzen-y
authored
Upgrade Kubernetes dependencies to v1.34 (#742)
Signed-off-by: Yuki Iwai <[email protected]>
1 parent 86733ad commit de19bd1

File tree

11 files changed

+1020
-249
lines changed

11 files changed

+1020
-249
lines changed

‎.github/workflows/main.yml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ jobs:
3838
- name: generate codes
3939
run: make verify-generate
4040
- name: Run tests
41+
env:
42+
# TODO: Once the volcano v1.14.0 is released, we should remove the following fixed volcano version.
43+
VOLCANO_SCHEDULER_VERSION: v1.13.0
4144
run: make test
4245
e2e:
4346
name: E2E
@@ -46,7 +49,7 @@ jobs:
4649
strategy:
4750
fail-fast: false
4851
matrix:
49-
kubernetes-version: ["v1.31.1", "v1.32.5", "v1.33.4"]
52+
kubernetes-version: ["v1.31.12", "v1.32.8", "v1.33.4", "v1.34.0"]
5053
steps:
5154
- name: Clone the code
5255
uses: actions/checkout@v5
@@ -62,4 +65,6 @@ jobs:
6265
PLATFORMS: linux/amd64
6366
INTEL_PLATFORMS: linux/amd64
6467
MPICH_PLATFORMS: linux/amd64
68+
# TODO: Once the volcano v1.14.0 is released, we should remove the following fixed volcano version.
69+
VOLCANO_SCHEDULER_VERSION: v1.13.0
6570
run: make test_e2e

‎Makefile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ IMAGE_NAME?=${REGISTRY}/mpi-operator
3232
KUBEBUILDER_ASSETS_PATH := $(dir $(abspath $(firstword $(MAKEFILE_LIST))))bin/kubebuilder/bin
3333
HELM_VERSION=v3.11.2
3434
# This kubectl version supports -k for kustomization.
35-
KUBECTL_VERSION=v1.33.0
36-
ENVTEST_K8S_VERSION=1.33.0
35+
KUBECTL_VERSION=v1.34.0
36+
ENVTEST_K8S_VERSION=1.34.0
3737
PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))
3838
GOARCH=$(shell go env GOARCH)
3939
GOOS=$(shell go env GOOS)
@@ -180,12 +180,12 @@ goimports:
180180
CONTROLLER_GEN = $(PROJECT_DIR)/bin/controller-gen
181181
.PHONY: controller-gen
182182
controller-gen: bin
183-
@GOBIN=$(PROJECT_DIR)/bin go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.18.0
183+
@GOBIN=$(PROJECT_DIR)/bin go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.19.0
184184

185185
KUSTOMIZE = $(PROJECT_DIR)/bin/kustomize
186186
.PHONY: kustomize
187187
kustomize:
188-
@GOBIN=$(PROJECT_DIR)/bin go install sigs.k8s.io/kustomize/kustomize/[email protected]
188+
@GOBIN=$(PROJECT_DIR)/bin go install sigs.k8s.io/kustomize/kustomize/[email protected]
189189

190190
# The build via `go install` will fail with the following err:
191191
# > The go.mod file for the module providing named packages contains one or

‎deploy/v2beta1/mpi-operator.yaml‎

Lines changed: 430 additions & 49 deletions
Large diffs are not rendered by default.

‎go.mod‎

Lines changed: 35 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -11,25 +11,25 @@ require (
1111
golang.org/x/crypto v0.43.0
1212
golang.org/x/time v0.14.0
1313
golang.org/x/tools v0.38.0
14-
k8s.io/api v0.33.4
15-
k8s.io/apimachinery v0.33.4
16-
k8s.io/apiserver v0.33.4
17-
k8s.io/client-go v0.33.4
18-
k8s.io/code-generator v0.33.4
14+
k8s.io/api v0.34.1
15+
k8s.io/apimachinery v0.34.1
16+
k8s.io/apiserver v0.34.1
17+
k8s.io/client-go v0.34.1
18+
k8s.io/code-generator v0.34.1
1919
k8s.io/klog/v2 v2.130.1
20-
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff
21-
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
22-
sigs.k8s.io/controller-runtime v0.21.0
23-
sigs.k8s.io/kind v0.29.0
24-
sigs.k8s.io/scheduler-plugins v0.32.7
25-
sigs.k8s.io/structured-merge-diff/v4 v4.7.0
26-
volcano.sh/apis v1.12.2
20+
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912
21+
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4
22+
sigs.k8s.io/controller-runtime v0.22.3
23+
sigs.k8s.io/kind v0.30.0
24+
sigs.k8s.io/scheduler-plugins v0.33.5
25+
sigs.k8s.io/structured-merge-diff/v6 v6.3.0
26+
volcano.sh/apis v1.13.1-0.20251028070205-46d20c0699e7 // TODO: Once the stable volcano APIs compatible with K8s v1.34, we should replace this with the tagged version.
2727
)
2828

2929
require (
3030
4d63.com/gocheckcompilerdirectives v1.3.0 // indirect
3131
4d63.com/gochecknoglobals v0.2.2 // indirect
32-
al.essio.dev/pkg/shellescape v1.5.1 // indirect
32+
al.essio.dev/pkg/shellescape v1.6.0 // indirect
3333
cel.dev/expr v0.24.0 // indirect
3434
codeberg.org/chavacava/garif v0.2.0 // indirect
3535
dev.gaijin.team/go/exhaustruct/v4 v4.0.0 // indirect
@@ -87,23 +87,23 @@ require (
8787
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
8888
github.com/denis-tingaikin/go-header v0.5.0 // indirect
8989
github.com/dlclark/regexp2 v1.11.5 // indirect
90-
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
90+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
9191
github.com/ettle/strcase v0.2.0 // indirect
9292
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
9393
github.com/fatih/color v1.18.0 // indirect
9494
github.com/fatih/structtag v1.2.0 // indirect
9595
github.com/felixge/httpsnoop v1.0.4 // indirect
9696
github.com/firefart/nonamedreturns v1.0.6 // indirect
97-
github.com/fsnotify/fsnotify v1.8.0 // indirect
98-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
97+
github.com/fsnotify/fsnotify v1.9.0 // indirect
98+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
9999
github.com/fzipp/gocyclo v0.6.0 // indirect
100100
github.com/ghostiam/protogetter v0.3.16 // indirect
101101
github.com/go-critic/go-critic v0.13.0 // indirect
102102
github.com/go-logr/logr v1.4.3 // indirect
103103
github.com/go-logr/stdr v1.2.2 // indirect
104-
github.com/go-openapi/jsonpointer v0.21.0 // indirect
104+
github.com/go-openapi/jsonpointer v0.21.1 // indirect
105105
github.com/go-openapi/jsonreference v0.21.0 // indirect
106-
github.com/go-openapi/swag v0.23.0 // indirect
106+
github.com/go-openapi/swag v0.23.1 // indirect
107107
github.com/go-toolsmith/astcast v1.1.0 // indirect
108108
github.com/go-toolsmith/astcopy v1.1.0 // indirect
109109
github.com/go-toolsmith/astequal v1.2.0 // indirect
@@ -130,15 +130,15 @@ require (
130130
github.com/golangci/swaggoswag v0.0.0-20250504205917-77f2aca3143e // indirect
131131
github.com/golangci/unconvert v0.0.0-20250410112200-a129a6e6413e // indirect
132132
github.com/google/btree v1.1.3 // indirect
133-
github.com/google/cel-go v0.23.2 // indirect
134-
github.com/google/gnostic-models v0.6.9 // indirect
133+
github.com/google/cel-go v0.26.0 // indirect
134+
github.com/google/gnostic-models v0.7.0 // indirect
135135
github.com/google/uuid v1.6.0 // indirect
136136
github.com/gordonklaus/ineffassign v0.2.0 // indirect
137137
github.com/gostaticanalysis/analysisutil v0.7.1 // indirect
138138
github.com/gostaticanalysis/comment v1.5.0 // indirect
139139
github.com/gostaticanalysis/forcetypeassert v0.2.0 // indirect
140140
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
141-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.24.0 // indirect
141+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
142142
github.com/hashicorp/go-immutable-radix/v2 v2.1.0 // indirect
143143
github.com/hashicorp/go-version v1.7.0 // indirect
144144
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
@@ -167,7 +167,7 @@ require (
167167
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
168168
github.com/macabu/inamedparam v0.2.0 // indirect
169169
github.com/magiconair/properties v1.8.6 // indirect
170-
github.com/mailru/easyjson v0.7.7 // indirect
170+
github.com/mailru/easyjson v0.9.0 // indirect
171171
github.com/manuelarte/embeddedstructfieldcheck v0.4.0 // indirect
172172
github.com/manuelarte/funcorder v0.5.0 // indirect
173173
github.com/maratori/testableexamples v1.0.0 // indirect
@@ -180,7 +180,7 @@ require (
180180
github.com/mitchellh/go-homedir v1.1.0 // indirect
181181
github.com/mitchellh/mapstructure v1.5.0 // indirect
182182
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
183-
github.com/modern-go/reflect2 v1.0.2 // indirect
183+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
184184
github.com/moricho/tparallel v0.3.2 // indirect
185185
github.com/muesli/termenv v0.16.0 // indirect
186186
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
@@ -248,23 +248,23 @@ require (
248248
go-simpler.org/sloglint v0.11.1 // indirect
249249
go.augendre.info/arangolint v0.2.0 // indirect
250250
go.augendre.info/fatcontext v0.8.1 // indirect
251-
go.etcd.io/etcd/api/v3 v3.5.21 // indirect
252-
go.etcd.io/etcd/client/pkg/v3 v3.5.21 // indirect
253-
go.etcd.io/etcd/client/v3 v3.5.21 // indirect
251+
go.etcd.io/etcd/api/v3 v3.6.4 // indirect
252+
go.etcd.io/etcd/client/pkg/v3 v3.6.4 // indirect
253+
go.etcd.io/etcd/client/v3 v3.6.4 // indirect
254254
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
255255
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0 // indirect
256256
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
257257
go.opentelemetry.io/otel v1.36.0 // indirect
258-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 // indirect
259-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0 // indirect
258+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 // indirect
259+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0 // indirect
260260
go.opentelemetry.io/otel/metric v1.36.0 // indirect
261261
go.opentelemetry.io/otel/sdk v1.36.0 // indirect
262262
go.opentelemetry.io/otel/trace v1.36.0 // indirect
263-
go.opentelemetry.io/proto/otlp v1.4.0 // indirect
263+
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
264264
go.uber.org/automaxprocs v1.6.0 // indirect
265265
go.uber.org/multierr v1.11.0 // indirect
266266
go.uber.org/zap v1.27.0 // indirect
267-
go.yaml.in/yaml/v2 v2.4.2 // indirect
267+
go.yaml.in/yaml/v2 v2.4.3 // indirect
268268
go.yaml.in/yaml/v3 v3.0.4 // indirect
269269
golang.org/x/exp v0.0.0-20250103183323-7d7fa50e5329 // indirect
270270
golang.org/x/exp/typeparams v0.0.0-20250911091902-df9299821621 // indirect
@@ -288,21 +288,13 @@ require (
288288
gopkg.in/yaml.v2 v2.4.0 // indirect
289289
gopkg.in/yaml.v3 v3.0.1 // indirect
290290
honnef.co/go/tools v0.6.1 // indirect
291-
k8s.io/apiextensions-apiserver v0.33.0 // indirect
292-
k8s.io/component-base v0.33.4 // indirect
293-
k8s.io/gengo/v2 v2.0.0-20250207200755-1244d31929d7 // indirect
291+
k8s.io/apiextensions-apiserver v0.34.1 // indirect
292+
k8s.io/component-base v0.34.1 // indirect
293+
k8s.io/gengo/v2 v2.0.0-20250604051438-85fd79dbfd9f // indirect
294294
mvdan.cc/gofumpt v0.9.1 // indirect
295295
mvdan.cc/unparam v0.0.0-20250301125049-0df0534333a4 // indirect
296296
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
297-
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
297+
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
298298
sigs.k8s.io/randfill v1.0.0 // indirect
299-
sigs.k8s.io/yaml v1.4.0 // indirect
300-
)
301-
302-
// Due to k8s.io/apiserver depends on v0.58.0.
303-
// REF: https://github.com/kubernetes/apiserver/blob/026035b70b3f2447ed58a9d29a2bb750cee4bd23/go.mod#L32-L33
304-
// Once we upgrade k8s.io/apiserver to v0.34, we can remove the following replacement.
305-
replace (
306-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc => go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.58.0
307-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp => go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0
299+
sigs.k8s.io/yaml v1.6.0 // indirect
308300
)

0 commit comments

Comments
 (0)