Skip to content

Commit 1a51ce1

Browse files
committed
update k8s to v1.32
Signed-off-by: dongjiang <[email protected]>
1 parent 7f94988 commit 1a51ce1

File tree

25 files changed

+792
-693
lines changed

25 files changed

+792
-693
lines changed

.github/workflows/golangci-lint.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
with:
1717
go-version-file: go.mod
1818
- name: golangci-lint
19-
uses: golangci/golangci-lint-action@v3
19+
uses: golangci/golangci-lint-action@v6.2.0
2020
with:
21-
version: v1.61.0
21+
version: v1.63.4
2222
args: --timeout=5m

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
strategy:
3939
fail-fast: false
4040
matrix:
41-
kubernetes-version: ["v1.29.8", "v1.30.4", "v1.31.1"]
41+
kubernetes-version: ["v1.29.13", "v1.30.9", "v1.31.5", "v1.32.1"]
4242
steps:
4343
- name: Clone the code
4444
uses: actions/checkout@v3

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ KUBEBUILDER_ASSETS_PATH := $(dir $(abspath $(firstword $(MAKEFILE_LIST))))bin/ku
3333
KIND_VERSION=v0.18.0
3434
HELM_VERSION=v3.11.2
3535
# This kubectl version supports -k for kustomization.
36-
KUBECTL_VERSION=v1.31.1
37-
ENVTEST_K8S_VERSION=1.31.0
36+
KUBECTL_VERSION=v1.32.1
37+
ENVTEST_K8S_VERSION=1.32.0
3838
PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))
3939
GOARCH=$(shell go env GOARCH)
4040
GOOS=$(shell go env GOOS)
@@ -138,7 +138,7 @@ bin:
138138
GOLANGCI_LINT = $(shell pwd)/bin/golangci-lint
139139
.PHONY: bin/golangci-lint
140140
bin/golangci-lint: bin
141-
@GOBIN=$(PROJECT_DIR)/bin go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.61.0
141+
@GOBIN=$(PROJECT_DIR)/bin go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.63.4
142142

143143
ENVTEST = $(shell pwd)/bin/setup-envtest
144144
.PHONY: envtest
@@ -161,7 +161,7 @@ helm: bin
161161
CONTROLLER_GEN = $(PROJECT_DIR)/bin/controller-gen
162162
.PHONY: controller-gen
163163
controller-gen: bin
164-
@GOBIN=$(PROJECT_DIR)/bin go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.16.4
164+
@GOBIN=$(PROJECT_DIR)/bin go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.17.1
165165

166166
KUSTOMIZE = $(PROJECT_DIR)/bin/kustomize
167167
.PHONY: kustomize

deploy/v2beta1/mpi-operator.yaml

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

go.mod

Lines changed: 35 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,32 @@
11
module github.com/kubeflow/mpi-operator
22

3-
go 1.23
3+
go 1.23.0
4+
5+
toolchain go1.23.3
46

57
require (
68
github.com/google/go-cmp v0.6.0
79
github.com/onsi/ginkgo v1.16.5
8-
github.com/onsi/gomega v1.33.1
10+
github.com/onsi/gomega v1.35.1
911
github.com/prometheus/client_golang v1.19.1
1012
golang.org/x/crypto v0.31.0
11-
k8s.io/api v0.31.1
12-
k8s.io/apimachinery v0.31.1
13-
k8s.io/apiserver v0.31.1
14-
k8s.io/client-go v0.31.1
15-
k8s.io/code-generator v0.31.1
13+
golang.org/x/time v0.7.0
14+
k8s.io/api v0.32.1
15+
k8s.io/apimachinery v0.32.1
16+
k8s.io/apiserver v0.32.1
17+
k8s.io/client-go v0.32.1
18+
k8s.io/code-generator v0.32.1
1619
k8s.io/klog v1.0.0
17-
k8s.io/kube-openapi v0.0.0-20240724180055-a0f77d9699d4
18-
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
19-
sigs.k8s.io/controller-runtime v0.19.0
20+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f
21+
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
22+
sigs.k8s.io/controller-runtime v0.20.0
2023
sigs.k8s.io/scheduler-plugins v0.29.8
21-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1
24+
sigs.k8s.io/structured-merge-diff/v4 v4.4.2
2225
volcano.sh/apis v1.10.0
2326
)
2427

2528
require (
29+
cel.dev/expr v0.18.0 // indirect
2630
github.com/NYTimes/gziphandler v1.1.1 // indirect
2731
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
2832
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
@@ -44,15 +48,14 @@ require (
4448
github.com/go-openapi/jsonreference v0.21.0 // indirect
4549
github.com/go-openapi/swag v0.23.0 // indirect
4650
github.com/gogo/protobuf v1.3.2 // indirect
47-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
4851
github.com/golang/protobuf v1.5.4 // indirect
49-
github.com/google/cel-go v0.20.1 // indirect
52+
github.com/google/btree v1.1.3 // indirect
53+
github.com/google/cel-go v0.22.0 // indirect
5054
github.com/google/gnostic-models v0.6.8 // indirect
5155
github.com/google/gofuzz v1.2.0 // indirect
5256
github.com/google/uuid v1.6.0 // indirect
5357
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
5458
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
55-
github.com/imdario/mergo v0.3.12 // indirect
5659
github.com/inconshreveable/mousetrap v1.1.0 // indirect
5760
github.com/josharian/intern v1.0.0 // indirect
5861
github.com/json-iterator/go v1.1.12 // indirect
@@ -67,11 +70,11 @@ require (
6770
github.com/prometheus/procfs v0.15.1 // indirect
6871
github.com/spf13/cobra v1.8.1 // indirect
6972
github.com/spf13/pflag v1.0.5 // indirect
70-
github.com/stoewer/go-strcase v1.2.0 // indirect
73+
github.com/stoewer/go-strcase v1.3.0 // indirect
7174
github.com/x448/float16 v0.8.4 // indirect
72-
go.etcd.io/etcd/api/v3 v3.5.14 // indirect
73-
go.etcd.io/etcd/client/pkg/v3 v3.5.14 // indirect
74-
go.etcd.io/etcd/client/v3 v3.5.14 // indirect
75+
go.etcd.io/etcd/api/v3 v3.5.16 // indirect
76+
go.etcd.io/etcd/client/pkg/v3 v3.5.16 // indirect
77+
go.etcd.io/etcd/client/v3 v3.5.16 // indirect
7578
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect
7679
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
7780
go.opentelemetry.io/otel v1.28.0 // indirect
@@ -82,32 +85,30 @@ require (
8285
go.opentelemetry.io/otel/trace v1.28.0 // indirect
8386
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
8487
go.uber.org/multierr v1.11.0 // indirect
85-
go.uber.org/zap v1.26.0 // indirect
86-
golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc // indirect
87-
golang.org/x/mod v0.20.0 // indirect
88-
golang.org/x/net v0.28.0 // indirect
89-
golang.org/x/oauth2 v0.21.0 // indirect
88+
go.uber.org/zap v1.27.0 // indirect
89+
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
90+
golang.org/x/mod v0.21.0 // indirect
91+
golang.org/x/net v0.30.0 // indirect
92+
golang.org/x/oauth2 v0.23.0 // indirect
9093
golang.org/x/sync v0.10.0 // indirect
9194
golang.org/x/sys v0.28.0 // indirect
9295
golang.org/x/term v0.27.0 // indirect
9396
golang.org/x/text v0.21.0 // indirect
94-
golang.org/x/time v0.3.0 // indirect
95-
golang.org/x/tools v0.24.0 // indirect
97+
golang.org/x/tools v0.26.0 // indirect
9698
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/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7 // indirect
100+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 // indirect
99101
google.golang.org/grpc v1.65.0 // indirect
100-
google.golang.org/protobuf v1.34.2 // indirect
102+
google.golang.org/protobuf v1.35.1 // indirect
101103
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
102104
gopkg.in/inf.v0 v0.9.1 // indirect
103105
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
104-
gopkg.in/yaml.v2 v2.4.0 // indirect
105106
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
107+
k8s.io/apiextensions-apiserver v0.32.0 // indirect
108+
k8s.io/component-base v0.32.1 // indirect
109+
k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 // indirect
109110
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
111+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect
112+
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
112113
sigs.k8s.io/yaml v1.4.0 // indirect
113114
)

0 commit comments

Comments
 (0)