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

[Sync]: incubation to rhoai #1405

Merged

Conversation

zdtsw
Copy link
Member

@zdtsw zdtsw commented Nov 28, 2024

Description

#1376
#1382
#1384
#1381

  • a fix

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

@zdtsw zdtsw added the rhoai label Nov 28, 2024
@openshift-ci openshift-ci bot requested review from grdryn and lburgazzoli November 28, 2024 19:31
@grdryn
Copy link
Member

grdryn commented Nov 29, 2024

/test opendatahub-operator-e2e

@grdryn
Copy link
Member

grdryn commented Nov 29, 2024

/test opendatahub-operator-e2e

(different failure than previous attempt)

@zdtsw
Copy link
Member Author

zdtsw commented Nov 29, 2024

/test opendatahub-operator-e2e

1 similar comment
@zdtsw
Copy link
Member Author

zdtsw commented Nov 29, 2024

/test opendatahub-operator-e2e

Copy link

codecov bot commented Dec 1, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Please upload report for BASE (rhoai@76cae1b). Learn more about missing BASE report.

Additional details and impacted files
@@           Coverage Diff            @@
##             rhoai    #1405   +/-   ##
========================================
  Coverage         ?   18.87%           
========================================
  Files            ?       30           
  Lines            ?     3338           
  Branches         ?        0           
========================================
  Hits             ?      630           
  Misses           ?     2639           
  Partials         ?       69           

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

@zdtsw zdtsw requested a review from VaishnaviHire December 2, 2024 09:07
zdtsw and others added 5 commits December 2, 2024 10:08
Signed-off-by: Wen Zhou <wenzhou@redhat.com>
(cherry picked from commit 4a15a8f)
Signed-off-by: Wen Zhou <wenzhou@redhat.com>
)

The commit
a107703 ("feat(fips): enable GO_ENABLED in build (opendatahub-io#1001)")

enabled CGO which makes problems for builders on non-x86 platforms.

Make it as an in the Dockerfile keeping default the same (enabled),
but make it possible to override with either environment
(`export CGO_ENABLED=0`) or make (`make CGO_ENABLED=0 image-build`)

Signed-off-by: Yauheni Kaliuta <ykaliuta@redhat.com>
(cherry picked from commit 2d94349)
Get USE_LOCAL image build flag from makefile variable to make it
overridable with `make USE_LOCAL=true image`

Do not allow to get its value for environment be default due to
pretty generic name.

This is shorter than the old recommendation of overriding
IMAGE_BUILD_FLAGS. And since now CGO_ENABLED is also a flag, does
not mess up with it.

* USE_LOCAL=true uses existing manifests from opt/manifests for the
produced image without downloading them with get_all_manifests.sh
making it possible to both save time and make local amendments.

Signed-off-by: Yauheni Kaliuta <ykaliuta@redhat.com>
(cherry picked from commit cea41dc)
We can combine two build stages into one, as there is no need to
always build both images (not done by podman) to only then decide
from which one we want to copy manifests to the target
image. Instead manifests stage will either copy local manifests or
fetches using the script based on USE_LOCAL argument.

Move USE_LOCAL and OVERWIRTE_MANIFESTS args under FROM since args
have scope of the FROM they are declared in.

It requires opt/manifests directory to exist, but since it's a part
of git repo, it's fine.

Original patch from: Bartosz Majsak <bartosz.majsak@gmail.com> [1]

[1] opendatahub-io#773

Signed-off-by: Yauheni Kaliuta <ykaliuta@redhat.com>
(cherry picked from commit c1671ab)
- changes made in odh, missing manifests for rhoai
  since it is only using builder for main and others from manifests stage

Signed-off-by: Wen Zhou <wenzhou@redhat.com>
@zdtsw
Copy link
Member Author

zdtsw commented Dec 2, 2024

/test ci-index

Copy link
Member

@VaishnaviHire VaishnaviHire left a comment

Choose a reason for hiding this comment

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

/lgtm

Copy link

openshift-ci bot commented Dec 2, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: VaishnaviHire

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-ci openshift-ci bot added the approved label Dec 2, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit bcfb033 into opendatahub-io:rhoai Dec 2, 2024
10 checks passed
MarianMacik pushed a commit to MarianMacik/opendatahub-operator that referenced this pull request Jan 22, 2025
…flux/component-updates/odh-modelmesh-serving-controller-v2-17

chore(deps): update odh-modelmesh-serving-controller-v2-17 to abdc8dc
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

4 participants