Skip to content
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

Add configuration to pipeline stanza of DSC to enable InstructLab pipeline #1484

Open
wants to merge 4 commits into
base: main
Choose a base branch
from

Conversation

lburgazzoli
Copy link
Contributor

@lburgazzoli lburgazzoli commented Jan 9, 2025

Description

This PR adds an configuration option to the DataSciencePipelines component configuration to enabled InstructLab pipelines:

apiVersion: datasciencecluster.opendatahub.io/v1
kind: DataScienceCluster
metadata:
  name: default-dsc
spec:
  components:
    codeflare:
      managementState: Removed
    dashboard:
      managementState: Removed
    datasciencepipelines:
      managementState: Managed
      managedPipelines:
        instructLab:
          state: Managed

Once configured, the PREINSTALLEDPIPELINES property of the DataSciencePipelines's params.env file will looks like:

➜ cat opt/manifests/datasciencepipelines/base/params.env | grep PREINSTALLEDPIPELINES   
PREINSTALLEDPIPELINES="{\"instructLab\":{\"state\":\"Removed\"}}"

https://issues.redhat.com/browse/RHOAIENG-16509

How Has This Been Tested?

Screenshot or short clip

Merge criteria

  • You have read the contributors guide.
  • Commit messages are meaningful - have a clear and concise summary and detailed explanation of what was changed and why.
  • Pull Request contains a description of the solution, a link to the JIRA issue, and to any dependent or related Pull Request.
  • Testing instructions have been added in the PR body (for PRs involving changes that are not immediately obvious).
  • The developer has manually tested the changes and verified that the changes work

Copy link

openshift-ci bot commented Jan 9, 2025

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

Copy link

openshift-ci bot commented Jan 9, 2025

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please ask for approval from lburgazzoli. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found 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

@lburgazzoli lburgazzoli force-pushed the RHOAIENG-16509-InstructLab branch 2 times, most recently from c19f08f to 4ec11e6 Compare January 9, 2025 12:23
Copy link

codecov bot commented Jan 9, 2025

Codecov Report

Attention: Patch coverage is 18.18182% with 36 lines in your changes missing coverage. Please review.

Project coverage is 20.00%. Comparing base (2384ada) to head (16ad243).

Files with missing lines Patch % Lines
...nents/datasciencepipelines/datasciencepipelines.go 0.00% 16 Missing ⚠️
...tasciencepipelines/datasciencepipelines_support.go 42.10% 8 Missing and 3 partials ⚠️
...pelines/datasciencepipelines_controller_actions.go 0.00% 9 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1484      +/-   ##
==========================================
+ Coverage   19.96%   20.00%   +0.04%     
==========================================
  Files         162      162              
  Lines       10964    10996      +32     
==========================================
+ Hits         2189     2200      +11     
- Misses       8541     8559      +18     
- Partials      234      237       +3     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@lburgazzoli lburgazzoli force-pushed the RHOAIENG-16509-InstructLab branch from 4ec11e6 to cb45a5e Compare January 9, 2025 16:37
@lburgazzoli lburgazzoli requested review from HumairAK and mprahl January 9, 2025 16:38
Copy link

@aduquett aduquett left a comment

Choose a reason for hiding this comment

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

Added text suggestions.

apis/components/v1alpha1/datasciencepipelines/types.go Outdated Show resolved Hide resolved
apis/components/v1alpha1/datasciencepipelines/types.go Outdated Show resolved Hide resolved
apis/components/v1alpha1/datasciencepipelines/types.go Outdated Show resolved Hide resolved
Copy link
Contributor

This PR can't be merged just yet 😢

Please run make generate manifests api-docs and commit the changes.

For more info: https://github.com/opendatahub-io/opendatahub-operator/actions/runs/12705522276

Copy link
Contributor

This PR can't be merged just yet 😢

Please run make generate manifests api-docs and commit the changes.

For more info: https://github.com/opendatahub-io/opendatahub-operator/actions/runs/12705547559

@lburgazzoli lburgazzoli force-pushed the RHOAIENG-16509-InstructLab branch from 9f53127 to bd7ab11 Compare January 10, 2025 09:04
Copy link
Contributor

This PR can't be merged just yet 😢

Please run make generate manifests api-docs and commit the changes.

For more info: https://github.com/opendatahub-io/opendatahub-operator/actions/runs/12902820594

Copy link
Contributor

This PR can't be merged just yet 😢

Please run make generate manifests api-docs and commit the changes.

For more info: https://github.com/opendatahub-io/opendatahub-operator/actions/runs/12902824301

@lburgazzoli lburgazzoli force-pushed the RHOAIENG-16509-InstructLab branch 2 times, most recently from c191dbb to 8b953a6 Compare January 28, 2025 08:28
@lburgazzoli lburgazzoli force-pushed the RHOAIENG-16509-InstructLab branch from 8b953a6 to d989deb Compare January 28, 2025 19:32
@lburgazzoli
Copy link
Contributor Author

@HumairAK should I also change the related params.env var from PREINSTALLEDPIPELINES to MANAGEDPIPELINES ?

@lburgazzoli lburgazzoli force-pushed the RHOAIENG-16509-InstructLab branch from d989deb to b9ff986 Compare January 29, 2025 15:20
@HumairAK
Copy link
Contributor

@lburgazzoli yes I think that's good to do, to be consistent, we'll make the changes on dsp side as well
cc @gmfrasca

@lburgazzoli lburgazzoli force-pushed the RHOAIENG-16509-InstructLab branch from b9ff986 to 8cc7364 Compare January 31, 2025 06:58
@zdtsw
Copy link
Member

zdtsw commented Feb 3, 2025

so, we shall expect in opt/manifests/datasciencepipelines/base/params.env with two new entries, e.g:

MANAGEDPIPELINES="{\"instructLab\":{\"state\":\"Removed\"}}"
PLATFORMVERSION=2.18.0

precheck if KFTO is enabled or not will be done in DSPO, not ODH operator, is that correct?
no indication nor warning should be seen from DSC

need to updated with new example .spec.components.datasciencepipelines.managedPipelines.instructLab
https://github.com/opendatahub-io/opendatahub-operator/blob/main/README.md#example-datasciencecluster


extraParamsMap := map[string]string{
managedPipelineParamsKey: string(data),
platformVersionParamsKey: rr.Release.Version.String(),
Copy link
Member

Choose a reason for hiding this comment

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

why not have the platform version set done in func (s *componentHandler) Init(_ common.Platform)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

@lburgazzoli lburgazzoli force-pushed the RHOAIENG-16509-InstructLab branch from 78f6b66 to 16ad243 Compare February 3, 2025 07:58
@lburgazzoli
Copy link
Contributor Author

need to updated with new example .spec.components.datasciencepipelines.managedPipelines.instructLab https://github.com/opendatahub-io/opendatahub-operator/blob/main/README.md#example-datasciencecluster

done

Copy link
Member

@zdtsw zdtsw left a comment

Choose a reason for hiding this comment

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

LGTM

@mprahl
Copy link

mprahl commented Feb 3, 2025

The API definition looks good to me.

@lburgazzoli lburgazzoli marked this pull request as ready for review February 3, 2025 19:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: Todo
Development

Successfully merging this pull request may close these issues.

6 participants