Skip to content

Commit c637101

Browse files
tenzen-ytenzen-y
authored
Upgrade K8s version to v1.32.7 (#708)
* Upgrade K8s module version to v1.32 Signed-off-by: Yuki Iwai <yuki.iwai.tz@gmail.com> * Upgrade KIND version to v0.29.0 Signed-off-by: Yuki Iwai <yuki.iwai.tz@gmail.com> * Introduce scheduler-plugins RBAC workaround Signed-off-by: Yuki Iwai <yuki.iwai.tz@gmail.com> --------- Signed-off-by: Yuki Iwai <yuki.iwai.tz@gmail.com>
1 parent 2645e30 commit c637101

File tree

26 files changed

+938
-764
lines changed

26 files changed

+938
-764
lines changed

‎.github/workflows/main.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
strategy:
4040
fail-fast: false
4141
matrix:
42-
kubernetes-version: ["v1.29.8", "v1.30.4", "v1.31.1"]
42+
kubernetes-version: ["v1.30.4", "v1.31.1", "v1.32.5"]
4343
steps:
4444
- name: Clone the code
4545
uses: actions/checkout@v3

‎Makefile‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,18 @@ LD_FLAGS_V2=" \
3030
REGISTRY?=docker.io/mpioperator
3131
IMAGE_NAME?=${REGISTRY}/mpi-operator
3232
KUBEBUILDER_ASSETS_PATH := $(dir $(abspath $(firstword $(MAKEFILE_LIST))))bin/kubebuilder/bin
33-
KIND_VERSION=v0.18.0
3433
HELM_VERSION=v3.11.2
3534
# This kubectl version supports -k for kustomization.
36-
KUBECTL_VERSION=v1.31.1
37-
ENVTEST_K8S_VERSION=1.31.0
35+
KUBECTL_VERSION=v1.32.0
36+
ENVTEST_K8S_VERSION=1.32.0
3837
PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))
3938
GOARCH=$(shell go env GOARCH)
4039
GOOS=$(shell go env GOOS)
4140
# Use go.mod go version as a single source of truth of scheduler-plugins version.
4241
SCHEDULER_PLUGINS_VERSION?=$(shell go list -m -f "{{.Version}}" sigs.k8s.io/scheduler-plugins)
4342
VOLCANO_SCHEDULER_VERSION?=$(shell go list -m -f "{{.Version}}" volcano.sh/apis)
43+
GOTOOLS_VERSION?=$(shell go list -m -f "{{.Version}}" golang.org/x/tools)
44+
KIND_VERSION?=$(shell go list -m -f "{{.Version}}" sigs.k8s.io/kind)
4445

4546
CRD_OPTIONS ?= "crd:generateEmbeddedObjectMeta=true"
4647

@@ -83,9 +84,11 @@ dev_manifest:
8384
sed -e "s~%IMAGE_NAME%~${IMAGE_NAME}~g" -e "s~%IMAGE_TAG%~${RELEASE_VERSION}~g" manifests/overlays/dev/kustomization.yaml.template > manifests/overlays/dev/kustomization.yaml
8485

8586
.PHONY: generate
86-
generate:
87+
generate: goimports
8788
go generate ./pkg/... ./cmd/...
8889
hack/update-codegen.sh
90+
# Workaround for https://github.com/kubernetes/kubernetes/issues/129774
91+
$(GOIMPORTS) -w pkg/apis/kubeflow/v2beta1/zz_generated.defaults.go
8992
$(MAKE) manifest
9093
hack/python-sdk/gen-sdk.sh
9194

@@ -167,11 +170,16 @@ kind: bin
167170
helm: bin
168171
@GOBIN=$(PROJECT_DIR)/bin go install helm.sh/helm/v3/cmd/helm@${HELM_VERSION}
169172

173+
GOIMPORTS = $(PROJECT_DIR)/bin/goimports
174+
.PHONY: goimports
175+
goimports:
176+
@GOBIN=$(PROJECT_DIR)/bin go install golang.org/x/tools/cmd/goimports@$(GOTOOLS_VERSION)
177+
170178
# Download controller-gen locally if necessary
171179
CONTROLLER_GEN = $(PROJECT_DIR)/bin/controller-gen
172180
.PHONY: controller-gen
173181
controller-gen: bin
174-
@GOBIN=$(PROJECT_DIR)/bin go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.16.4
182+
@GOBIN=$(PROJECT_DIR)/bin go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.17.3
175183

176184
KUSTOMIZE = $(PROJECT_DIR)/bin/kustomize
177185
.PHONY: kustomize

‎deploy/v2beta1/mpi-operator.yaml‎

Lines changed: 258 additions & 156 deletions
Large diffs are not rendered by default.

‎go.mod‎

Lines changed: 52 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,30 @@ go 1.24
55
require (
66
github.com/google/go-cmp v0.6.0
77
github.com/onsi/ginkgo v1.16.5
8-
github.com/onsi/gomega v1.33.1
8+
github.com/onsi/gomega v1.36.1
99
github.com/prometheus/client_golang v1.19.1
10-
golang.org/x/crypto v0.36.0
11-
golang.org/x/time v0.3.0
12-
k8s.io/api v0.31.1
13-
k8s.io/apimachinery v0.31.1
14-
k8s.io/apiserver v0.31.1
15-
k8s.io/client-go v0.31.1
16-
k8s.io/code-generator v0.31.1
10+
golang.org/x/crypto v0.41.0
11+
golang.org/x/time v0.7.0
12+
golang.org/x/tools v0.36.0
13+
k8s.io/api v0.32.7
14+
k8s.io/apimachinery v0.32.7
15+
k8s.io/apiserver v0.32.7
16+
k8s.io/client-go v0.32.7
17+
k8s.io/code-generator v0.32.7
1718
k8s.io/klog v1.0.0
18-
k8s.io/kube-openapi v0.0.0-20240724180055-a0f77d9699d4
19-
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
20-
sigs.k8s.io/controller-runtime v0.19.0
21-
sigs.k8s.io/scheduler-plugins v0.29.8
22-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1
23-
volcano.sh/apis v1.10.0
19+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f
20+
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
21+
sigs.k8s.io/controller-runtime v0.20.4
22+
sigs.k8s.io/kind v0.29.0
23+
sigs.k8s.io/scheduler-plugins v0.32.7
24+
sigs.k8s.io/structured-merge-diff/v4 v4.4.2
25+
volcano.sh/apis v1.12.2
2426
)
2527

2628
require (
29+
al.essio.dev/pkg/shellescape v1.5.1 // indirect
30+
cel.dev/expr v0.18.0 // indirect
31+
github.com/BurntSushi/toml v1.4.0 // indirect
2732
github.com/NYTimes/gziphandler v1.1.1 // indirect
2833
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
2934
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
@@ -35,79 +40,78 @@ require (
3540
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
3641
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
3742
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
38-
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
43+
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
3944
github.com/felixge/httpsnoop v1.0.4 // indirect
40-
github.com/fsnotify/fsnotify v1.7.0 // indirect
45+
github.com/fsnotify/fsnotify v1.8.0 // indirect
4146
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
4247
github.com/go-logr/logr v1.4.2 // indirect
4348
github.com/go-logr/stdr v1.2.2 // indirect
4449
github.com/go-openapi/jsonpointer v0.21.0 // indirect
4550
github.com/go-openapi/jsonreference v0.21.0 // indirect
4651
github.com/go-openapi/swag v0.23.0 // indirect
4752
github.com/gogo/protobuf v1.3.2 // indirect
48-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
4953
github.com/golang/protobuf v1.5.4 // indirect
50-
github.com/google/cel-go v0.20.1 // indirect
54+
github.com/google/btree v1.1.3 // indirect
55+
github.com/google/cel-go v0.22.0 // indirect
5156
github.com/google/gnostic-models v0.6.8 // indirect
5257
github.com/google/gofuzz v1.2.0 // indirect
5358
github.com/google/uuid v1.6.0 // indirect
5459
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
5560
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
56-
github.com/imdario/mergo v0.3.12 // indirect
5761
github.com/inconshreveable/mousetrap v1.1.0 // indirect
5862
github.com/josharian/intern v1.0.0 // indirect
5963
github.com/json-iterator/go v1.1.12 // indirect
6064
github.com/mailru/easyjson v0.7.7 // indirect
65+
github.com/mattn/go-isatty v0.0.20 // indirect
6166
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
6267
github.com/modern-go/reflect2 v1.0.2 // indirect
6368
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
6469
github.com/nxadm/tail v1.4.8 // indirect
70+
github.com/pelletier/go-toml v1.9.5 // indirect
6571
github.com/pkg/errors v0.9.1 // indirect
6672
github.com/prometheus/client_model v0.6.1 // indirect
6773
github.com/prometheus/common v0.55.0 // indirect
6874
github.com/prometheus/procfs v0.15.1 // indirect
6975
github.com/spf13/cobra v1.8.1 // indirect
70-
github.com/spf13/pflag v1.0.5 // indirect
71-
github.com/stoewer/go-strcase v1.2.0 // indirect
76+
github.com/spf13/pflag v1.0.6 // indirect
77+
github.com/stoewer/go-strcase v1.3.0 // indirect
7278
github.com/x448/float16 v0.8.4 // indirect
73-
go.etcd.io/etcd/api/v3 v3.5.14 // indirect
74-
go.etcd.io/etcd/client/pkg/v3 v3.5.14 // indirect
75-
go.etcd.io/etcd/client/v3 v3.5.14 // indirect
79+
go.etcd.io/etcd/api/v3 v3.5.16 // indirect
80+
go.etcd.io/etcd/client/pkg/v3 v3.5.16 // indirect
81+
go.etcd.io/etcd/client/v3 v3.5.16 // indirect
7682
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect
77-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
78-
go.opentelemetry.io/otel v1.28.0 // indirect
83+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
84+
go.opentelemetry.io/otel v1.31.0 // indirect
7985
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
8086
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect
81-
go.opentelemetry.io/otel/metric v1.28.0 // indirect
82-
go.opentelemetry.io/otel/sdk v1.28.0 // indirect
83-
go.opentelemetry.io/otel/trace v1.28.0 // indirect
87+
go.opentelemetry.io/otel/metric v1.31.0 // indirect
88+
go.opentelemetry.io/otel/sdk v1.31.0 // indirect
89+
go.opentelemetry.io/otel/trace v1.31.0 // indirect
8490
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
8591
go.uber.org/multierr v1.11.0 // indirect
86-
go.uber.org/zap v1.26.0 // indirect
87-
golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc // indirect
88-
golang.org/x/mod v0.20.0 // indirect
89-
golang.org/x/net v0.38.0 // indirect
92+
go.uber.org/zap v1.27.0 // indirect
93+
golang.org/x/exp v0.0.0-20250103183323-7d7fa50e5329 // indirect
94+
golang.org/x/mod v0.27.0 // indirect
95+
golang.org/x/net v0.43.0 // indirect
9096
golang.org/x/oauth2 v0.27.0 // indirect
91-
golang.org/x/sync v0.12.0 // indirect
92-
golang.org/x/sys v0.31.0 // indirect
93-
golang.org/x/term v0.30.0 // indirect
94-
golang.org/x/text v0.23.0 // indirect
95-
golang.org/x/tools v0.24.0 // indirect
97+
golang.org/x/sync v0.16.0 // indirect
98+
golang.org/x/sys v0.35.0 // indirect
99+
golang.org/x/term v0.34.0 // indirect
100+
golang.org/x/text v0.28.0 // indirect
96101
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
97-
google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect
98-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
99-
google.golang.org/grpc v1.65.0 // indirect
100-
google.golang.org/protobuf v1.34.2 // indirect
102+
google.golang.org/genproto/googleapis/api v0.0.0-20241015192408-796eee8c2d53 // indirect
103+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250102185135-69823020774d // indirect
104+
google.golang.org/grpc v1.69.4 // indirect
105+
google.golang.org/protobuf v1.36.2 // indirect
101106
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
102107
gopkg.in/inf.v0 v0.9.1 // indirect
103108
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
104-
gopkg.in/yaml.v2 v2.4.0 // indirect
105109
gopkg.in/yaml.v3 v3.0.1 // indirect
106-
k8s.io/apiextensions-apiserver v0.31.0 // indirect
107-
k8s.io/component-base v0.31.1 // indirect
108-
k8s.io/gengo/v2 v2.0.0-20240826214909-a7b603a56eb7 // indirect
110+
k8s.io/apiextensions-apiserver v0.32.1 // indirect
111+
k8s.io/component-base v0.32.7 // indirect
112+
k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 // indirect
109113
k8s.io/klog/v2 v2.130.1 // indirect
110-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
111-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
114+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect
115+
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
112116
sigs.k8s.io/yaml v1.4.0 // indirect
113117
)

0 commit comments

Comments
 (0)