Skip to content

Fix resource loss during CS merge and improve OperandConfig creation#2762

Merged
qpdpQ merged 11 commits intoIBM:masterfrom
Daniel-Fan:fix-opcon
Mar 6, 2026
Merged

Fix resource loss during CS merge and improve OperandConfig creation#2762
qpdpQ merged 11 commits intoIBM:masterfrom
Daniel-Fan:fix-opcon

Conversation

@Daniel-Fan
Copy link
Contributor

What this PR does / why we need it:

  • Fix a bug where base resources were silently dropped during CommonService merge. It will preserve base resources and maintains deterministic ordering.
  • Eliminating intermediate incomplete states during bootstrap.
  • Add safe type assertions to prevent panics on malformed input.
  • Move configMerger from package-level variable to Bootstrap struct field for thread safety.
  • Deduplicate service-conversion code into shared convertServiceConfigs helper.
  • Make MergeConfigs a pure function that accepts servicesNs directly instead of reading it from the reconciler.
    Migrate getExtremeizes to use ExtractCommonServiceConfigs, removing unnecessary typed-to-unstructured round-trip.
  • Add unit tests for mergeResourceArrays and MergeConfigs

Which issue(s) this PR fixes:
Fixes https://github.ibm.com/IBMPrivateCloud/roadmap/issues/68916

Copy link
Contributor

@qpdpQ qpdpQ left a comment

Choose a reason for hiding this comment

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

pr looks good to me, thank you @Daniel-Fan !

@qpdpQ
Copy link
Contributor

qpdpQ commented Mar 6, 2026

/lgtm

@qpdpQ qpdpQ merged commit b55b143 into IBM:master Mar 6, 2026
6 of 7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants