Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ray-project/kuberay
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f0d44692145a4543c443010bb8b7ecf39eedf918
Choose a base ref
..
head repository: ray-project/kuberay
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e15cf3bbd5f36a9ae42d3c514d9757ef05df11ef
Choose a head ref
Showing with 377 additions and 372 deletions.
  1. +0 −8 .buildkite/example.yml
  2. +4 −2 .buildkite/test-rayjob-sample-yamls.yml
  3. +4 −4 .github/workflows/consistency-check.yaml
  4. +5 −5 .github/workflows/image-release.yaml
  5. +7 −7 .github/workflows/test-job.yaml
  6. +3 −4 apiserver/Dockerfile
  7. +1 −1 apiserver/go.mod
  8. +1 −241 apiserver/go.sum
  9. BIN benchmark/memory_benchmark/images/benchmark_architecture.png
  10. BIN benchmark/memory_benchmark/images/benchmark_result.png
  11. +84 −0 benchmark/memory_benchmark/memory_benchmark.md
  12. +75 −0 benchmark/memory_benchmark/scripts/experiment_figures.py
  13. +60 −0 benchmark/memory_benchmark/scripts/memory_benchmark_utils.py
  14. +57 −0 benchmark/memory_benchmark/scripts/ray-cluster.benchmark.yaml.template
  15. +2 −3 cli/go.mod
  16. +1 −6 cli/go.sum
  17. +0 −13 docs/deploy/docker.md
  18. +21 −0 docs/deploy/images.md
  19. +1 −1 proto/Dockerfile
  20. +1 −1 proto/go.mod
  21. +0 −1 proto/go.sum
  22. +1 −1 proto/kuberay_api.swagger.json
  23. +5 −6 ray-operator/DEVELOPMENT.md
  24. +1 −1 ray-operator/Dockerfile
  25. +3 −3 ray-operator/apis/ray/v1alpha1/rayjob_types.go
  26. +6 −6 ray-operator/controllers/ray/common/pod_test.go
  27. +2 −2 ray-operator/controllers/ray/rayservice_controller.go
  28. +8 −8 ray-operator/controllers/ray/utils/dashboard_httpclient.go
  29. +2 −2 ray-operator/controllers/ray/utils/httpproxy_httpclient.go
  30. +2 −2 ray-operator/go.mod
  31. +6 −27 ray-operator/go.sum
  32. +7 −7 ray-operator/pkg/client/clientset/versioned/fake/register.go
  33. +7 −7 ray-operator/pkg/client/clientset/versioned/scheme/register.go
  34. +0 −3 scripts/install-docker.sh
8 changes: 0 additions & 8 deletions .buildkite/example.yml

This file was deleted.

6 changes: 4 additions & 2 deletions .buildkite/test-rayjob-sample-yamls.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
- label: Test RayJob Sample YAMLs
instance_size: large
image: golang:1.17
image: golang:1.19
commands:
# Install Go
- export PATH=$PATH:/usr/local/go/bin
@@ -60,7 +60,9 @@

# Install python 3.10 and pip
- apt-get update
- apt-get install -y python3.10 python3-pip
- apt-get install -y python3.11 python3.11-venv
- python3 -m venv .venv
- source .venv/bin/activate

# Install requirements
- pip install -r tests/framework/config/requirements.txt
8 changes: 4 additions & 4 deletions .github/workflows/consistency-check.yaml
Original file line number Diff line number Diff line change
@@ -17,11 +17,11 @@ jobs:
with:
fetch-depth: 0

- name: Set up Go 1.17.x
- name: Set up Go 1.19.x
uses: actions/setup-go@v2
with:
# Use the same go version with build job
go-version: '1.17'
go-version: '1.19'

- name: Check golang version
working-directory: ./ray-operator
@@ -44,11 +44,11 @@ jobs:
with:
fetch-depth: 0

- name: Set up Go 1.17.x
- name: Set up Go 1.19.x
uses: actions/setup-go@v2
with:
# Use the same go version with build job
go-version: '1.17'
go-version: '1.19'

- name: Update CRD/RBAC YAML files
working-directory: ./ray-operator
10 changes: 5 additions & 5 deletions .github/workflows/image-release.yaml
Original file line number Diff line number Diff line change
@@ -18,10 +18,10 @@ jobs:
runs-on: ubuntu-latest
steps:

- name: Set up Go 1.17.x
- name: Set up Go 1.19.x
uses: actions/setup-go@v2
with:
go-version: '1.17'
go-version: '1.19'

- name: Check out code into the Go module directory
uses: actions/checkout@v2
@@ -76,7 +76,7 @@ jobs:
username: ${{ secrets.QUAY_USERNAME }}
password: ${{ secrets.QUAY_ROBOT_TOKEN }}

- name: Push Operator to Quay.io
- name: Push Apiserver to Quay.io
run: |
docker image tag kuberay/apiserver:${{ steps.vars.outputs.sha_short }} quay.io/kuberay/apiserver:${{ steps.vars.outputs.sha_short }};
docker push quay.io/kuberay/apiserver:${{ steps.vars.outputs.sha_short }};
@@ -90,10 +90,10 @@ jobs:
runs-on: ubuntu-latest
steps:

- name: Set up Go 1.17.x
- name: Set up Go 1.19.x
uses: actions/setup-go@v2
with:
go-version: '1.17'
go-version: '1.19'

- name: Check out code into the Go module directory
uses: actions/checkout@v2
14 changes: 7 additions & 7 deletions .github/workflows/test-job.yaml
Original file line number Diff line number Diff line change
@@ -12,11 +12,11 @@ jobs:
name: Lint
runs-on: ubuntu-latest
steps:
- name: Set up Go 1.17.x
- name: Set up Go 1.19.x
uses: actions/setup-go@v2
with:
# Use the same go version with build job
go-version: '1.17'
go-version: '1.19'

- name: Check out code into the Go module directory
uses: actions/checkout@v2
@@ -107,10 +107,10 @@ jobs:
name: Build Apiserver, CLI Binaries and Docker Images
runs-on: ubuntu-latest
steps:
- name: Set up Go 1.17.x
- name: Set up Go 1.19.x
uses: actions/setup-go@v2
with:
go-version: '1.17'
go-version: '1.19'

- name: Check out code into the Go module directory
uses: actions/checkout@v2
@@ -183,7 +183,7 @@ jobs:
password: ${{ secrets.QUAY_ROBOT_TOKEN }}
if: contains(fromJson('["refs/heads/master"]'), github.ref)

- name: Push Operator to Quay.io
- name: Push Apiserver to Quay.io
run: |
docker image tag kuberay/apiserver:${{ steps.vars.outputs.sha_short }} quay.io/kuberay/apiserver:${{ steps.vars.outputs.sha_short }};
docker push quay.io/kuberay/apiserver:${{ steps.vars.outputs.sha_short }};
@@ -202,10 +202,10 @@ jobs:
runs-on: ubuntu-latest
steps:

- name: Set up Go 1.17.x
- name: Set up Go 1.19.x
uses: actions/setup-go@v2
with:
go-version: '1.17'
go-version: '1.19'

- name: Check out code into the Go module directory
uses: actions/checkout@v2
7 changes: 3 additions & 4 deletions apiserver/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the backend service
FROM golang:1.17 as builder
FROM registry.access.redhat.com/ubi8/go-toolset:1.19.10-10 as builder

WORKDIR /workspace
# Copy the Go Modules manifests
@@ -17,12 +17,11 @@ WORKDIR /workspace/apiserver
RUN go mod download

# Build
USER root
WORKDIR /workspace/apiserver
RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -o kuberay-apiserver cmd/main.go

# Use distroless as minimal base image to package the manager binary
# Refer to https://github.com/GoogleContainerTools/distroless for more details
FROM gcr.io/distroless/static:nonroot
FROM scratch
WORKDIR /workspace
COPY --from=builder /workspace/apiserver/kuberay-apiserver apiserver/
# Support serving swagger files
2 changes: 1 addition & 1 deletion apiserver/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/ray-project/kuberay/apiserver

go 1.17
go 1.19

require (
github.com/go-openapi/runtime v0.19.31
Loading