Update Kuberay version in CI. (#27967)

Updates KubeRay version used in CI to v0.3.0-rc.2 (which we expect to be identical to the final v0.3.0).
Also removes a couple of old files.

Will open a corresponding cherry pick in the Ray 2.0.0 branch.
The key thing to verify is that the CI autoscaling test passes here and in the PR and in the PR against the 2.0.0 branch.
This commit is contained in:
Dmitri Gekhtman 2022-08-20 14:50:52 -07:00 committed by GitHub
parent 11c9b1779d
commit 227aef381a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 70 deletions

View file

@ -2,11 +2,10 @@
# Clone pinned Kuberay commit to temporary directory, copy the CRD definitions
# into the autoscaler folder.
KUBERAY_COMMIT="v0.3.0-rc.2"
OPERATOR_TAG="v0.3.0-rc.2"
KUBERAY_SHA="ce84f0441c991eb4b0f52ee2cd85c0a5ac048d11"
OPERATOR_TAG=${KUBERAY_SHA:0:7}
# Requires Kustomize (dependency to be removed after KubeRay 0.3.0 cut)
# Requires Kustomize
if ! command -v kustomize &> /dev/null
then
echo "Please install kustomize. Then re-run this script."
@ -18,12 +17,9 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
DIR=$(mktemp -d -t "kuberay-XXXXXX")
pushd "$DIR" || exit
git clone https://github.com/ray-project/kuberay/
pushd "kuberay" || exit
git checkout "$KUBERAY_SHA$"
pushd ray-operator/config/default || exit
kustomize edit set image kuberay/operator=kuberay/operator:"$OPERATOR_TAG"
popd || exit
cp -r ray-operator/config "$SCRIPT_DIR/"
git clone https://github.com/ray-project/kuberay/ --branch "$KUBERAY_COMMIT" --depth 1
pushd kuberay/ray-operator/config/default || exit
kustomize edit set image kuberay/operator=kuberay/operator:"$OPERATOR_TAG"
popd || exit
cp -r kuberay/ray-operator/config "$SCRIPT_DIR/"
popd || exit

View file

@ -1,32 +0,0 @@
---
apiVersion: v1
kind: ServiceAccount
metadata:
name: autoscaler-sa
---
kind: Role
apiVersion: rbac.authorization.k8s.io/v1
metadata:
namespace: default
name: autoscaler-role
rules:
- apiGroups: [""]
resources: ["pods"]
verbs: ["get", "list"]
- apiGroups: ["ray.io"]
resources: ["rayclusters"]
verbs: ["get", "patch"]
---
kind: RoleBinding
apiVersion: rbac.authorization.k8s.io/v1
metadata:
namespace: default
name: autoscaler-rolebinding
subjects:
- kind: ServiceAccount
name: autoscaler-sa
namespace: default
roleRef:
kind: Role
name: autoscaler-role
apiGroup: rbac.authorization.k8s.io

View file

@ -1,27 +0,0 @@
diff --git a/ray-operator/config/default/kustomization.yaml b/ray-operator/config/default/kustomization.yaml
index 7df72cd..9db211a 100644
--- a/ray-operator/config/default/kustomization.yaml
+++ b/ray-operator/config/default/kustomization.yaml
@@ -23,5 +23,5 @@ bases:
images:
- name: kuberay/operator
newName: kuberay/operator
- newTag: nightly
+ newTag: 69ecfce
diff --git a/ray-operator/config/manager/manager.yaml b/ray-operator/config/manager/manager.yaml
index 1ddde41..274bfc9 100644
--- a/ray-operator/config/manager/manager.yaml
+++ b/ray-operator/config/manager/manager.yaml
@@ -21,8 +21,8 @@ spec:
containers:
- command:
- /manager
-# args:
-# - --enable-leader-election
+ args:
+ - --prioritize-workers-to-delete
image: kuberay/operator
ports:
- name: http