Skip to content

Commit 3c7fad6

Browse files
authored
Upgrade K8s dependencies to v0.27.4 (#584)
Signed-off-by: Yuki Iwai <[email protected]>
1 parent 11b3805 commit 3c7fad6

File tree

27 files changed

+2199
-479
lines changed

27 files changed

+2199
-479
lines changed

Makefile

Lines changed: 2 additions & 2 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.25.8
37-
ENVTEST_K8S_VERSION=1.25.0
36+
KUBECTL_VERSION=v1.27.4
37+
ENVTEST_K8S_VERSION=1.27.1
3838
PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))
3939
GOARCH=$(shell go env GOARCH)
4040
GOOS=$(shell go env GOOS)

cmd/mpi-operator/app/server.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ func Run(opt *options.ServerOption) error {
141141
kubeInformerFactory := kubeinformers.NewSharedInformerFactoryWithOptions(kubeClient, 0, kubeInformerFactoryOpts...)
142142
kubeflowInformerFactory := informers.NewSharedInformerFactoryWithOptions(mpiJobClientSet, 0, kubeflowInformerFactoryOpts...)
143143

144-
controller := controllersv1.NewMPIJobController(
144+
controller, err := controllersv1.NewMPIJobController(
145145
kubeClient,
146146
mpiJobClientSet,
147147
volcanoClientSet,
@@ -154,6 +154,9 @@ func Run(opt *options.ServerOption) error {
154154
kubeInformerFactory.Scheduling().V1().PriorityClasses(),
155155
kubeflowInformerFactory.Kubeflow().V2beta1().MPIJobs(),
156156
namespace, opt.GangSchedulingName)
157+
if err != nil {
158+
klog.Fatalf("Failed to setup the controller")
159+
}
157160

158161
go kubeInformerFactory.Start(ctx.Done())
159162
go kubeflowInformerFactory.Start(ctx.Done())

deploy/v2beta1/mpi-operator.yaml

Lines changed: 413 additions & 74 deletions
Large diffs are not rendered by default.

go.mod

Lines changed: 63 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -5,104 +5,110 @@ go 1.20
55
require (
66
github.com/google/go-cmp v0.5.9
77
github.com/onsi/ginkgo v1.16.5
8-
github.com/onsi/gomega v1.20.1
9-
github.com/prometheus/client_golang v1.12.2
10-
golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd
11-
k8s.io/api v0.25.7
12-
k8s.io/apimachinery v0.25.7
13-
k8s.io/apiserver v0.25.7
14-
k8s.io/client-go v0.25.7
15-
k8s.io/code-generator v0.25.7
8+
github.com/onsi/gomega v1.27.7
9+
github.com/prometheus/client_golang v1.15.1
10+
golang.org/x/crypto v0.1.0
11+
k8s.io/api v0.27.4
12+
k8s.io/apimachinery v0.27.4
13+
k8s.io/apiserver v0.27.4
14+
k8s.io/client-go v0.27.4
15+
k8s.io/code-generator v0.27.4
1616
k8s.io/klog v1.0.0
17-
k8s.io/kube-openapi v0.0.0-20230109183929-3758b55a6596
18-
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed
19-
sigs.k8s.io/controller-runtime v0.13.1
17+
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f
18+
k8s.io/utils v0.0.0-20230209194617-a36077c30491
19+
sigs.k8s.io/controller-runtime v0.15.1
2020
sigs.k8s.io/scheduler-plugins v0.25.7
21+
sigs.k8s.io/structured-merge-diff/v4 v4.2.3
2122
volcano.sh/apis v1.7.0
2223
)
2324

2425
require (
2526
github.com/NYTimes/gziphandler v1.1.1 // indirect
27+
github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 // indirect
28+
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
2629
github.com/beorn7/perks v1.0.1 // indirect
2730
github.com/blang/semver/v4 v4.0.0 // indirect
31+
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
2832
github.com/cespare/xxhash/v2 v2.2.0 // indirect
2933
github.com/coreos/go-semver v0.3.0 // indirect
30-
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
34+
github.com/coreos/go-systemd/v22 v22.4.0 // indirect
3135
github.com/davecgh/go-spew v1.1.1 // indirect
32-
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
36+
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
3337
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
3438
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
35-
github.com/felixge/httpsnoop v1.0.1 // indirect
36-
github.com/fsnotify/fsnotify v1.5.4 // indirect
37-
github.com/go-logr/logr v1.2.3 // indirect
39+
github.com/felixge/httpsnoop v1.0.3 // indirect
40+
github.com/fsnotify/fsnotify v1.6.0 // indirect
41+
github.com/go-logr/logr v1.2.4 // indirect
42+
github.com/go-logr/stdr v1.2.2 // indirect
3843
github.com/go-openapi/jsonpointer v0.19.6 // indirect
3944
github.com/go-openapi/jsonreference v0.20.1 // indirect
4045
github.com/go-openapi/swag v0.22.3 // indirect
4146
github.com/gogo/protobuf v1.3.2 // indirect
4247
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
43-
github.com/golang/protobuf v1.5.2 // indirect
48+
github.com/golang/protobuf v1.5.3 // indirect
49+
github.com/google/cel-go v0.12.6 // indirect
4450
github.com/google/gnostic v0.5.7-v3refs // indirect
4551
github.com/google/gofuzz v1.1.0 // indirect
4652
github.com/google/uuid v1.3.0 // indirect
4753
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
48-
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
54+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
4955
github.com/imdario/mergo v0.3.12 // indirect
50-
github.com/inconshreveable/mousetrap v1.0.0 // indirect
56+
github.com/inconshreveable/mousetrap v1.0.1 // indirect
5157
github.com/josharian/intern v1.0.0 // indirect
5258
github.com/json-iterator/go v1.1.12 // indirect
5359
github.com/mailru/easyjson v0.7.7 // indirect
54-
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
60+
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
61+
github.com/mitchellh/mapstructure v1.4.1 // indirect
5562
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
5663
github.com/modern-go/reflect2 v1.0.2 // indirect
5764
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
5865
github.com/nxadm/tail v1.4.8 // indirect
5966
github.com/pkg/errors v0.9.1 // indirect
60-
github.com/prometheus/client_model v0.2.0 // indirect
61-
github.com/prometheus/common v0.32.1 // indirect
62-
github.com/prometheus/procfs v0.7.3 // indirect
63-
github.com/spf13/cobra v1.4.0 // indirect
67+
github.com/prometheus/client_model v0.4.0 // indirect
68+
github.com/prometheus/common v0.42.0 // indirect
69+
github.com/prometheus/procfs v0.9.0 // indirect
70+
github.com/spf13/cobra v1.6.0 // indirect
6471
github.com/spf13/pflag v1.0.5 // indirect
65-
go.etcd.io/etcd/api/v3 v3.5.4 // indirect
66-
go.etcd.io/etcd/client/pkg/v3 v3.5.4 // indirect
67-
go.etcd.io/etcd/client/v3 v3.5.4 // indirect
68-
go.opentelemetry.io/contrib v0.20.0 // indirect
69-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0 // indirect
70-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0 // indirect
71-
go.opentelemetry.io/otel v0.20.0 // indirect
72-
go.opentelemetry.io/otel/exporters/otlp v0.20.0 // indirect
73-
go.opentelemetry.io/otel/metric v0.20.0 // indirect
74-
go.opentelemetry.io/otel/sdk v0.20.0 // indirect
75-
go.opentelemetry.io/otel/sdk/export/metric v0.20.0 // indirect
76-
go.opentelemetry.io/otel/sdk/metric v0.20.0 // indirect
77-
go.opentelemetry.io/otel/trace v0.20.0 // indirect
78-
go.opentelemetry.io/proto/otlp v0.7.0 // indirect
72+
github.com/stoewer/go-strcase v1.2.0 // indirect
73+
go.etcd.io/etcd/api/v3 v3.5.7 // indirect
74+
go.etcd.io/etcd/client/pkg/v3 v3.5.7 // indirect
75+
go.etcd.io/etcd/client/v3 v3.5.7 // indirect
76+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0 // indirect
77+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.1 // indirect
78+
go.opentelemetry.io/otel v1.10.0 // indirect
79+
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.10.0 // indirect
80+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.10.0 // indirect
81+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.10.0 // indirect
82+
go.opentelemetry.io/otel/metric v0.31.0 // indirect
83+
go.opentelemetry.io/otel/sdk v1.10.0 // indirect
84+
go.opentelemetry.io/otel/trace v1.10.0 // indirect
85+
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
7986
go.uber.org/atomic v1.7.0 // indirect
8087
go.uber.org/multierr v1.6.0 // indirect
81-
go.uber.org/zap v1.21.0 // indirect
82-
golang.org/x/mod v0.7.0 // indirect
83-
golang.org/x/net v0.7.0 // indirect
84-
golang.org/x/oauth2 v0.4.0 // indirect
85-
golang.org/x/sync v0.1.0 // indirect
86-
golang.org/x/sys v0.5.0 // indirect
87-
golang.org/x/term v0.5.0 // indirect
88-
golang.org/x/text v0.7.0 // indirect
89-
golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect
90-
golang.org/x/tools v0.4.0 // indirect
91-
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
88+
go.uber.org/zap v1.24.0 // indirect
89+
golang.org/x/mod v0.10.0 // indirect
90+
golang.org/x/net v0.10.0 // indirect
91+
golang.org/x/oauth2 v0.5.0 // indirect
92+
golang.org/x/sync v0.2.0 // indirect
93+
golang.org/x/sys v0.8.0 // indirect
94+
golang.org/x/term v0.8.0 // indirect
95+
golang.org/x/text v0.9.0 // indirect
96+
golang.org/x/time v0.3.0 // indirect
97+
golang.org/x/tools v0.9.1 // indirect
98+
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
9299
google.golang.org/appengine v1.6.7 // indirect
93100
google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect
94101
google.golang.org/grpc v1.53.0 // indirect
95-
google.golang.org/protobuf v1.28.1 // indirect
102+
google.golang.org/protobuf v1.30.0 // indirect
96103
gopkg.in/inf.v0 v0.9.1 // indirect
97104
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
98105
gopkg.in/yaml.v2 v2.4.0 // indirect
99106
gopkg.in/yaml.v3 v3.0.1 // indirect
100-
k8s.io/apiextensions-apiserver v0.25.0 // indirect
101-
k8s.io/component-base v0.25.7 // indirect
102-
k8s.io/gengo v0.0.0-20211129171323-c02415ce4185 // indirect
103-
k8s.io/klog/v2 v2.70.1 // indirect
104-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.35 // indirect
105-
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
106-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
107+
k8s.io/apiextensions-apiserver v0.27.2 // indirect
108+
k8s.io/component-base v0.27.4 // indirect
109+
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
110+
k8s.io/klog/v2 v2.90.1 // indirect
111+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect
112+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
107113
sigs.k8s.io/yaml v1.3.0 // indirect
108114
)

0 commit comments

Comments
 (0)