Skip to content

ARO-28189: remove cluster version GET/LIST enrichment - #4986

Open
tuxerrante wants to merge 2 commits into
masterfrom
tuxerrante/ARO-28189/enrichment-cleanup
Open

ARO-28189: remove cluster version GET/LIST enrichment#4986
tuxerrante wants to merge 2 commits into
masterfrom
tuxerrante/ARO-28189/enrichment-cleanup

Conversation

@tuxerrante

Copy link
Copy Markdown
Collaborator

Summary

  • remove the live cluster-version overlay from GET/LIST enrichment by unregistering the clusterVersion enricher
  • delete the dead version-enricher implementation and tests
  • keep the minimal ingress visibility enrichment behavior unchanged

Validation

  • make fmt
  • make lint-go
  • make unit-test-go

Alternatives discarded

  • We did not remove ingress visibility enrichment entirely, because we still want the minimal status/spec/stored visibility behavior for the current follow-up scope.
  • We did not bundle this cleanup into the installer-wrapper PR, because the RP read-path cleanup is a separate reviewable concern.
  • We did not leave the version overlay in place, because it is a drift-prone live rewrite on GET/LIST rather than stable persisted state.

Notes

  • This PR is intentionally small and limited to the ARO-RP enrichment surface.
  • The installer-side fix for ARO-28189 lives in a separate draft PR.

@openshift-ci

openshift-ci Bot commented Jul 21, 2026

Copy link
Copy Markdown

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

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

Removes the live OpenShift cluster version overlay from the cluster GET/LIST enrichment path by unregistering (and deleting) the clusterVersion enricher implementation, while keeping the existing ingress visibility enrichment behavior intact.

Changes:

  • Unregister clusterVersion from NewParallelEnricher and remove config client initialization tied to that enricher.
  • Delete the clusterVersionEnricher implementation and its unit tests.
  • Add a regression test ensuring the cluster version enricher is not registered.

Reviewed changes

Copilot reviewed 4 out of 4 changed files in this pull request and generated no comments.

File Description
pkg/util/clusterdata/clusterdata.go Removes clusterVersion enricher registration and drops config client setup that was only needed for the removed overlay.
pkg/util/clusterdata/clusterdata_test.go Adds a regression test asserting clusterVersion is not registered in NewParallelEnricher.
pkg/util/clusterdata/cluster_version.go Deletes the version overlay enricher implementation.
pkg/util/clusterdata/cluster_version_test.go Deletes tests for the removed version overlay enricher.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@hawkowl

hawkowl commented Jul 22, 2026

Copy link
Copy Markdown
Collaborator

Does the cluster version actually get updated anywhere else?

@tuxerrante

tuxerrante commented Jul 23, 2026

Copy link
Copy Markdown
Collaborator Author

The other references I've found were all validators or getters (with the exception of disableUpdates)

If we would still like to have one updater I'd rather move it to a dedicated backend action like syncClusterVersion(ctx) in pkg/cluster that reads ClusterVersion from OpenShift ClusterVersion object, derives the version via the pure helper, persists doc.OpenShiftCluster.Properties.ClusterProfile.Version with m.db.PatchWithLease. Which would be called during install, update and admin update (eg here)

@tuxerrante tuxerrante added the priority-low Low priority issue or pull request label Jul 23, 2026
@hawkowl hawkowl added the hold Hold label Jul 24, 2026
@hawkowl

hawkowl commented Jul 24, 2026

Copy link
Copy Markdown
Collaborator

Putting this on hold as we have to think about enrichers a little more.

@hawkowl hawkowl closed this Jul 24, 2026
@hawkowl hawkowl reopened this Jul 24, 2026
@hawkowl

hawkowl commented Jul 24, 2026

Copy link
Copy Markdown
Collaborator

(oops, meant to be 'comment', not 'close with comment', sorry)

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

Labels

hold Hold priority-low Low priority issue or pull request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants