feat: Mapping component versions to RHOAI releases #1299

Sara4994 · 2024-10-11T19:47:45Z

<!---
Many thanks for submitting your Pull Request ❤️!

Please complete the following sections for a smooth review.
-->

Description

The PR is a first step to the feature initiative tracked in JIRA and this PR adds feature to capture RHOAI release versions from all the components(that are supported by DSC) repositories and include it in the DSC status.

JIRA: https://issues.redhat.com/browse/RHOAIENG-12619

How Has This Been Tested?

To test with DevFlags:

In a forked version of the components repository and create an .env file in config/manifest directory, have it in your branch.
Point that forked repository as a DevFlag like this
Build and deploy the changes into the cluster.
Create DSCI and DSC instances and you will be able see the status.components get updated with component upstream release details like below

`
apiVersion: datasciencecluster.opendatahub.io/v1
kind: DataScienceCluster
metadata:

spec:
components:

status:
components:
datasciencepipelines
upstreamReleases:
- name: datasciencepipelines
displayName: Red Hat Build of Kubeflow Pipelines
version: 2.2.0
repoUrl: https://github.com/opendatahub-io/data-science-pipelines
`

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

openshift-ci · 2024-10-11T19:47:57Z

[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 sara4994. For more information see the Kubernetes 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:

OWNERS

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

ykaliuta · 2024-10-14T06:34:04Z

It's still draft, isn't it?

apis/datasciencecluster/v1/datasciencecluster_types.go

components/codeflare/codeflare.go

components/component.go

lburgazzoli · 2024-10-14T07:00:45Z

@Sara4994 I'd like to see this kind of steps to be performed only once i.e. at initialization time as component version won't change during the lifetime of the operator.

github-actions · 2024-10-18T12:56:45Z

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/11404123045

components/codeflare/codeflare.go

components/datasciencepipelines/datasciencepipelines.go

components/ray/ray.go

github-actions · 2024-10-21T17:48:42Z

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/11445735405

codecov · 2024-10-21T17:49:59Z

Codecov Report

Attention: Patch coverage is 0% with 5 lines in your changes missing coverage. Please review.

Please upload report for BASE (incubation@bde4b4e). Learn more about missing BASE report.

Files with missing lines	Patch %	Lines
...atasciencecluster/datasciencecluster_controller.go	0.00%	5 Missing ⚠️

Additional details and impacted files

@@              Coverage Diff              @@
##             incubation    #1299   +/-   ##
=============================================
  Coverage              ?   19.09%           
=============================================
  Files                 ?       30           
  Lines                 ?     3368           
  Branches              ?        0           
=============================================
  Hits                  ?      643           
  Misses                ?     2656           
  Partials              ?       69

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

github-actions · 2024-10-21T17:57:13Z

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/11445853071

zdtsw · 2024-10-27T16:30:27Z

do not checkin manager binary

zdtsw

some small parts, otherwise i am fine with the changes.

controllers/status/status.go

controllers/datasciencecluster/datasciencecluster_controller.go

Sara4994 · 2024-10-29T05:54:03Z

/test opendatahub-operator-e2e

github-actions · 2024-10-29T17:24:16Z

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/11579205049

…omponents

Sara4994 · 2024-10-29T17:36:43Z

@ykaliuta @zdtsw @VaishnaviHire @lburgazzoli I have tweaked GetReleaseVersion function to read release info from an yaml file instead of an env.

Reason: few components have got multiple upstreams, reading release info of multiple upstreams from an env would be tricky, whereas with yaml we could group the info based on the upstream, and it would be easy to fetch the details at our end. So made it as yaml file.

Please feel free to share your thoughts.

Sara4994 · 2024-11-01T12:28:13Z

/cc @grdryn

grdryn

/hold

(at least until ./manager is removed from the patch set)

controllers/status/status.go

manager

pkg/common/common.go

controllers/status/status.go

components/codeflare/codeflare.go

controllers/status/status.go

grdryn · 2024-11-04T12:38:20Z

/unhold

It looks like, for better or worse, the merge automation in this repo will squash all commits in a PR into a single commit, when merging, so the fact that the manager binary was added and then removed in separate commits won't matter: those should cancel each other out and it won't exist in the final history.

controllers/status/status.go

lburgazzoli · 2024-11-04T14:28:17Z

controllers/status/status.go

+
+// GetReleaseVersion reads odh_metadata.yaml file and parses release information.
+// If version is not set or set to "", return empty {}.
+func GetReleaseVersion(defaultManifestPath string, componentName string) ComponentStatus {


I think GetReleaseVersion should return a []ComponentReleaseStatus not the entire ComponentStatus

@lburgazzoli but incase of yaml file not present in the components repo, we discussed to show empty struct against component names. such error conditions are handled in the functions itself so as returning empty struct. When returning []ComponentReleaseStatus , will have to handle error cases in components.

you can return an empty list, if you sue omitempty in the tags, then it won't not show up

@lburgazzoli yep, have made this changes now. :)

I think GetReleaseVersion should return a []ComponentReleaseStatus not the entire ComponentStatus

If it returns ReleaseStatus, why it's still called GetReleaseVersion? (asked @Sara4994 already)

@ykaliuta renamed it now. thanks

lburgazzoli · 2024-11-05T08:21:51Z

controllers/status/status.go

+	componentReleaseStatus := make([]ComponentReleaseStatus, 0)
+
+	yamlData, err := os.ReadFile(filepath.Join(defaultManifestPath, componentName, "odh_metadata.yaml"))
+	if err != nil {


I think we need to distinguish between a file not present from an error, in this case we are swallowing it and I'm not sure that's the right approach as it could hide some other errors.

this is done

openshift-ci bot requested review from biswassri and StevenTobin October 11, 2024 19:47

Sara4994 force-pushed the update-component-status branch from 4b85fbc to d29af02 Compare October 13, 2024 20:04

Sara4994 mentioned this pull request Oct 13, 2024

feat: Fetch release versions and add it in DSC status #1274

Closed

5 tasks

lburgazzoli reviewed Oct 14, 2024

View reviewed changes

apis/datasciencecluster/v1/datasciencecluster_types.go Outdated Show resolved Hide resolved

lburgazzoli reviewed Oct 14, 2024

View reviewed changes

components/codeflare/codeflare.go Outdated Show resolved Hide resolved

lburgazzoli reviewed Oct 14, 2024

View reviewed changes

components/component.go Outdated Show resolved Hide resolved

openshift-merge-robot added the needs-rebase label Oct 17, 2024

Sara4994 force-pushed the update-component-status branch from d29af02 to 1038ec1 Compare October 18, 2024 12:52

openshift-merge-robot removed the needs-rebase label Oct 18, 2024

Sara4994 force-pushed the update-component-status branch from 1038ec1 to 35692d9 Compare October 18, 2024 12:55

Sara4994 force-pushed the update-component-status branch 3 times, most recently from 3a935ab to 210bde1 Compare October 20, 2024 19:42

ykaliuta suggested changes Oct 21, 2024

View reviewed changes

components/codeflare/codeflare.go Outdated Show resolved Hide resolved

components/datasciencepipelines/datasciencepipelines.go Outdated Show resolved Hide resolved

components/ray/ray.go Outdated Show resolved Hide resolved

openshift-ci bot assigned ykaliuta Oct 21, 2024

Sara4994 force-pushed the update-component-status branch from 210bde1 to cfea723 Compare October 21, 2024 17:47

Sara4994 force-pushed the update-component-status branch from cfea723 to 8181671 Compare October 21, 2024 17:56

Sara4994 force-pushed the update-component-status branch 4 times, most recently from f3bb873 to 21bdd88 Compare October 21, 2024 18:19

VaishnaviHire requested a review from zdtsw October 21, 2024 20:02

Remove component status when component is not managed

7dcd0e4

Sara4994 force-pushed the update-component-status branch from e311476 to 7dcd0e4 Compare October 26, 2024 08:56

zdtsw reviewed Oct 27, 2024

View reviewed changes

Sara4994 force-pushed the update-component-status branch 2 times, most recently from 73bdce6 to 6600709 Compare October 28, 2024 14:10

Moved RegistriesNamespace to modelregistry component

12889bd

Sara4994 force-pushed the update-component-status branch from 04bee7b to 12889bd Compare October 28, 2024 17:28

Read info from yaml file and support to read multiple upstreams for c…

89d0ef9

…omponents

Sara4994 force-pushed the update-component-status branch from 68e228a to 89d0ef9 Compare October 29, 2024 17:29

openshift-ci bot requested a review from grdryn November 1, 2024 12:28

grdryn reviewed Nov 1, 2024

View reviewed changes

openshift-ci bot added the do-not-merge/hold label Nov 1, 2024

Sara4994 force-pushed the update-component-status branch from 383fcf6 to 99da1f1 Compare November 1, 2024 16:42

openshift-ci bot removed the do-not-merge/hold label Nov 4, 2024

grdryn reviewed Nov 4, 2024

View reviewed changes

controllers/status/status.go Outdated Show resolved Hide resolved

controllers/status/status.go Outdated Show resolved Hide resolved

controllers/status/status.go Outdated Show resolved Hide resolved

Sara4994 force-pushed the update-component-status branch from 99da1f1 to 0dd61dc Compare November 4, 2024 12:57

restored parseParams methods and removed manager file

0a8ed69

Sara4994 force-pushed the update-component-status branch from 0dd61dc to 0a8ed69 Compare November 4, 2024 12:59

lburgazzoli reviewed Nov 4, 2024

View reviewed changes

lburgazzoli reviewed Nov 5, 2024

View reviewed changes

Sara4994 force-pushed the update-component-status branch 2 times, most recently from ef0129c to 4807565 Compare November 5, 2024 11:26

GetReleaseStatus function refactor

13f55fd

Sara4994 force-pushed the update-component-status branch from 4807565 to 13f55fd Compare November 6, 2024 13:45

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Mapping component versions to RHOAI releases #1299

feat: Mapping component versions to RHOAI releases #1299

Sara4994 commented Oct 11, 2024 •

edited

Loading

openshift-ci bot commented Oct 11, 2024

ykaliuta commented Oct 14, 2024

lburgazzoli commented Oct 14, 2024

github-actions bot commented Oct 18, 2024

github-actions bot commented Oct 21, 2024

codecov bot commented Oct 21, 2024 •

edited

Loading

github-actions bot commented Oct 21, 2024

zdtsw commented Oct 27, 2024

zdtsw left a comment

Sara4994 commented Oct 29, 2024

github-actions bot commented Oct 29, 2024

Sara4994 commented Oct 29, 2024 •

edited

Loading

Sara4994 commented Nov 1, 2024

grdryn left a comment

grdryn commented Nov 4, 2024

lburgazzoli Nov 4, 2024

Sara4994 Nov 5, 2024

lburgazzoli Nov 5, 2024

Sara4994 Nov 5, 2024 •

edited

Loading

ykaliuta Nov 6, 2024

Sara4994 Nov 6, 2024

lburgazzoli Nov 5, 2024

Sara4994 Nov 5, 2024

feat: Mapping component versions to RHOAI releases #1299

Are you sure you want to change the base?

feat: Mapping component versions to RHOAI releases #1299

Conversation

Sara4994 commented Oct 11, 2024 • edited Loading

Description

How Has This Been Tested?

Screenshot or short clip

Merge criteria

openshift-ci bot commented Oct 11, 2024

ykaliuta commented Oct 14, 2024

lburgazzoli commented Oct 14, 2024

github-actions bot commented Oct 18, 2024

This PR can't be merged just yet 😢

github-actions bot commented Oct 21, 2024

This PR can't be merged just yet 😢

codecov bot commented Oct 21, 2024 • edited Loading

Codecov Report

github-actions bot commented Oct 21, 2024

This PR can't be merged just yet 😢

zdtsw commented Oct 27, 2024

zdtsw left a comment

Choose a reason for hiding this comment

Sara4994 commented Oct 29, 2024

github-actions bot commented Oct 29, 2024

This PR can't be merged just yet 😢

Sara4994 commented Oct 29, 2024 • edited Loading

Sara4994 commented Nov 1, 2024

grdryn left a comment

Choose a reason for hiding this comment

grdryn commented Nov 4, 2024

lburgazzoli Nov 4, 2024

Choose a reason for hiding this comment

Sara4994 Nov 5, 2024

Choose a reason for hiding this comment

lburgazzoli Nov 5, 2024

Choose a reason for hiding this comment

Sara4994 Nov 5, 2024 • edited Loading

Choose a reason for hiding this comment

ykaliuta Nov 6, 2024

Choose a reason for hiding this comment

Sara4994 Nov 6, 2024

Choose a reason for hiding this comment

lburgazzoli Nov 5, 2024

Choose a reason for hiding this comment

Sara4994 Nov 5, 2024

Choose a reason for hiding this comment

Sara4994 commented Oct 11, 2024 •

edited

Loading

codecov bot commented Oct 21, 2024 •

edited

Loading

Sara4994 commented Oct 29, 2024 •

edited

Loading

Sara4994 Nov 5, 2024 •

edited

Loading