Skip to content

Make Local Queue label optional #580

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.

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

Merged

Conversation

Bobbins228
Copy link
Contributor

@Bobbins228 Bobbins228 commented Jul 2, 2024

Issue link

closes: RHOAIENG-9348

What changes have been made

Altered the local_queue functionality so if no default local queue exists or local_queue is not specified then the label will not be applied to the Ray Cluster.

Verification steps

Setup

Notebook server ODH/RHOAI/Local

  • Clone this repository with git clone https://github.com/project-codeflare/codeflare-sdk.git
  • Checkout this PR's branch
  • Run poetry build - install if needed (pip install poetry)
  • Run pip install --force-reinstall dist/codeflare_sdk-0.0.0.dev0-py3-none-any.whl
  • Restart your notebook kernel

Testing

Remove Kueue from your OpenShift Cluster

  • In the RHOAI DSC set Kueue's management state to Removed
  • Create a Ray Cluster in the ClusterConfiguration without a local queue specified.
  • Ensure the Ray Cluster does not have a local queue label

Kueue is enabled but no default Local Queue exists

  • Ensure no default Local Queue exists in a given namespace
  • Create a Ray Cluster without the local queue specified
  • Ensure the created Ray Cluster does not have the local queue label.

Checks

  • I've made sure the tests are passing.
  • Testing Strategy
    • Unit tests
    • Manual tests
    • Testing is not required for this change

@openshift-ci openshift-ci bot requested review from dimakis and MichaelClifford July 2, 2024 12:40
@Bobbins228 Bobbins228 requested a review from astefanutti July 2, 2024 12:41
@Bobbins228 Bobbins228 changed the title Local queue optional Make Local Queue label optional Jul 2, 2024
@Bobbins228 Bobbins228 force-pushed the local-queue-optional branch from 6ff0143 to 23879b9 Compare July 2, 2024 14:49
Copy link
Collaborator

@ChristianZaccaria ChristianZaccaria left a comment

Choose a reason for hiding this comment

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

Tested and works as expected:

  • When not specifying LocalQueue in ClusterConfiguration but has default-queue annotation, LocalQueue label is added.
  • When not specifying LocalQueue in ClusterConfiguration without the default-queue annotation, LocalQueue label is not added.
  • When specifying the LocalQueue in ClusterConfiguration, LocalQueue label is added.

Thanks!

@astefanutti
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 3, 2024
Copy link
Collaborator

@ChristianZaccaria ChristianZaccaria left a comment

Choose a reason for hiding this comment

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

/lgtm just needs a rebase.

If you have a chance, please create a Jira for updating the notebooks after a release is a made. Thank you!

@Bobbins228 Bobbins228 force-pushed the local-queue-optional branch from 23879b9 to 41b95ba Compare July 3, 2024 10:55
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Jul 3, 2024
@Bobbins228
Copy link
Contributor Author

Rebased!
@ChristianZaccaria good catch. I'll create a Jira for updating the nbs

@astefanutti
Copy link
Contributor

/approve

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 3, 2024
@Bobbins228
Copy link
Contributor Author

@astefanutti @ChristianZaccaria I think the PR just requires a review approval in order to merge now :)

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 3, 2024
Copy link
Contributor

openshift-ci bot commented Jul 3, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: astefanutti

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-bot openshift-merge-bot bot merged commit 1ab5421 into project-codeflare:main Jul 3, 2024
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants