Skip to content

Upgrade from AppWrapper v1beta1 to v1beta2 #484

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 9 commits into from
Closed

Upgrade from AppWrapper v1beta1 to v1beta2 #484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d19f412
Upgrade from AppWrapper v1beta to v1beta2
dgrove-oss Mar 18, 2024
b710677
bug fix: status may not be available in RayCluster
dgrove-oss Mar 21, 2024
e14e72c
review comments
dgrove-oss Mar 27, 2024
02cf2be
pick up codeflare-common@mcadv1b2 changes
dgrove-oss Mar 28, 2024
82c293f
pick up codeflare-common@mcadv1b2 changes
dgrove-oss Mar 28, 2024
63e6dc6
pick up codeflare-common@mcadv1b2 changes
dgrove-oss Mar 28, 2024
0e294eb
cleanup from botched whitespace merge in rebase
dgrove-oss Apr 1, 2024
6ff8ab6
update e2e tests to deploy Kueue
dgrove-oss Apr 1, 2024
b4950e1
bug fix: always switch to kind-cluster context to enable log printing
dgrove-oss Apr 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions .github/workflows/e2e_tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,12 @@ jobs:
with:
repository: project-codeflare/codeflare-operator
path: codeflare-operator
ref: mcadv1b2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will this stay mcadv1b2 or is this only because the CFO PR isn't merged yet?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is only because the CFO PR isn't merged. Once we merge all the pieces, this goes back to pulling from main.


- name: Set Go
uses: actions/setup-go@v5
with:
go-version: v1.20
go-version-file: './go.mod'

- name: Set up gotestfmt
uses: gotesttools/gotestfmt-action@v2
Expand All @@ -78,10 +79,15 @@ jobs:
- name: Setup and start KinD cluster
uses: ./common/github-actions/kind

- name: Deploy Kueue
working-directory: codeflare-operator
run: |
make kueue-e2e

- name: Deploy CodeFlare stack
id: deploy
working-directory: codeflare-operator
run: |
cd codeflare-operator
echo Deploying CodeFlare operator
IMG="${REGISTRY_ADDRESS}"/codeflare-operator
make image-push -e IMG="${IMG}"
Expand All @@ -91,8 +97,6 @@ jobs:
echo Setting up CodeFlare stack
make setup-e2e

cd ..

- name: Add user to KinD
uses: ./common/github-actions/kind-add-user
with:
Expand Down Expand Up @@ -122,6 +126,7 @@ jobs:
poetry run pytest -v -s ./tests/e2e -m kind > ${CODEFLARE_TEST_OUTPUT_DIR}/pytest_output.log 2>&1

- name: Switch to kind-cluster context to print logs
if: always() && steps.deploy.outcome == 'success'
run: kubectl config use-context kind-cluster

- name: Print CodeFlare operator logs
Expand All @@ -130,6 +135,13 @@ jobs:
echo "Printing CodeFlare operator logs"
kubectl logs -n openshift-operators --tail -1 -l app.kubernetes.io/name=codeflare-operator | tee ${CODEFLARE_TEST_OUTPUT_DIR}/codeflare-operator.log

- name: Print Kueue operator logs
if: always() && steps.deploy.outcome == 'success'
run: |
echo "Printing Kueue operator logs"
KUEUE_CONTROLLER_POD=$(kubectl get pods -n kueue-system | grep kueue-controller | awk '{print $1}')
kubectl logs -n kueue-system --tail -1 ${KUEUE_CONTROLLER_POD} | tee ${CODEFLARE_TEST_OUTPUT_DIR}/kueue.log

- name: Print KubeRay operator logs
if: always() && steps.deploy.outcome == 'success'
run: |
Expand Down
1 change: 0 additions & 1 deletion demo-notebooks/guided-demos/0_basic_ray.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@
" max_memory=4,\n",
" num_gpus=0,\n",
" image=\"quay.io/project-codeflare/ray:latest-py39-cu118\",\n",
" instascale=False\n",
"))"
]
},
Expand Down
177 changes: 0 additions & 177 deletions demo-notebooks/guided-demos/1_basic_instascale.ipynb
View file
Open in desktop

This file was deleted.

5 changes: 1 addition & 4 deletions demo-notebooks/guided-demos/3_basic_interactive.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,7 @@
" min_memory=8,\n",
" max_memory=8,\n",
" num_gpus=1,\n",
" image=\"quay.io/project-codeflare/ray:latest-py39-cu118\",\n",
" instascale=True, #<---instascale enabled\n",
" machine_types=[\"m5.xlarge\", \"g4dn.xlarge\"]\n",
" \n",
" image=\"quay.io/project-codeflare/ray:latest-py39-cu118\", \n",
"))"
]
},
Expand Down
2 changes: 0 additions & 2 deletions demo-notebooks/guided-demos/4_gpt.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,6 @@
" max_memory=8,\n",
" num_gpus=1,\n",
" image=\"quay.io/project-codeflare/ray:latest-py39-cu118\",\n",
" instascale=True, #<---instascale enabled\n",
" machine_types=[\"m5.xlarge\", \"g4dn.xlarge\"],\n",
"))"
]
},
Expand Down
Loading
Loading