Skip to content

Commit 6ad6438

Browse files
tenzen-ytenzen-y
committed
Upgrade K8s dependencies to v1.29
Signed-off-by: Yuki Iwai <[email protected]>
1 parent a1453cf commit 6ad6438

File tree

7 files changed

+190
-244
lines changed

7 files changed

+190
-244
lines changed

‎.github/workflows/golangci-lint.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ jobs:
1818
- name: golangci-lint
1919
uses: golangci/golangci-lint-action@v3
2020
with:
21-
version: v1.53.3
22-
args: --timeout=5m --go=1.20
21+
version: v1.57.2
22+
args: --timeout=5m --go=1.22
2323
only-new-issues: true

‎.github/workflows/main.yml

+1-1
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.25.8", "v1.26.3", "v1.27.1"]
41+
kubernetes-version: ["v1.27.11", "v1.28.7", "v1.29.2"]
4242
steps:
4343
- name: Clone the code
4444
uses: actions/checkout@v3

‎Makefile

+5-5
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ KUBEBUILDER_ASSETS_PATH := $(dir $(abspath $(firstword $(MAKEFILE_LIST))))bin/ku
3434
KIND_VERSION=v0.18.0
3535
HELM_VERSION=v3.11.2
3636
# This kubectl version supports -k for kustomization.
37-
KUBECTL_VERSION=v1.27.4
38-
ENVTEST_K8S_VERSION=1.27.1
37+
KUBECTL_VERSION=v1.29.4
38+
ENVTEST_K8S_VERSION=1.29.2
3939
PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))
4040
GOARCH=$(shell go env GOARCH)
4141
GOOS=$(shell go env GOOS)
@@ -118,11 +118,11 @@ test_images:
118118

119119
.PHONY: tidy
120120
tidy:
121-
go mod tidy -go 1.20
121+
go mod tidy -go 1.22
122122

123123
.PHONY: lint
124124
lint: bin/golangci-lint ## Run golangci-lint linter
125-
$(GOLANGCI_LINT) run --new-from-rev=origin/master --go 1.20
125+
$(GOLANGCI_LINT) run --new-from-rev=origin/master --go 1.22
126126

127127
# Generate deploy/v2beta1/mpi-operator.yaml
128128
manifest: kustomize crd
@@ -139,7 +139,7 @@ bin:
139139
GOLANGCI_LINT = $(shell pwd)/bin/golangci-lint
140140
.PHONY: bin/golangci-lint
141141
bin/golangci-lint: bin
142-
@GOBIN=$(PROJECT_DIR)/bin go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.53.3
142+
@GOBIN=$(PROJECT_DIR)/bin go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.57.2
143143

144144
ENVTEST = $(shell pwd)/bin/setup-envtest
145145
.PHONY: envtest

‎go.mod

+51-52
Original file line numberDiff line numberDiff line change
@@ -5,74 +5,73 @@ go 1.22
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.27.7
9-
github.com/prometheus/client_golang v1.15.1
10-
golang.org/x/crypto v0.17.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
8+
github.com/onsi/gomega v1.30.0
9+
github.com/prometheus/client_golang v1.18.0
10+
golang.org/x/crypto v0.21.0
11+
k8s.io/api v0.29.4
12+
k8s.io/apimachinery v0.29.4
13+
k8s.io/apiserver v0.29.4
14+
k8s.io/client-go v0.29.4
15+
k8s.io/code-generator v0.29.4
1616
k8s.io/klog v1.0.0
17-
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f
17+
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00
1818
k8s.io/utils v0.0.0-20240102154912-e7106e64919e
19-
sigs.k8s.io/controller-runtime v0.15.1
20-
sigs.k8s.io/scheduler-plugins v0.26.7
21-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3
19+
sigs.k8s.io/controller-runtime v0.17.3
20+
sigs.k8s.io/scheduler-plugins v0.28.9
21+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1
2222
volcano.sh/apis v1.8.0
2323
)
2424

2525
require (
2626
github.com/NYTimes/gziphandler v1.1.1 // indirect
27-
github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 // indirect
27+
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
2828
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
2929
github.com/beorn7/perks v1.0.1 // indirect
3030
github.com/blang/semver/v4 v4.0.0 // indirect
3131
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
3232
github.com/cespare/xxhash/v2 v2.2.0 // indirect
33-
github.com/coreos/go-semver v0.3.0 // indirect
34-
github.com/coreos/go-systemd/v22 v22.4.0 // indirect
33+
github.com/coreos/go-semver v0.3.1 // indirect
34+
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
3535
github.com/davecgh/go-spew v1.1.1 // indirect
36-
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
37-
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
38-
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
36+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
37+
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
38+
github.com/evanphx/json-patch/v5 v5.8.0 // indirect
3939
github.com/felixge/httpsnoop v1.0.4 // indirect
40-
github.com/fsnotify/fsnotify v1.6.0 // indirect
41-
github.com/go-logr/logr v1.3.0 // indirect
40+
github.com/fsnotify/fsnotify v1.7.0 // indirect
41+
github.com/go-logr/logr v1.4.1 // indirect
4242
github.com/go-logr/stdr v1.2.2 // indirect
4343
github.com/go-openapi/jsonpointer v0.19.6 // indirect
44-
github.com/go-openapi/jsonreference v0.20.1 // indirect
44+
github.com/go-openapi/jsonreference v0.20.2 // indirect
4545
github.com/go-openapi/swag v0.22.3 // indirect
4646
github.com/gogo/protobuf v1.3.2 // indirect
4747
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
48-
github.com/golang/protobuf v1.5.3 // indirect
49-
github.com/google/cel-go v0.12.6 // indirect
50-
github.com/google/gnostic v0.5.7-v3refs // indirect
51-
github.com/google/gofuzz v1.1.0 // indirect
48+
github.com/golang/protobuf v1.5.4 // indirect
49+
github.com/google/cel-go v0.17.7 // indirect
50+
github.com/google/gnostic-models v0.6.8 // indirect
51+
github.com/google/gofuzz v1.2.0 // indirect
5252
github.com/google/uuid v1.3.1 // indirect
5353
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
5454
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
5555
github.com/imdario/mergo v0.3.12 // indirect
56-
github.com/inconshreveable/mousetrap v1.0.1 // indirect
56+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
5757
github.com/josharian/intern v1.0.0 // indirect
5858
github.com/json-iterator/go v1.1.12 // indirect
5959
github.com/mailru/easyjson v0.7.7 // indirect
60-
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
61-
github.com/mitchellh/mapstructure v1.4.1 // indirect
60+
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
6261
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
6362
github.com/modern-go/reflect2 v1.0.2 // indirect
6463
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
6564
github.com/nxadm/tail v1.4.8 // indirect
6665
github.com/pkg/errors v0.9.1 // 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
66+
github.com/prometheus/client_model v0.5.0 // indirect
67+
github.com/prometheus/common v0.45.0 // indirect
68+
github.com/prometheus/procfs v0.12.0 // indirect
69+
github.com/spf13/cobra v1.7.0 // indirect
7170
github.com/spf13/pflag v1.0.5 // indirect
7271
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
72+
go.etcd.io/etcd/api/v3 v3.5.10 // indirect
73+
go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect
74+
go.etcd.io/etcd/client/v3 v3.5.10 // indirect
7675
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 // indirect
7776
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.0 // indirect
7877
go.opentelemetry.io/otel v1.20.0 // indirect
@@ -82,19 +81,19 @@ require (
8281
go.opentelemetry.io/otel/sdk v1.20.0 // indirect
8382
go.opentelemetry.io/otel/trace v1.20.0 // indirect
8483
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
85-
go.uber.org/atomic v1.7.0 // indirect
86-
go.uber.org/multierr v1.6.0 // indirect
87-
go.uber.org/zap v1.24.0 // indirect
88-
golang.org/x/mod v0.10.0 // indirect
89-
golang.org/x/net v0.17.0 // indirect
90-
golang.org/x/oauth2 v0.11.0 // indirect
91-
golang.org/x/sync v0.3.0 // indirect
92-
golang.org/x/sys v0.15.0 // indirect
93-
golang.org/x/term v0.15.0 // indirect
84+
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-20220827204233-334a2380cb91 // indirect
87+
golang.org/x/mod v0.14.0 // indirect
88+
golang.org/x/net v0.23.0 // indirect
89+
golang.org/x/oauth2 v0.12.0 // indirect
90+
golang.org/x/sync v0.5.0 // indirect
91+
golang.org/x/sys v0.18.0 // indirect
92+
golang.org/x/term v0.18.0 // indirect
9493
golang.org/x/text v0.14.0 // indirect
9594
golang.org/x/time v0.3.0 // indirect
96-
golang.org/x/tools v0.9.1 // indirect
97-
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
95+
golang.org/x/tools v0.16.1 // indirect
96+
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
9897
google.golang.org/appengine v1.6.7 // indirect
9998
google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d // indirect
10099
google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect
@@ -105,11 +104,11 @@ require (
105104
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
106105
gopkg.in/yaml.v2 v2.4.0 // indirect
107106
gopkg.in/yaml.v3 v3.0.1 // indirect
108-
k8s.io/apiextensions-apiserver v0.27.2 // indirect
109-
k8s.io/component-base v0.27.4 // indirect
110-
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
111-
k8s.io/klog/v2 v2.90.1 // indirect
112-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect
107+
k8s.io/apiextensions-apiserver v0.29.2 // indirect
108+
k8s.io/component-base v0.29.4 // indirect
109+
k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01 // indirect
110+
k8s.io/klog/v2 v2.110.1 // indirect
111+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 // indirect
113112
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
114-
sigs.k8s.io/yaml v1.3.0 // indirect
113+
sigs.k8s.io/yaml v1.4.0 // indirect
115114
)

0 commit comments

Comments
 (0)