Skip to content

CMP- 3973: install index image (supersedes PR 1001)#1202

Open
taimurhafeez wants to merge 2 commits into
ComplianceAsCode:masterfrom
taimurhafeez:CMP-3973-install-index-image
Open

CMP- 3973: install index image (supersedes PR 1001)#1202
taimurhafeez wants to merge 2 commits into
ComplianceAsCode:masterfrom
taimurhafeez:CMP-3973-install-index-image

Conversation

@taimurhafeez
Copy link
Copy Markdown
Collaborator

No description provided.

xiaojiey and others added 2 commits April 7, 2026 15:55
Address review comments for subscription-based installation

- Add waitForOperatorInstallation() to poll for CSV readiness after OLM subscription
  This ensures the operator and CRDs are ready before proceeding with test setup
- Make manifest cleanup conditional based on installation method
  Only clean up YAML manifests if installed via manifests, not subscription
@openshift-ci openshift-ci Bot requested review from mrogers950 and yuumasato May 6, 2026 15:03
@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented May 6, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: taimurhafeez

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details 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 May 6, 2026
@github-actions
Copy link
Copy Markdown

github-actions Bot commented May 6, 2026

🤖 To deploy this PR, run the following command:

make catalog-deploy CATALOG_IMG=ghcr.io/complianceascode/compliance-operator-catalog:1202-0fb0b5b187a96e001427902ebb1f0a9a354f7323

@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented May 6, 2026

@taimurhafeez: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-rosa 0fb0b5b link true /test e2e-rosa
ci/prow/e2e-aws-parallel-arm 0fb0b5b link true /test e2e-aws-parallel-arm
ci/prow/e2e-aws-serial 0fb0b5b link true /test e2e-aws-serial

Full PR test history. Your PR dashboard.

Details

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 kubernetes-sigs/prow repository. I understand the commands that are listed here.

Copy link
Copy Markdown
Collaborator

@rhmdnd rhmdnd left a comment

Choose a reason for hiding this comment

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

Thanks for the PR! Some feedback on the cleanup path, timeout consistency, and isolating the formatting improvements.

}

for _, csv := range csvList.Items {
if csv.Spec.DisplayName == "Compliance Operator" {
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

We use the following in other areas, don't we?

strings.HasPrefix(csv.Name, "compliance-operator")

Is there a reason to deviate from that here?

}

// installViaSubscription installs the compliance operator using OLM Subscription
func (f *Framework) installViaSubscription(channel, source, sourceNamespace string) error {
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Do we want a similar function for tear down? The documentation recommends deleting the CSV and subscription to do that, which might be a good thing to test if we're adding it here.

Otherwise, the current tear down path only cleans up some resources manually and then deletes the namespace.

// and the CRDs are ready to use
func (f *Framework) waitForOperatorInstallation() error {
retryInterval := time.Second * 5
timeout := time.Minute * 5
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

We allow the suite to wait for 30 minutes if we're installing from manifests:

https://github.com/ComplianceAsCode/compliance-operator/blob/master/tests/e2e/framework/main_entry.go#L93-L94

We could keep that consistent here, too.

Description: "This rule has invalid scannerType",
Severity: "low",
CheckType: "Platform", // Valid checkType
CheckType: "Platform", // Valid checkType
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Looks like some of this change was auto-formatted?

We can focus the change to only the functional aspects by doing this update in a separate PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants