Improve the upgrade json patch mechanism #3248

nunnatsa · 2024-12-26T13:38:05Z

What this PR does / why we need it:

Improve the upgrade json patch by

move it to its own package
made some refactoring for better performance
the code is now more testable
move the initialization of the upgradePatch object to boot, instead of in the reconcile loop, in order to fail fast on error
To implement 3, add a json string of the HyperConverged CR with default values.
To implement 4, add a tiny tool to go-generate the go file with the json string, and call it at build time

Remove two old upgrade mechanism:

dropped the CRD remover. this is not needed anymore. the v2v CRD was dropped many versions ago.
dropped the code that remove the v1alpha1 API version from the HC CRD, as it was done many versions ago.

Reviewer Checklist

Reviewers are supposed to review the PR for every aspect below one by one. To check an item means the PR is either "OK" or "Not Applicable" in terms of that item. All items are supposed to be checked before merging a PR.

Jira Ticket:

None

Release note:

Droped unused code

kubevirt-bot · 2024-12-26T13:38:11Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please ask for approval from nunnatsa. For more information see the Kubernetes Code Review Process.

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

Needs approval from an approver in each of these files:

OWNERS

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

Signed-off-by: Nahshon Unna-Tsameret <[email protected]>

Improve the upgrade json patch by: 1. move it to its own package 2. made some refactoring for better performance 3. move the initialization of the upgradePatch object to boot, instead of in the reconcile loop, in order to fail fast on error 4. To implement 3, add a json string of the HyperConverged CR with default values. 5. To implement 4, add a tiny tool to go-generate the go file with the json string, and call it at build time Signed-off-by: Nahshon Unna-Tsameret <[email protected]>

The CRDRemover type was written to remove the v2v CRDs on upgrade. This is no longer relevant. Even for newer CRD removes, we have a common solution - the json patch mechanism. This PR removes the unused code. Signed-off-by: Nahshon Unna-Tsameret <[email protected]>

This API version is very old, and there is no need to remove it anymore. Signed-off-by: Nahshon Unna-Tsameret <[email protected]>

sonarqubecloud · 2024-12-26T14:07:12Z

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

coveralls · 2024-12-26T14:10:13Z

Pull Request Test Coverage Report for Build 12504775034

Details

92 of 148 (62.16%) changed or added relevant lines in 2 files are covered.
2 unchanged lines in 1 file lost coverage.
Overall coverage decreased (-0.6%) to 71.154%

Changes Missing Coverage	Covered Lines	Changed/Added Lines	%
controllers/hyperconverged/hyperconverged_controller.go	13	14	92.86%
pkg/upgradepatches/upgradePatches.go	79	134	58.96%

Files with Coverage Reduction	New Missed Lines	%
controllers/hyperconverged/hyperconverged_controller.go	2	81.57%

Totals
Change from base Build 12491111563:	-0.6%
Covered Lines:	5989
Relevant Lines:	8417

💛 - Coveralls

hco-bot · 2024-12-26T15:43:21Z

hco-e2e-upgrade-operator-sdk-aws lane succeeded.
/override ci/prow/hco-e2e-upgrade-operator-sdk-azure

kubevirt-bot · 2024-12-26T15:43:25Z

@hco-bot: Overrode contexts on behalf of hco-bot: ci/prow/hco-e2e-upgrade-operator-sdk-azure

In response to this:

hco-e2e-upgrade-operator-sdk-aws lane succeeded.
/override ci/prow/hco-e2e-upgrade-operator-sdk-azure

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.

hco-bot · 2024-12-26T15:52:28Z

hco-e2e-upgrade-operator-sdk-sno-aws lane succeeded.
/override ci/prow/hco-e2e-upgrade-operator-sdk-sno-azure

kubevirt-bot · 2024-12-26T15:52:31Z

@hco-bot: Overrode contexts on behalf of hco-bot: ci/prow/hco-e2e-upgrade-operator-sdk-sno-azure

In response to this:

hco-e2e-upgrade-operator-sdk-sno-aws lane succeeded.
/override ci/prow/hco-e2e-upgrade-operator-sdk-sno-azure

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.

hco-bot · 2024-12-26T16:34:30Z

hco-e2e-operator-sdk-gcp, hco-e2e-operator-sdk-aws lanes succeeded.
/override ci/prow/hco-e2e-operator-sdk-azure
hco-e2e-operator-sdk-sno-azure lane succeeded.
/override ci/prow/hco-e2e-operator-sdk-sno-aws

kubevirt-bot · 2024-12-26T16:34:34Z

@hco-bot: Overrode contexts on behalf of hco-bot: ci/prow/hco-e2e-operator-sdk-azure, ci/prow/hco-e2e-operator-sdk-sno-aws

In response to this:

hco-e2e-operator-sdk-gcp, hco-e2e-operator-sdk-aws lanes succeeded.
/override ci/prow/hco-e2e-operator-sdk-azure
hco-e2e-operator-sdk-sno-azure lane succeeded.
/override ci/prow/hco-e2e-operator-sdk-sno-aws

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.

hco-bot · 2024-12-26T16:45:41Z

hco-e2e-consecutive-operator-sdk-upgrades-aws lane succeeded.
/override ci/prow/hco-e2e-consecutive-operator-sdk-upgrades-azure

kubevirt-bot · 2024-12-26T16:45:45Z

@hco-bot: Overrode contexts on behalf of hco-bot: ci/prow/hco-e2e-consecutive-operator-sdk-upgrades-azure

In response to this:

hco-e2e-consecutive-operator-sdk-upgrades-aws lane succeeded.
/override ci/prow/hco-e2e-consecutive-operator-sdk-upgrades-azure

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.

openshift-ci · 2024-12-26T18:17:52Z

@nunnatsa: 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/hco-e2e-upgrade-prev-operator-sdk-aws	`89beed8`	link	true	`/test hco-e2e-upgrade-prev-operator-sdk-aws`
ci/prow/hco-e2e-operator-sdk-sno-aws	`89beed8`	link	false	`/test hco-e2e-operator-sdk-sno-aws`
ci/prow/hco-e2e-upgrade-prev-operator-sdk-sno-aws	`89beed8`	link	false	`/test hco-e2e-upgrade-prev-operator-sdk-sno-aws`
ci/prow/hco-e2e-upgrade-prev-operator-sdk-sno-azure	`89beed8`	link	false	`/test hco-e2e-upgrade-prev-operator-sdk-sno-azure`
ci/prow/hco-e2e-operator-sdk-azure	`89beed8`	link	true	`/test hco-e2e-operator-sdk-azure`
ci/prow/hco-e2e-consecutive-operator-sdk-upgrades-azure	`89beed8`	link	true	`/test hco-e2e-consecutive-operator-sdk-upgrades-azure`
ci/prow/hco-e2e-upgrade-prev-operator-sdk-azure	`89beed8`	link	true	`/test hco-e2e-upgrade-prev-operator-sdk-azure`
ci/prow/hco-e2e-kv-smoke-gcp	`89beed8`	link	true	`/test hco-e2e-kv-smoke-gcp`
ci/prow/hco-e2e-kv-smoke-azure	`89beed8`	link	true	`/test hco-e2e-kv-smoke-azure`

Full PR test history. Your PR dashboard.

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.

kubevirt-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. labels Dec 26, 2024

kubevirt-bot requested review from avlitman and sradco December 26, 2024 13:38

kubevirt-bot added the size/XXL label Dec 26, 2024

nunnatsa requested a review from orenc1 December 26, 2024 13:38

update dependencies in the release notes tool

c6709cc

Signed-off-by: Nahshon Unna-Tsameret <[email protected]>

nunnatsa force-pushed the improve-json-patch branch from dbe5dd8 to 8e97220 Compare December 26, 2024 13:54

nunnatsa added 3 commits December 26, 2024 16:06

Drop code that clean v1alpha1 CRD version

89beed8

This API version is very old, and there is no need to remove it anymore. Signed-off-by: Nahshon Unna-Tsameret <[email protected]>

nunnatsa force-pushed the improve-json-patch branch from 8e97220 to 89beed8 Compare December 26, 2024 14:06

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Improve the upgrade json patch mechanism #3248

Improve the upgrade json patch mechanism #3248

nunnatsa commented Dec 26, 2024 •

edited

Loading

kubevirt-bot commented Dec 26, 2024

sonarqubecloud bot commented Dec 26, 2024

coveralls commented Dec 26, 2024

hco-bot commented Dec 26, 2024

kubevirt-bot commented Dec 26, 2024

hco-bot commented Dec 26, 2024

kubevirt-bot commented Dec 26, 2024

hco-bot commented Dec 26, 2024

kubevirt-bot commented Dec 26, 2024

hco-bot commented Dec 26, 2024

kubevirt-bot commented Dec 26, 2024

openshift-ci bot commented Dec 26, 2024

Improve the upgrade json patch mechanism #3248

Are you sure you want to change the base?

Improve the upgrade json patch mechanism #3248

Conversation

nunnatsa commented Dec 26, 2024 • edited Loading

kubevirt-bot commented Dec 26, 2024

sonarqubecloud bot commented Dec 26, 2024

Quality Gate passed

coveralls commented Dec 26, 2024

Pull Request Test Coverage Report for Build 12504775034

Details

💛 - Coveralls

hco-bot commented Dec 26, 2024

kubevirt-bot commented Dec 26, 2024

hco-bot commented Dec 26, 2024

kubevirt-bot commented Dec 26, 2024

hco-bot commented Dec 26, 2024

kubevirt-bot commented Dec 26, 2024

hco-bot commented Dec 26, 2024

kubevirt-bot commented Dec 26, 2024

openshift-ci bot commented Dec 26, 2024

nunnatsa commented Dec 26, 2024 •

edited

Loading