CMP-2693: Use CLI image for base image in must-gather #543
Conversation
The original approach for building a must-gather image specifically for Compliance Operator usage grabbed the latest stock must-gather image (the one for collecting everything in an ordinary deployment), and then pushing the original scripts out of the way and replacing them with Compliance Operator specific scripts to collect the information we wanted. While this worked, we can simplify the image dependency by just relying on the CLI image directly, since that's what the upstream must-gather image does, then just wire up the entry point to the collection scripts we already have, following the same pattern that the upstream must-gather image uses. This commit also updates the `Dockerfile` name to include `.ocp` suffix, since we're relying on a Red Hat registry to pull the CLI image.
|
@rhmdnd: This pull request references CMP-2693 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the sub-task to target the "4.17.0" version, but no target version was set. In response to this:
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 openshift-eng/jira-lifecycle-plugin repository. |
rhmdnd
requested review from
yuumasato,
Vincent056 and
xiaojiey
and removed request for
mrogers950
|
Hint for reviewers is to build the new image locally, and it should work with |
|
/jira-refresh |
|
/hold for test |
|
/test e2e-aws-parallel Failure during metrics tests... which may be transient. |
|
🤖 To deploy this PR, run the following command: |
|
I'm unable to deploy the PR. @rhmdnd Could you please help me deploy the pr? |
you would have to build image and use it, we don't have workflow to build PR image for the must-gather yet |
You should be able to do this by overriding |
|
Verification failed at deployment step with below error PR #546 has been raised to fix the issue. |
|
Verification failed with 4.17.0-0.nightly-2024-07-07-131215 + #543 + Copied the lines of #546 into Makefile Executed Check below files for more details |
you should use oc adm must-gather --image=quay.io/bgudi/must-gather-ocp:pr-543-new Right? |
|
@prb112 Still observing the same error with |
|
❯ crane manifest quay.io/bgudi/must-gather-ocp:pr-543-new I think your repo is private |
|
Verification passed with 4.17.0-0.nightly-2024-07-07-131215 + #543 + Copied conent of #546 into Makefile
|
|
/unhold |
|
/label qe-approved |
|
@rhmdnd: This pull request references CMP-2693 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the sub-task to target either version "4.17." or "openshift-4.17.", but it targets "compliance-operator-1.6.0" instead. In response to this:
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 openshift-eng/jira-lifecycle-plugin repository. |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: rhmdnd, Vincent056, yuumasato 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 |
|
/hold for a while as there is some confusion with image used. |
|
/unhold |
|
/test e2e-rosa ROSA e2e failed on unrelated authentication errors. |
|
/test e2e-aws-parallel |
openshift-merge-bot
bot
merged commit e691a11
into
ComplianceAsCode:master
The original approach for building a must-gather image specifically for
Compliance Operator usage grabbed the latest stock must-gather image
(the one for collecting everything in an ordinary deployment), and then
pushing the original scripts out of the way and replacing them with
Compliance Operator specific scripts to collect the information we
wanted.
While this worked, we can simplify the image dependency by just relying
on the CLI image directly, since that's what the upstream must-gather
image does, then just wire up the entry point to the collection scripts
we already have, following the same pattern that the upstream
must-gather image uses.
This commit also updates the
Dockerfilename to include.ocpsuffix,since we're relying on a Red Hat registry to pull the CLI image.