Dockerfile: merges manifests builder stages to one

ykaliuta commented 1 week ago

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] https://github.com/opendatahub-io/opendatahub-operator/pull/773

Description

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

ykaliuta commented 1 week ago

/cc @bartoszmajsak @zdtsw

codecov[bot] commented 1 week ago

Codecov Report

All modified and coverable lines are covered by tests :white_check_mark:

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

Additional details and impacted files

```diff @@ Coverage Diff @@ ## incubation #1381 +/- ## ============================================= Coverage ? 18.91% ============================================= Files ? 30 Lines ? 3399 Branches ? 0 ============================================= Hits ? 643 Misses ? 2687 Partials ? 69 ```

:umbrella: View full report in Codecov by Sentry.
:loudspeaker: Have feedback on the report? Share it here.

🚨 Try these New Features:

Flaky Tests Detection - Detect and resolve failed and flaky tests

ykaliuta commented 1 week ago

rebased

ykaliuta commented 1 week ago

/retest-required

ykaliuta commented 1 week ago

@zdtsw sorry for disturbing, but could you recheck it after rebase?

openshift-ci[bot] commented 1 week ago

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: zdtsw

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: - ~~[OWNERS](https://github.com/opendatahub-io/opendatahub-operator/blob/incubation/OWNERS)~~ [zdtsw] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment

opendatahub-io / opendatahub-operator