USHIFT-7058: Build and use small OLM catalog#6747
Conversation
|
@pmtk: This pull request references USHIFT-7058 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 bug to target the "5.0.0" version, but no target version was set. DetailsIn 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. |
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: Repository YAML (base), Central YAML (inherited) Review profile: CHILL Plan: Enterprise Run ID: 📒 Files selected for processing (1)
🚧 Files skipped from review as they are similar to previous changes (1)
WalkthroughThis PR adds a hello-microshift OLM bundle and metadata, a script to build/push a file-based OLM catalog image, updates CatalogSource and Subscription test assets to use the new catalog/operator, and adjusts the Robot Framework OLM test suite accordingly. ChangesOLM Operator Integration
🎯 3 (Moderate) | ⏱️ ~20 minutes 🚥 Pre-merge checks | ✅ 15✅ Passed checks (15 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
Comment |
|
Skipping CI for Draft Pull Request. |
|
/test ? |
|
/test e2e-aws-tests-bootc-el9 |
There was a problem hiding this comment.
Actionable comments posted: 1
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@test/assets/olm/hello-microshift-operator/build-catalog.sh`:
- Around line 24-27: The --image) case unconditionally assigns IMAGE="$2" and
shift 2 which under set -u will blow up if the caller passed --image without a
value; update the --image) branch in the script to first verify a value exists
(e.g. check $# -lt 2 or test -z "${2-}") and if missing print a clear
usage/error and exit non‑zero, otherwise set IMAGE="$2" and shift 2 as before;
reference the --image) case, IMAGE variable, shift 2, and account for set -u
when implementing the guard.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository YAML (base), Central YAML (inherited)
Review profile: CHILL
Plan: Enterprise
Run ID: 6458ed7a-ea3d-404e-80e0-cc0e29479e26
📒 Files selected for processing (7)
test/assets/olm/catalog-source.yamltest/assets/olm/hello-microshift-operator/build-catalog.shtest/assets/olm/hello-microshift-operator/catalog-extra.yamltest/assets/olm/hello-microshift-operator/manifests/hello-microshift-operator.clusterserviceversion.yamltest/assets/olm/hello-microshift-operator/metadata/annotations.yamltest/assets/olm/subscription.yamltest/suites/optional/olm.robot
redhat-operator-index is almost 5GiB in size which might have been causing flakiness
There was a problem hiding this comment.
🧹 Nitpick comments (1)
test/assets/olm/hello-microshift-operator/build-catalog.sh (1)
64-64: ⚡ Quick winPin the
opmbase image to an immutable digest in the generatedcatalog.Dockerfile.
build-catalog.shemitsFROM quay.io/operator-framework/opm:latest, which makes catalog builds non-deterministic; pin toquay.io/operator-framework/opm@sha256:...instead. (No Operator Framework docs were found that specify a single “recommended” digest, so the digest should be resolved/pinned by the repo/CI policy.)Proposed change
-FROM quay.io/operator-framework/opm:latest +FROM quay.io/operator-framework/opm@sha256:<resolved-digest>Which pinned `quay.io/operator-framework/opm` digest should we standardize on for this repo/CI (since docs don’t provide one), and can we store it in a variable so the generated `catalog.Dockerfile` is fully immutable?🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@test/assets/olm/hello-microshift-operator/build-catalog.sh` at line 64, build-catalog.sh currently emits an unpinned base image line ("FROM quay.io/operator-framework/opm:latest") into the generated catalog.Dockerfile which makes builds non-deterministic; update build-catalog.sh to resolve and pin a specific quay.io/operator-framework/opm@sha256:<digest> (choose the digest your repo/CI policy approves) and emit that digested reference into catalog.Dockerfile instead of ":latest", and store the chosen digest in a variable (e.g., OPM_IMAGE_DIGEST or OPM_BASE) inside build-catalog.sh so the generated catalog.Dockerfile is fully immutable and easy to update in the future.
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Nitpick comments:
In `@test/assets/olm/hello-microshift-operator/build-catalog.sh`:
- Line 64: build-catalog.sh currently emits an unpinned base image line ("FROM
quay.io/operator-framework/opm:latest") into the generated catalog.Dockerfile
which makes builds non-deterministic; update build-catalog.sh to resolve and pin
a specific quay.io/operator-framework/opm@sha256:<digest> (choose the digest
your repo/CI policy approves) and emit that digested reference into
catalog.Dockerfile instead of ":latest", and store the chosen digest in a
variable (e.g., OPM_IMAGE_DIGEST or OPM_BASE) inside build-catalog.sh so the
generated catalog.Dockerfile is fully immutable and easy to update in the
future.
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository YAML (base), Central YAML (inherited)
Review profile: CHILL
Plan: Enterprise
Run ID: fdfb100c-fbca-40b9-a8ab-268e5de204bc
📒 Files selected for processing (7)
test/assets/olm/catalog-source.yamltest/assets/olm/hello-microshift-operator/build-catalog.shtest/assets/olm/hello-microshift-operator/catalog-extra.yamltest/assets/olm/hello-microshift-operator/manifests/hello-microshift-operator.clusterserviceversion.yamltest/assets/olm/hello-microshift-operator/metadata/annotations.yamltest/assets/olm/subscription.yamltest/suites/optional/olm.robot
✅ Files skipped from review due to trivial changes (3)
- test/assets/olm/hello-microshift-operator/metadata/annotations.yaml
- test/assets/olm/subscription.yaml
- test/assets/olm/hello-microshift-operator/catalog-extra.yaml
🚧 Files skipped from review as they are similar to previous changes (3)
- test/assets/olm/hello-microshift-operator/manifests/hello-microshift-operator.clusterserviceversion.yaml
- test/suites/optional/olm.robot
- test/assets/olm/catalog-source.yaml
|
Actionable comments posted: 0 |
|
/retest |
|
/lgtm |
|
/verified by ci |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: copejon, pmtk 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 |
|
@copejon: This PR has been marked as verified by DetailsIn 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. |
|
@pmtk: 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. |
redhat-operator-index is almost 5GiB in size which might have been causing flakiness
Summary by CodeRabbit