🐛 fix install and upgrade e2es

[joelanford]

Follow-up on #1979:

• make upgrade-e2e pass again
• fix ClusterExtensionInstallReResolvesWhenCatalogIsPatched

Description

Reviewer Checklist

• API Go Documentation
• Tests: Unit Tests (and E2E Tests, if appropriate)
• Comprehensive Commit Messages
• Links to related GitHub Issue(s)

[netlify]

✅ Deploy Preview for olmv1 ready!

Name	Link
🔨 Latest commit	1e15baa
🔍 Latest deploy log	https://app.netlify.com/projects/olmv1/deploys/682dd70a3592f9000809adae
😎 Deploy Preview	https://deploy-preview-1983--olmv1.netlify.app
📱 Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.

---

To edit notification comments on pull requests, go to your Netlify project configuration.

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 69.11%. Comparing base (f5dc9a9) to head (1e15baa).
Report is 2 commits behind head on main.

Additional details and impacted files

@@           Coverage Diff           @@
##             main    #1983   +/-   ##
=======================================
  Coverage   69.11%   69.11%           
=======================================
  Files          79       79           
  Lines        7023     7023           
=======================================
  Hits         4854     4854           
  Misses       1887     1887           
  Partials      282      282           

Flag	Coverage Δ
e2e	43.11% <ø> (+1.55%)	⬆️
unit	59.97% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

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

[tmshort]

/lgtm
/approve

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: tmshort

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:

• OWNERS [tmshort]

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

[tmshort]

/retitle 🐛 fix install and upgrade e2es

[tmshort]

/lgtm