NO_JIRA: chore(dependencies): Update dependencies to be aligned with Hypershift repo#184
NO_JIRA: chore(dependencies): Update dependencies to be aligned with Hypershift repo#184jparrill wants to merge 2 commits intoopenshift:mainfrom
Conversation
|
Note Reviews pausedIt looks like this branch is under active development. To avoid overwhelming you with review comments due to an influx of new commits, CodeRabbit has automatically paused this review. You can configure this behavior by changing the Use the following commands to manage reviews:
Use the checkboxes below for quick actions:
WalkthroughUpdated Changes
Estimated code review effort🎯 4 (Complex) | ⏱️ ~45 minutes ✨ Finishing Touches🧪 Generate unit tests (beta)
Comment |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: jparrill The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
cca1ca6 to
879b3cc
Compare
|
/lgtm |
|
/retest Now that this got merged: |
|
New changes are detected. LGTM label has been removed. |
…t repository Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Signed-off-by: Juan Manuel Parrilla Madrid <jparrill@redhat.com>
2253be9 to
1ae944a
Compare
There was a problem hiding this comment.
Actionable comments posted: 2
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Inline comments:
In `@Dockerfile.oadp`:
- Around line 22-23: The final stage still runs "RUN unlink /etc/rhsm-host"
which can fail if the file doesn't exist; change that command to safely remove
the file only if present (e.g., check existence or use a no-error removal) so
the build won't fail, and keep the existing conditional registration line "RUN
if [ -e \"/activation-key/org\" ]; then subscription-manager register --org
$(cat \"/activation-key/org\") --activationkey $(cat
\"/activation-key/activationkey\"); fi" unchanged except ensuring it follows the
safe unlink removal; update the Dockerfile final stage where "unlink
/etc/rhsm-host" appears (the RUN unlink /etc/rhsm-host invocation) to use the
safe removal approach.
- Around line 11-12: The Dockerfile uses unlink /etc/rhsm-host which fails if
the file/symlink is absent; change that RUN step to safely remove the path
(e.g., test for existence or use a no-fail removal) so the build doesn't error,
e.g. replace the unlink invocation with a conditional removal (check -e or -L)
or a force-remove (rm -f) before the subscription-manager register line; keep
the subscription-manager register logic (the RUN that checks /activation-key/org
and calls subscription-manager register) unchanged so the activation-key flow
still executes.
Dockerfile.oadp
Outdated
| RUN unlink /etc/rhsm-host | ||
| RUN if [ -e "/activation-key/org" ]; then subscription-manager register --org $(cat "/activation-key/org") --activationkey $(cat "/activation-key/activationkey"); fi |
There was a problem hiding this comment.
unlink may fail if /etc/rhsm-host does not exist.
The unlink /etc/rhsm-host command will fail with a non-zero exit code if the symlink doesn't exist, breaking builds in environments without RHSM host configuration.
Proposed fix
-RUN unlink /etc/rhsm-host
+RUN rm -f /etc/rhsm-host || true📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
| RUN unlink /etc/rhsm-host | |
| RUN if [ -e "/activation-key/org" ]; then subscription-manager register --org $(cat "/activation-key/org") --activationkey $(cat "/activation-key/activationkey"); fi | |
| RUN rm -f /etc/rhsm-host || true | |
| RUN if [ -e "/activation-key/org" ]; then subscription-manager register --org $(cat "/activation-key/org") --activationkey $(cat "/activation-key/activationkey"); fi |
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.
In `@Dockerfile.oadp` around lines 11 - 12, The Dockerfile uses unlink
/etc/rhsm-host which fails if the file/symlink is absent; change that RUN step
to safely remove the path (e.g., test for existence or use a no-fail removal) so
the build doesn't error, e.g. replace the unlink invocation with a conditional
removal (check -e or -L) or a force-remove (rm -f) before the
subscription-manager register line; keep the subscription-manager register logic
(the RUN that checks /activation-key/org and calls subscription-manager
register) unchanged so the activation-key flow still executes.
Dockerfile.oadp
Outdated
| RUN unlink /etc/rhsm-host | ||
| RUN if [ -e "/activation-key/org" ]; then subscription-manager register --org $(cat "/activation-key/org") --activationkey $(cat "/activation-key/activationkey"); fi |
There was a problem hiding this comment.
Same unlink issue in the final stage.
Apply the same fix here to avoid build failures when /etc/rhsm-host doesn't exist.
Proposed fix
-RUN unlink /etc/rhsm-host
+RUN rm -f /etc/rhsm-host || true📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
| RUN unlink /etc/rhsm-host | |
| RUN if [ -e "/activation-key/org" ]; then subscription-manager register --org $(cat "/activation-key/org") --activationkey $(cat "/activation-key/activationkey"); fi | |
| RUN rm -f /etc/rhsm-host || true | |
| RUN if [ -e "/activation-key/org" ]; then subscription-manager register --org $(cat "/activation-key/org") --activationkey $(cat "/activation-key/activationkey"); fi |
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.
In `@Dockerfile.oadp` around lines 22 - 23, The final stage still runs "RUN unlink
/etc/rhsm-host" which can fail if the file doesn't exist; change that command to
safely remove the file only if present (e.g., check existence or use a no-error
removal) so the build won't fail, and keep the existing conditional registration
line "RUN if [ -e \"/activation-key/org\" ]; then subscription-manager register
--org $(cat \"/activation-key/org\") --activationkey $(cat
\"/activation-key/activationkey\"); fi" unchanged except ensuring it follows the
safe unlink removal; update the Dockerfile final stage where "unlink
/etc/rhsm-host" appears (the RUN unlink /etc/rhsm-host invocation) to use the
safe removal approach.
85f9eb6 to
4afd49b
Compare
There was a problem hiding this comment.
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Duplicate comments:
In `@Dockerfile.oadp`:
- Line 11: The RUN unlink /etc/rhsm-host step can fail the build if the file
doesn't exist; change it to a guarded removal such as checking existence before
unlinking (e.g., test -e /etc/rhsm-host && unlink /etc/rhsm-host) or append a
no-fail fallback (e.g., unlink /etc/rhsm-host || true) so the Docker build won't
error when /etc/rhsm-host is absent.
4afd49b to
de79683
Compare
There was a problem hiding this comment.
| value: "false" |
There was a problem hiding this comment.
| value: "false" |
Update task bundle references and apply migration changes: - init 0.2→0.3: remove deprecated params (image-url, rebuild, skip-checks) - Remove pipeline-level rebuild parameter - Remove when conditions referencing init.results.build - clair-scan 0.2→0.3: add matrix for image-platform - clamav-scan 0.2→0.3: add matrix for image-arch - ecosystem-cert-preflight-checks: add matrix for platform - Update all task bundle SHA digests to latest versions Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Signed-off-by: Juan Manuel Parrilla Madrid <jparrill@redhat.com>
de79683 to
66180e7
Compare
|
@jparrill: all tests passed! Full PR test history. Your PR dashboard. DetailsInstructions 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-sigs/prow repository. I understand the commands that are listed here. |
Apart from the deps bump, also added the .work to the gitignore file