[release-4.22] OCPBUGS-105866: remove redhat-marketplace catalog from HyperShift

[dhgautam99]

What this PR does / why we need it:

Backport of #8958 to release-4.22. Removes the redhat-marketplace catalog component from HyperShift control planes:

• Removes redhat-marketplace-catalog Deployment, Service, and ControlPlaneComponent assets
• Removes redhat-marketplace references from catalog-operator, olm-operator, and packageserver deployment args
• Removes redhat-marketplace image references from HCCO resource reconciliation
• Adds cleanup function to delete existing redhat-marketplace resources on upgrade
• Removes associated test fixtures

Which issue(s) this PR fixes:

Fixes https://redhat.atlassian.net/browse/OCPBUGS-105866

Special notes for your reviewer:

Cherry-pick of fa4b094 from main. Conflicts resolved by:

• Deleting redhat-marketplace testdata fixtures (modify/delete conflicts — our commit removes them)
• Deleting OLM test files that don't exist in 4.22 (deleted in HEAD)
• Deleting ModernTLS imagestream fixture (doesn't exist in 4.22)
• Keeping 4.22 versions of imagestream fixtures and e2e test files (structural differences too large to merge; fixtures will be regenerated)
• Fixing k8sutil.DeleteIfNeeded → util.DeleteIfNeeded to match 4.22 import alias

Imagestream fixtures still contain stale redhat-marketplace references and need regeneration via UPDATE_FIXTURES=true.

Checklist:

• Subject and description added to both, commit and PR.
• Relevant issues have been referenced.
• This change includes docs.
• This change includes unit tests.

[openshift-merge-bot]

Pipeline controller notification
This repo is configured to use the pipeline controller. Second-stage tests will be triggered either automatically or after lgtm label is added, depending on the repository configuration. The pipeline controller will automatically detect which contexts are required and will utilize /test Prow commands to trigger the second stage.

For optional jobs, comment /test ? to see a list of all defined jobs. To trigger manually all jobs from second stage use /pipeline required command.

This repository is configured in: LGTM mode

[openshift-ci]

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

[openshift-ci-robot]

@dhgautam99: This pull request references Jira Issue OCPBUGS-105866, which is invalid:

• release note text must be set and not match the template OR release note type must be set to "Release Note Not Required". For more information you can reference the OpenShift Bug Process.

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

What this PR does / why we need it:

Backport of #8958 to release-4.22. Removes the redhat-marketplace catalog component from HyperShift control planes:

• Removes redhat-marketplace-catalog Deployment, Service, and ControlPlaneComponent assets
• Removes redhat-marketplace references from catalog-operator, olm-operator, and packageserver deployment args
• Removes redhat-marketplace image references from HCCO resource reconciliation
• Adds cleanup function to delete existing redhat-marketplace resources on upgrade
• Removes associated test fixtures

Which issue(s) this PR fixes:

Fixes https://redhat.atlassian.net/browse/OCPBUGS-105866

Special notes for your reviewer:

Cherry-pick of fa4b094 from main. Conflicts resolved by:

• Deleting redhat-marketplace testdata fixtures (modify/delete conflicts — our commit removes them)
• Deleting OLM test files that don't exist in 4.22 (deleted in HEAD)
• Deleting ModernTLS imagestream fixture (doesn't exist in 4.22)
• Keeping 4.22 versions of imagestream fixtures and e2e test files (structural differences too large to merge; fixtures will be regenerated)
• Fixing k8sutil.DeleteIfNeeded → util.DeleteIfNeeded to match 4.22 import alias

Imagestream fixtures still contain stale redhat-marketplace references and need regeneration via UPDATE_FIXTURES=true.

Checklist:

• Subject and description added to both, commit and PR.
• Relevant issues have been referenced.
• This change includes docs.
• This change includes unit tests.

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.

[coderabbitai]

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository YAML (base), Central YAML (inherited)

Review profile: CHILL

Plan: Pro Plus

Run ID: f7734f15-86f4-4255-9f5e-29650e013bc4

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

• 🔍 Trigger review

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands.}

[openshift-ci-robot]

@dhgautam99: This pull request references Jira Issue OCPBUGS-105866, which is valid. The bug has been moved to the POST state.

7 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (4.22.0) matches configured target version for branch (4.22.0)
• bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)
• release note type set to "Release Note Not Required"
• dependent bug Jira Issue OCPBUGS-96908 is in the state ON_QA, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
• dependent Jira Issue OCPBUGS-96908 targets the "5.0.0" version, which is one of the valid target versions: 5.0.0
• bug has dependents

Details

In response to this:

What this PR does / why we need it:

Backport of #8958 to release-4.22. Removes the redhat-marketplace catalog component from HyperShift control planes:

• Removes redhat-marketplace-catalog Deployment, Service, and ControlPlaneComponent assets
• Removes redhat-marketplace references from catalog-operator, olm-operator, and packageserver deployment args
• Removes redhat-marketplace image references from HCCO resource reconciliation
• Adds cleanup function to delete existing redhat-marketplace resources on upgrade
• Removes associated test fixtures

Which issue(s) this PR fixes:

Fixes https://redhat.atlassian.net/browse/OCPBUGS-105866

Special notes for your reviewer:

Cherry-pick of fa4b094 from main. Conflicts resolved by:

• Deleting redhat-marketplace testdata fixtures (modify/delete conflicts — our commit removes them)
• Deleting OLM test files that don't exist in 4.22 (deleted in HEAD)
• Deleting ModernTLS imagestream fixture (doesn't exist in 4.22)
• Keeping 4.22 versions of imagestream fixtures and e2e test files (structural differences too large to merge; fixtures will be regenerated)
• Fixing k8sutil.DeleteIfNeeded → util.DeleteIfNeeded to match 4.22 import alias

Imagestream fixtures still contain stale redhat-marketplace references and need regeneration via UPDATE_FIXTURES=true.

Checklist:

• Subject and description added to both, commit and PR.
• Relevant issues have been referenced.
• This change includes docs.
• This change includes unit tests.

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.

[codecov]

Codecov Report

❌ Patch coverage is 51.85185% with 13 lines in your changes missing coverage. Please review.
✅ Project coverage is 36.50%. Comparing base (1769f3c) to head (fdf299e).
⚠️ Report is 6 commits behind head on release-4.22.

Files with missing lines	Patch %	Lines
...ostedcontrolplane/hostedcontrolplane_controller.go	57.14%	4 Missing and 2 partials ⚠️
...rconfigoperator/controllers/resources/resources.go	66.66%	2 Missing and 1 partial ⚠️
...controlplane/v2/olm/catalog_operator/deployment.go	0.00%	1 Missing ⚠️
...s/hostedcontrolplane/v2/olm/catalogs/deployment.go	0.00%	1 Missing ⚠️
...stedcontrolplane/v2/olm/olm_operator/deployment.go	0.00%	1 Missing ⚠️
...tedcontrolplane/v2/olm/packageserver/deployment.go	0.00%	1 Missing ⚠️

Additional details and impacted files

@@               Coverage Diff                @@
##           release-4.22    #9289      +/-   ##
================================================
+ Coverage         36.42%   36.50%   +0.07%     
================================================
  Files               776      777       +1     
  Lines             95220    95244      +24     
================================================
+ Hits              34686    34768      +82     
+ Misses            57706    57637      -69     
- Partials           2828     2839      +11     

Files with missing lines	Coverage Δ
...rs/hostedcontrolplane/v2/olm/catalogs/component.go	0.00% <ø> (ø)
...figoperator/controllers/resources/manifests/olm.go	0.00% <ø> (ø)
...nfigoperator/controllers/resources/olm/catalogs.go	0.00% <ø> (ø)
...configoperator/controllers/resources/olm/params.go	0.00% <ø> (ø)
support/catalogs/images.go	78.41% <ø> (-0.31%)	⬇️
...controlplane/v2/olm/catalog_operator/deployment.go	0.00% <0.00%> (ø)
...s/hostedcontrolplane/v2/olm/catalogs/deployment.go	0.00% <0.00%> (ø)
...stedcontrolplane/v2/olm/olm_operator/deployment.go	0.00% <0.00%> (ø)
...tedcontrolplane/v2/olm/packageserver/deployment.go	0.00% <0.00%> (ø)
...rconfigoperator/controllers/resources/resources.go	50.80% <66.66%> (+0.03%)	⬆️
... and 1 more

... and 3 files with indirect coverage changes

🚀 New features to boost your workflow:

• ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

[openshift-ci]

@dhgautam99: all tests passed!

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.

[muraee]

/approve

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dhgautam99, muraee

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:

• OWNERS [muraee]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[mehabhalodiya]

/lgtm

[openshift-merge-bot]

Scheduling tests matching the pipeline_run_if_changed or not excluded by pipeline_skip_if_only_changed parameters:
/test e2e-aks
/test e2e-aws
/test e2e-aws-upgrade-hypershift-operator
/test e2e-azure-self-managed
/test e2e-kubevirt-aws-ovn-reduced
/test e2e-v2-aws