Skip to content

Commit

Permalink
[core] Bump Go Dependencies (#2205)
Browse files Browse the repository at this point in the history
* bump ./proto deps

* bump ./apiserver deps

* bump ./ray-operator deps

* bump ./cli deps

* bump ./experimental deps

* fixup! bump ./ray-operator deps

* Doesn't seem to matter but also bump buildkite

* Don't change the distro version just yet

* Bump go version in gha jobs

* Also bump sigs.k8s.io/controller-tools for build time

* more bumps

* Update package import paths for proto rename

* Fix another deprecated API

* s/corev1.ResourceRequirements/corev1.VolumeResourceRequirements/gci rename

* Downgrade client-go

* update-codegen.sh

* Try bumping crd-ref-docs as well

* make manifests

* make sync

* k8s.io/utils/pointer -> k8s.io/utils/ptr

* lint: missing formatting directive

* make generate

* Try to bump version

* Bump & standardize builder images

* fixup! Bump & standardize builder images

* Switch multi-arch Dockerfile to distrolss as well
  • Loading branch information
thomasdesr authored Jun 26, 2024
1 parent a43217b commit 8e5f88c
Show file tree
Hide file tree
Showing 62 changed files with 11,007 additions and 3,113 deletions.
12 changes: 6 additions & 6 deletions .buildkite/test-sample-yamls.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

- label: 'Test RayCluster Sample YAMLs (nightly operator)'
instance_size: large
image: golang:1.20
image: golang:1.22
commands:
- ./.buildkite/setup-env.sh
# Build nightly KubeRay operator image
Expand All @@ -14,15 +14,15 @@

- label: 'Test RayCluster Sample YAMLs (latest release)'
instance_size: large
image: golang:1.20
image: golang:1.22
commands:
- ./.buildkite/setup-env.sh
# Use KubeRay operator image from the latest release
- source .venv/bin/activate && BUILDKITE_ENV=true OPERATOR_IMAGE=quay.io/kuberay/operator:v1.1.0 python3 tests/test_sample_raycluster_yamls.py

- label: 'Test RayJob Sample YAMLs (nightly operator)'
instance_size: large
image: golang:1.20
image: golang:1.22
commands:
- ./.buildkite/setup-env.sh
# Build nightly KubeRay operator image
Expand All @@ -34,15 +34,15 @@

- label: 'Test RayJob Sample YAMLs (latest release)'
instance_size: large
image: golang:1.20
image: golang:1.22
commands:
- ./.buildkite/setup-env.sh
# Use KubeRay operator image from the latest release
- source .venv/bin/activate && BUILDKITE_ENV=true OPERATOR_IMAGE=quay.io/kuberay/operator:v1.1.0 python3 tests/test_sample_rayjob_yamls.py

- label: 'Test RayService Sample YAMLs (nightly operator)'
instance_size: large
image: golang:1.20
image: golang:1.22
commands:
- ./.buildkite/setup-env.sh
# Build nightly KubeRay operator image
Expand All @@ -54,7 +54,7 @@

- label: 'Test RayService Sample YAMLs (latest release)'
instance_size: large
image: golang:1.20
image: golang:1.22
commands:
- ./.buildkite/setup-env.sh
# Use KubeRay operator image from the latest release
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/consistency-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
uses: actions/setup-go@v3
with:
# Use the same go version with build job
go-version: v1.20
go-version: v1.22

- name: Check golang version
working-directory: ./ray-operator
Expand All @@ -48,7 +48,7 @@ jobs:
uses: actions/setup-go@v3
with:
# Use the same go version with build job
go-version: v1.20
go-version: v1.22

- name: Check golang version
working-directory: ./ray-operator
Expand All @@ -72,7 +72,7 @@ jobs:
uses: actions/setup-go@v3
with:
# Use the same go version with build job
go-version: v1.20
go-version: v1.22

- name: Update CRD/RBAC YAML files
working-directory: ./ray-operator
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v3
with:
go-version: v1.20
go-version: v1.22

- name: Set up gotestfmt
uses: gotesttools/gotestfmt-action@v2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/image-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v3
with:
go-version: v1.20
go-version: v1.22

- name: Check out code into the Go module directory
uses: actions/checkout@v2
Expand Down Expand Up @@ -81,7 +81,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v3
with:
go-version: v1.20
go-version: v1.22

- name: Check out code into the Go module directory
uses: actions/checkout@v2
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test-job.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v3
with:
go-version: v1.20
go-version: v1.22

- name: Check out code into the Go module directory
uses: actions/checkout@v2
Expand Down Expand Up @@ -112,7 +112,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v3
with:
go-version: v1.20
go-version: v1.22

- name: Check out code into the Go module directory
uses: actions/checkout@v2
Expand Down Expand Up @@ -186,7 +186,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v3
with:
go-version: v1.20
go-version: v1.22

- name: Check out code into the Go module directory
uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion apiserver/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the backend service
FROM registry.access.redhat.com/ubi9/go-toolset:1.20.10 as builder
FROM golang:1.22.4-bullseye as builder

WORKDIR /workspace
# Copy the Go Modules manifests
Expand Down
109 changes: 54 additions & 55 deletions apiserver/go.mod
Original file line number Diff line number Diff line change
@@ -1,95 +1,94 @@
module github.com/ray-project/kuberay/apiserver

go 1.20
go 1.22.0

toolchain go1.22.3

require (
github.com/go-openapi/runtime v0.19.31
github.com/go-openapi/runtime v0.28.0
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.16.0
github.com/prometheus/client_golang v1.19.1
github.com/ray-project/kuberay/proto v0.0.0-20220703232803-3e7749d17400
github.com/ray-project/kuberay/ray-operator v0.0.0-20220703232803-3e7749d17400
github.com/stretchr/testify v1.8.4
google.golang.org/grpc v1.59.0
google.golang.org/protobuf v1.32.0
k8s.io/api v0.28.4
k8s.io/apimachinery v0.28.4
k8s.io/client-go v0.28.4
k8s.io/klog/v2 v2.100.1
github.com/stretchr/testify v1.9.0
google.golang.org/grpc v1.64.0
google.golang.org/protobuf v1.34.2
k8s.io/api v0.30.2
k8s.io/apimachinery v0.30.2
k8s.io/client-go v0.30.2
k8s.io/klog/v2 v2.130.1
)

require (
github.com/dustinkirkland/golang-petname v0.0.0-20230626224747-e794b9370d49
github.com/dustinkirkland/golang-petname v0.0.0-20240428194347-eebcea082ee0
github.com/elazarl/go-bindata-assetfs v1.0.1
github.com/go-logr/logr v1.2.4
github.com/go-logr/logr v1.4.2
github.com/go-logr/zerologr v1.2.3
github.com/golang/protobuf v1.5.3
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0
github.com/rs/zerolog v1.31.0
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
sigs.k8s.io/controller-runtime v0.16.3
sigs.k8s.io/yaml v1.3.0
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0
github.com/rs/zerolog v1.33.0
google.golang.org/genproto/googleapis/rpc v0.0.0-20240624140628-dc46fd24d27d
k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0
sigs.k8s.io/controller-runtime v0.18.4
sigs.k8s.io/yaml v1.4.0
)

require github.com/pmezard/go-difflib v1.0.0 // indirect

require (
github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 // indirect
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/go-openapi/errors v0.19.6 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/strfmt v0.19.5 // indirect
github.com/go-openapi/swag v0.22.3 // indirect
github.com/go-stack/stack v1.8.0 // indirect
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/go-openapi/errors v0.22.0 // indirect
github.com/go-openapi/jsonpointer v0.21.0 // indirect
github.com/go-openapi/jsonreference v0.21.0 // indirect
github.com/go-openapi/strfmt v0.23.0 // indirect
github.com/go-openapi/swag v0.23.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.3.1 // indirect
github.com/imdario/mergo v0.3.12 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/imdario/mergo v0.3.16 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.19 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/mitchellh/mapstructure v1.4.1 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/prometheus/client_model v0.4.0 // indirect
github.com/prometheus/common v0.44.0 // indirect
github.com/prometheus/procfs v0.10.1 // indirect
github.com/oklog/ulid v1.3.1 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.54.0 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/spf13/pflag v1.0.5 // indirect
go.mongodb.org/mongo-driver v1.5.1 // indirect
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
golang.org/x/net v0.23.0 // indirect
golang.org/x/oauth2 v0.11.0 // indirect
golang.org/x/sys v0.18.0 // indirect
golang.org/x/term v0.18.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/time v0.3.0 // indirect
go.mongodb.org/mongo-driver v1.15.1 // indirect
golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 // indirect
golang.org/x/net v0.26.0 // indirect
golang.org/x/oauth2 v0.21.0 // indirect
golang.org/x/sync v0.7.0 // indirect
golang.org/x/sys v0.21.0 // indirect
golang.org/x/term v0.21.0 // indirect
golang.org/x/text v0.16.0 // indirect
golang.org/x/time v0.5.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240624140628-dc46fd24d27d // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiextensions-apiserver v0.28.4 // indirect
k8s.io/component-base v0.28.4 // indirect
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
k8s.io/apiextensions-apiserver v0.30.2 // indirect
k8s.io/kube-openapi v0.0.0-20240620174524-b456828f718b // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
)

replace (
Expand Down
Loading

0 comments on commit 8e5f88c

Please sign in to comment.