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

feat(codeflare): support unmanaged #604

Closed
wants to merge 1 commit into from

Conversation

zdtsw
Copy link
Member

@zdtsw zdtsw commented Oct 5, 2023

Description

for the scope fo 1.35/2.4, since CFO will be on TP, we can keep the same logic of ODH operator
and add more to handle "unmanaged" if it is needed in 2.5

  • introduce new value of Unmanaged.
  • old logic of handling "enable" is changed to match "managementState==Managed"
  • set codeflare and ray by default as Unamaged when create default DSC instance

ref: #600
depend on #652

How Has This Been Tested?

new test

wait for rebase after #652 to update

old test

when set "codeflare" to Unmanaged, when others are either Managed or Removed
it does not block codeflare(no reconcile on missing CFO):
Screenshot from 2023-10-18 15-15-45

Screenshot from 2023-10-18 14-53-39
and it applied codeflare's manifests
Screenshot from 2023-10-18 14-54-34
and created imagestream
Screenshot from 2023-10-18 15-14-03

Merge criteria:

  • The commits are squashed in a cohesive manner and have meaningful messages.
  • 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
Copy link

openshift-ci bot commented Oct 5, 2023

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

@openshift-ci
Copy link

openshift-ci bot commented Oct 5, 2023

[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 assign vaishnavihire for approval. 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:

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

@zdtsw zdtsw changed the title feat(codeflare): support unmanaged and update manifests location [WIP]feat(codeflare): support unmanaged and update manifests location Oct 6, 2023
@zdtsw zdtsw force-pushed the issue/600_1 branch 2 times, most recently from d61a87e to c42b985 Compare October 8, 2023 14:13
@zdtsw
Copy link
Member Author

zdtsw commented Oct 8, 2023

/test all

@zdtsw
Copy link
Member Author

zdtsw commented Oct 9, 2023

/test opendatahub-operator-e2e

@zdtsw
Copy link
Member Author

zdtsw commented Oct 9, 2023

/test all

@zdtsw zdtsw changed the title [WIP]feat(codeflare): support unmanaged and update manifests location feat(codeflare): support unmanaged and update manifests location Oct 19, 2023
@zdtsw zdtsw marked this pull request as ready for review October 19, 2023 12:47
@openshift-ci openshift-ci bot requested review from etirelli and LaVLaS October 19, 2023 12:47
@zdtsw zdtsw requested a review from VaishnaviHire October 19, 2023 12:48
@VaishnaviHire
Copy link
Member

When I uninstall the existing codeflare operator, and the state is set to Managed I see following error

    Component reconciliation failed: error during resmap resources:
        accumulating resources: accumulation err='accumulating resources from
        '../default': '/opt/manifests/codeflare/default' must resolve to a
        file': recursed accumulation of path '/opt/manifests/codeflare/default':
        accumulating resources: accumulation err='accumulating resources from
        '../crd': '/opt/manifests/codeflare/crd' must resolve to a file':
        recursed accumulation of path '/opt/manifests/codeflare/crd':
        accumulating resources: accumulation err='accumulating resources from
        'mcad': '/opt/manifests/codeflare/crd/mcad' must resolve to a file':
        recursed accumulation of path '/opt/manifests/codeflare/crd/mcad':
        accumulating resources: accumulation err='accumulating resources from
        'github.com/project-codeflare/multi-cluster-app-dispatcher/config/crd?ref=v0.0.0':
        evalsymlink failure on
        '/opt/manifests/codeflare/crd/mcad/github.com/project-codeflare/multi-cluster-app-dispatcher/config/crd?ref=v0.0.0'
        : lstat /opt/manifests/codeflare/crd/mcad/github.com: no such file or
        directory': no 'git' program on path: exec: "git": executable file not
        found in $PATH

@VaishnaviHire
Copy link
Member

Should we include the changes for unmanaged support in separate PR, since those changes would not be included in the main branch

@zdtsw
Copy link
Member Author

zdtsw commented Oct 20, 2023

When I uninstall the existing codeflare operator, and the state is set to Managed I see following error

    Component reconciliation failed: error during resmap resources:
        accumulating resources: accumulation err='accumulating resources from
        '../default': '/opt/manifests/codeflare/default' must resolve to a
        file': recursed accumulation of path '/opt/manifests/codeflare/default':
        accumulating resources: accumulation err='accumulating resources from
        '../crd': '/opt/manifests/codeflare/crd' must resolve to a file':
        recursed accumulation of path '/opt/manifests/codeflare/crd':
        accumulating resources: accumulation err='accumulating resources from
        'mcad': '/opt/manifests/codeflare/crd/mcad' must resolve to a file':
        recursed accumulation of path '/opt/manifests/codeflare/crd/mcad':
        accumulating resources: accumulation err='accumulating resources from
        'github.com/project-codeflare/multi-cluster-app-dispatcher/config/crd?ref=v0.0.0':
        evalsymlink failure on
        '/opt/manifests/codeflare/crd/mcad/github.com/project-codeflare/multi-cluster-app-dispatcher/config/crd?ref=v0.0.0'
        : lstat /opt/manifests/codeflare/crd/mcad/github.com: no such file or
        directory': no 'git' program on path: exec: "git": executable file not
        found in $PATH

i was talking to DW team yesterday, as they are still using
github.com/project-codeflare/multi-cluster-app-dispatcher/config/crd?ref=v0.0.0
after manifests has been moved to the new CFO git repo, i will check with them again how they can change that

@zdtsw
Copy link
Member Author

zdtsw commented Oct 20, 2023

Should we include the changes for unmanaged support in separate PR, since those changes would not be included in the main branch

good idea!
will have another one and leave this only for the CF manifests

- set default to CFO unmanaged + Ray managed than previous removed
- Add e2e test and add component name into message
  - update e2e test log
- update(codeflare): flip logic after find CFO already installed

Signed-off-by: Wen Zhou <[email protected]>
@zdtsw zdtsw changed the title feat(codeflare): support unmanaged and update manifests location feat(codeflare): support unmanaged Oct 20, 2023
@VaishnaviHire VaishnaviHire added the incubating Added to issues that are currently incubating in ODH label Oct 20, 2023
@openshift-merge-robot
Copy link
Contributor

PR needs rebase.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@VaishnaviHire
Copy link
Member

@zdtsw Are these changes still needed?

@zdtsw
Copy link
Member Author

zdtsw commented Dec 7, 2023

close it since we have changed the way to deploy codeflare

@zdtsw zdtsw closed this Dec 7, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
incubating Added to issues that are currently incubating in ODH needs-rebase
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

3 participants