Skip to content

Commit 7200bd9

Browse files
starpitstarpit
committed
feat: remove ray autoscaler support
also bump kui to pick up fix for -h/-v options
1 parent feab236 commit 7200bd9

File tree

6 files changed

+145
-133
lines changed

6 files changed

+145
-133
lines changed

Diff for: ‎.github/workflows/kind.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- non-gpu2/keep-it-simple
1818
- non-gpu3/keep-it-simple
1919
- non-gpu4/keep-it-simple
20-
- non-gpu1/ray-autoscaler
20+
# - non-gpu1/ray-autoscaler
2121
- non-gpu1/mcad-default
2222
- non-gpu1/mcad-coscheduler
2323
- non-gpu1/mcad-preinstalled

Diff for: ‎package-lock.json

+116-116
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎package.json

+13-13
Original file line numberDiff line numberDiff line change
@@ -131,10 +131,10 @@
131131
}
132132
},
133133
"devDependencies": {
134-
"@kui-shell/builder": "13.0.0-dev-20230217-141510",
135-
"@kui-shell/proxy": "13.0.0-dev-20230217-141510",
136-
"@kui-shell/react": "13.0.0-dev-20230217-141510",
137-
"@kui-shell/webpack": "13.0.0-dev-20230217-141510",
134+
"@kui-shell/builder": "13.0.0-dev-20230220-145930",
135+
"@kui-shell/proxy": "13.0.0-dev-20230220-145930",
136+
"@kui-shell/react": "13.0.0-dev-20230220-145930",
137+
"@kui-shell/webpack": "13.0.0-dev-20230220-145930",
138138
"@playwright/test": "^1.30.0",
139139
"@typescript-eslint/eslint-plugin": "^5.51.0",
140140
"@typescript-eslint/parser": "^5.51.0",
@@ -152,15 +152,15 @@
152152
"dependencies": {
153153
"node-pty": "0.11.0-beta27",
154154
"@kui-shell/client": "file:./plugins/plugin-client-default",
155-
"@kui-shell/core": "13.0.0-dev-20230217-141510",
156-
"@kui-shell/plugin-bash-like": "13.0.0-dev-20230217-141510",
157-
"@kui-shell/plugin-client-common": "13.0.0-dev-20230217-141510",
155+
"@kui-shell/core": "13.0.0-dev-20230220-145930",
156+
"@kui-shell/plugin-bash-like": "13.0.0-dev-20230220-145930",
157+
"@kui-shell/plugin-client-common": "13.0.0-dev-20230220-145930",
158158
"@kui-shell/plugin-codeflare": "file:./plugins/plugin-codeflare",
159-
"@kui-shell/plugin-core-support": "13.0.0-dev-20230217-141510",
160-
"@kui-shell/plugin-electron-components": "13.0.0-dev-20230217-141510",
161-
"@kui-shell/plugin-kubectl": "13.0.0-dev-20230217-141510",
162-
"@kui-shell/plugin-madwizard": "13.0.0-dev-20230217-141510",
163-
"@kui-shell/plugin-patternfly4-themes": "13.0.0-dev-20230217-141510",
164-
"@kui-shell/plugin-proxy-support": "13.0.0-dev-20230217-141510"
159+
"@kui-shell/plugin-core-support": "13.0.0-dev-20230220-145930",
160+
"@kui-shell/plugin-electron-components": "13.0.0-dev-20230220-145930",
161+
"@kui-shell/plugin-kubectl": "13.0.0-dev-20230220-145930",
162+
"@kui-shell/plugin-madwizard": "13.0.0-dev-20230220-145930",
163+
"@kui-shell/plugin-patternfly4-themes": "13.0.0-dev-20230220-145930",
164+
"@kui-shell/plugin-proxy-support": "13.0.0-dev-20230220-145930"
165165
}
166166
}

Diff for: ‎plugins/plugin-codeflare/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@
3030
"@types/split2": "^3.2.1"
3131
},
3232
"dependencies": {
33-
"@guidebooks/store": "^4.0.3",
33+
"@guidebooks/store": "^5.0.0",
3434
"@logdna/tail-file": "^3.0.1",
3535
"@patternfly/react-charts": "^6.94.18",
3636
"@patternfly/react-core": "^4.276.6",
3737
"asciinema-player": "^3.0.1",
3838
"chokidar": "^3.5.3",
39-
"madwizard": "^6.2.0",
39+
"madwizard": "^6.2.1",
4040
"needle": "^3.2.0",
4141
"open": "^8.4.0",
4242
"pretty-bytes": "^6.0.0",

Diff for: ‎tests/kind/profiles/non-gpu1/ray-autoscaler

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"ml/codeflare/training/byoc/form": "{\"Path to source\":\"tests/kind/inputs/qiskit\",\"Base image\":\"rayproject/ray:2.1.0\"}",
1515
"kubernetes/choose/secret/image-pull": "No secret needed, since my image is public",
1616
"s3/choose/bucket/maybe": "My data is not stored in S3",
17-
"ml/ray/start/resources": "{\"Number of CPUs\":\"200m\",\"Number of GPUs\":\"0\",\"Minimum Workers\":\"1\",\"Maximum Workers\":\"1\",\"Worker Memory\":\"500Mi\",\"Head Memory\":\"3Gi\",\"Ephemeral Storage\":\"5Gi\"}",
17+
"ml/ray/start/resources": "{\"Number of CPUs\":\"200m\",\"Number of GPUs\":\"0\",\"Minimum Workers\":\"0\",\"Maximum Workers\":\"0\",\"Worker Memory\":\"500Mi\",\"Head Memory\":\"2.5Gi\",\"Ephemeral Storage\":\"5Gi\"}",
1818
"kubernetes/context": "kind-codeflare-test",
1919
"kubernetes/choose/ns": "default",
2020
"ml/ray/storage/s3/maybe": "My code does not use Ray Workflows",

Diff for: ‎tests/kind/run.sh

+12
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,12 @@ function run {
7171
export MWPROFILES_PATH="$MWPROFILES_PATH_BASE"/$variant
7272
mkdir -p "$MWPROFILES_PATH"
7373

74+
if [ "$profile" = "ray-autoscaler" ]; then
75+
# ugh, the old ray operator uses a different naming convention
76+
export RAY_KUBE_CLUSTER_HEAD_SERVICE=$RAY_KUBE_CLUSTER_NAME-ray-head
77+
echo "[Test] Run: using Ray operator's convention for naming ray-head service $RAY_KUBE_CLUSTER_HEAD_SERVICE"
78+
fi
79+
7480
local guidebook=${2-$GUIDEBOOK}
7581
local yes=$([ -z "$FORCE_ALL" ] && [ "$FORCE" != "$profileFull" ] && [ -f "$MWPROFILES_PATH/$profile" ] && echo "--yes" || echo "")
7682

@@ -97,6 +103,12 @@ function attach {
97103

98104
local jobId=$2
99105

106+
if [ "$profile" = "ray-autoscaler" ]; then
107+
# ugh, the old ray operator uses a different naming convention
108+
export RAY_KUBE_CLUSTER_HEAD_SERVICE=$RAY_KUBE_CLUSTER_NAME-ray-head
109+
echo "[Test] Attach: using Ray operator's convention for naming ray-head service $RAY_KUBE_CLUSTER_HEAD_SERVICE"
110+
fi
111+
100112
LOGFILE=$(mktemp)
101113

102114
echo "[Test] Attaching variant=$variant profile=$profile jobId=$jobId"

0 commit comments

Comments
 (0)