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

Restructure the manifest files #2906

Conversation

andrewballantyne
Copy link
Member

@andrewballantyne andrewballantyne commented Jun 12, 2024

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

Description

Restructure the manifest files for the 3 types of deployments.

The goal is to make pure entry points and self link all needed parts, that way the operator doesn't need to know the internals of our manifests folder layout.

The three entry points are:

  • /manifests/odh/kustomization.yaml - ODH Operator
  • /manifests/rhoai/onprem/kustomization.yaml - RHOAI Operator for Self Managed deployments (onprem is an old name)
  • /manifests/rhoai/addon/kustomization.yaml - RHOAI OPerator for Managed deployments

How Has This Been Tested?

Added testing steps in the root README.md -- these steps will only apply going forward and don't help with the change itself as the operator owned a lot of the functionality.

Need to get the answers to the following questions:

Topic with Operator Team (slack)

OUT OF SCOPE of this PR is handling the out of date kustomize format. I'll follow up with proper updates to that when I'm not moving 100 some odd files.

Test Impact

None, manifest files.

Request review criteria:

Self checklist (all need to be checked):

  • The developer has manually tested the changes and verified that the changes work
  • Commits have been squashed into descriptive, self-contained units of work (e.g. 'WIP' and 'Implements feedback' style messages have been removed)
  • Testing instructions have been added in the PR body (for PRs involving changes that are not immediately obvious).
  • The developer has added tests or explained why testing cannot be added (unit or cypress tests for related changes)

If you have UI changes:

  • Included any necessary screenshots or gifs if it was a UI change.
  • Included tags to the UX team if it was a UI/UX change (find relevant UX in the SMEs section).

After the PR is posted & before it merges:

  • The developer has tested their solution on a cluster by using the image produced by the PR to main

I'll need help working through this -- cc @zdtsw @VaishnaviHire @lucferbux

@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress This PR is in WIP state label Jun 12, 2024
Copy link

codecov bot commented Jun 12, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 78.53%. Comparing base (e687eb8) to head (1882ce9).
Report is 4 commits behind head on main.

Current head 1882ce9 differs from pull request most recent head e71c8c0

Please upload reports for the commit e71c8c0 to get more accurate results.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #2906      +/-   ##
==========================================
- Coverage   79.34%   78.53%   -0.82%     
==========================================
  Files        1139     1139              
  Lines       24284    24171     -113     
  Branches     6186     6099      -87     
==========================================
- Hits        19268    18982     -286     
- Misses       5016     5189     +173     

see 141 files with indirect coverage changes


Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e687eb8...e71c8c0. Read the comment docs.

@openshift-merge-robot openshift-merge-robot added the needs-rebase PR needs to be rebased label Jun 13, 2024
@openshift-merge-robot openshift-merge-robot removed the needs-rebase PR needs to be rebased label Jun 14, 2024
@andrewballantyne andrewballantyne changed the title [WIP] Restructure the manifest files Restructure the manifest files Jun 19, 2024
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress This PR is in WIP state label Jun 19, 2024
@andrewballantyne
Copy link
Member Author

andrewballantyne commented Jun 19, 2024

/hold

Waiting on confirmation with the Operator team and managing a good time to release this where it doesn't toss a release into a mess. Might be for 2.12 RHOAI and 2.15 ODH -- TBD.

@openshift-ci openshift-ci bot added the do-not-merge/hold This PR is hold for some reason label Jun 19, 2024
@openshift-merge-robot openshift-merge-robot added the needs-rebase PR needs to be rebased label Jun 21, 2024
@openshift-merge-robot openshift-merge-robot removed the needs-rebase PR needs to be rebased label Jun 21, 2024
lucferbux

This comment was marked as resolved.

@lucferbux

This comment was marked as resolved.

manifests/odh/params.env Show resolved Hide resolved
manifests/rhoai/addon/params.env Show resolved Hide resolved
manifests/rhoai/onprem/params.env Show resolved Hide resolved
@andrewballantyne andrewballantyne force-pushed the restructure-manifests branch 2 times, most recently from 843d4a8 to 91e66dd Compare June 25, 2024 16:40
@andrewballantyne andrewballantyne dismissed lucferbux’s stale review June 26, 2024 14:22

Lucas' review was resolved

@andrewballantyne
Copy link
Member Author

Tested with Wen on her custom catalog source images -- going to be merging this on Tuesday. Monday I'm OOO and today is Code Freeze for 2.11 -- just to avoid the noise, we will wait until post that.

Copy link
Contributor

@lucferbux lucferbux left a comment

Choose a reason for hiding this comment

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

I've left a nit and a question, so far the rest looks great.
I've managed to get a deployment in ODH and I've managed to get a cluster to install the rhoai image, it's giving me some issues so I'll take a look tomorrow with @zdtsw

@lucferbux
Copy link
Contributor

lucferbux commented Jul 2, 2024

/lgtm

Everything seems great in rhoai too

@openshift-ci openshift-ci bot added the lgtm label Jul 2, 2024
@andrewballantyne andrewballantyne added approved and removed do-not-merge/hold This PR is hold for some reason labels Jul 2, 2024
Copy link
Contributor

openshift-ci bot commented Jul 2, 2024

[APPROVALNOTIFIER] This PR is APPROVED

Approval requirements bypassed by manually added approval.

This pull-request has been approved by:

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 18bfe2d into opendatahub-io:main Jul 2, 2024
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants