Revert NMO handling in main #1942

orenc1 · 2022-05-15T17:29:25Z

Upgrade is being blocked from previous version if NMO CRs exist on the cluster.
In main, we just remove the NMO CRD as a leftover using update patch mechanism.

Signed-off-by: orenc1 ocohen@redhat.com

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.

Release note:

Revert NMO handling in main

coveralls · 2022-05-15T17:35:10Z

Pull Request Test Coverage Report for Build 2344465795

0 of 0 changed or added relevant lines in 0 files are covered.
No unchanged relevant lines lost coverage.
Overall coverage increased (+0.05%) to 84.228%

Totals
Change from base Build 2344394487:	0.05%
Covered Lines:	4160
Relevant Lines:	4939

💛 - Coveralls

hco-bot · 2022-05-15T19:54:12Z

hco-e2e-upgrade-prev-index-sno-azure lane succeeded.
/override ci/prow/hco-e2e-upgrade-prev-index-sno-aws

kubevirt-bot · 2022-05-15T19:54:14Z

@hco-bot: Overrode contexts on behalf of hco-bot: ci/prow/hco-e2e-upgrade-prev-index-sno-aws

In response to this:

hco-e2e-upgrade-prev-index-sno-azure lane succeeded.
/override ci/prow/hco-e2e-upgrade-prev-index-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/test-infra repository.

nunnatsa · 2022-05-16T06:22:08Z

controllers/hyperconverged/hyperconverged_controller.go

+				fmt.Sprintf("Node Maintenance Operator custom resources %s have been found. Please remove them to allow upgrade. "+
+					"You can use NMO standalone operator if keeping the node(s) under maintenance is still required.", nmoCrdName))
+			req.Upgradeable = false
+			err = r.setOperatorUpgradeableStatus(req)


Not sure it should be called from here. The Reconcile method should handle this call.

orenc1 · 2022-05-16T06:56:40Z

This PR should be done only on release-1.6, to block upgrade to 1.7.0 if NMO CR exists.
I'm opening a new one and modifying this one to remove NMO logic in main.

orenc1 · 2022-05-16T10:35:57Z

/retest

hco-bot · 2022-05-16T10:52:04Z

hco-e2e-upgrade-prev-index-aws lane succeeded.
/override ci/prow/hco-e2e-upgrade-prev-index-azure
okd-hco-e2e-image-index-gcp lane succeeded.
/override ci/prow/okd-hco-e2e-image-index-aws
hco-e2e-image-index-aws lane succeeded.
/override ci/prow/hco-e2e-image-index-azure
hco-e2e-image-index-aws lane succeeded.
/override ci/prow/hco-e2e-image-index-gcp
hco-e2e-upgrade-index-aws lane succeeded.
/override ci/prow/hco-e2e-upgrade-index-azure

kubevirt-bot · 2022-05-16T10:52:24Z

@hco-bot: Overrode contexts on behalf of hco-bot: ci/prow/hco-e2e-image-index-azure, ci/prow/hco-e2e-image-index-gcp, ci/prow/hco-e2e-upgrade-index-azure, ci/prow/hco-e2e-upgrade-prev-index-azure, ci/prow/okd-hco-e2e-image-index-aws

In response to this:

hco-e2e-upgrade-prev-index-aws lane succeeded.
/override ci/prow/hco-e2e-upgrade-prev-index-azure
okd-hco-e2e-image-index-gcp lane succeeded.
/override ci/prow/okd-hco-e2e-image-index-aws
hco-e2e-image-index-aws lane succeeded.
/override ci/prow/hco-e2e-image-index-azure
hco-e2e-image-index-aws lane succeeded.
/override ci/prow/hco-e2e-image-index-gcp
hco-e2e-upgrade-index-aws lane succeeded.
/override ci/prow/hco-e2e-upgrade-index-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/test-infra repository.

orenc1 · 2022-05-16T13:35:59Z

hco-e2e-image-index-sno-aws lane passed.
/override ci/prow/hco-e2e-image-index-sno-azure
okd-hco-e2e-upgrade-index-aws lane passed.
/override ci/prow/okd-hco-e2e-upgrade-index-gcp

kubevirt-bot · 2022-05-16T13:36:04Z

@orenc1: Overrode contexts on behalf of orenc1: ci/prow/hco-e2e-image-index-sno-azure, ci/prow/okd-hco-e2e-upgrade-index-gcp

In response to this:

hco-e2e-image-index-sno-aws lane passed.
/override ci/prow/hco-e2e-image-index-sno-azure
okd-hco-e2e-upgrade-index-aws lane passed.
/override ci/prow/okd-hco-e2e-upgrade-index-gcp

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/test-infra repository.

tiraboschi · 2022-05-18T08:59:16Z

/approve

kubevirt-bot · 2022-05-18T08:59:25Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: tiraboschi

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~~ [tiraboschi]

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

Upgrade is being blocked from previous version if NMO CRs exist on the cluster. In main, we just remove the NMO CRD as a leftover using update patch mechanism. Signed-off-by: orenc1 <ocohen@redhat.com>

sonarcloud · 2022-05-18T09:12:57Z

Kudos, SonarCloud Quality Gate passed!

0 Bugs
0 Vulnerabilities
0 Security Hotspots
0 Code Smells

No Coverage information
0.0% Duplication

hco-bot · 2022-05-18T10:49:59Z

hco-e2e-image-index-gcp lane succeeded.
/override ci/prow/hco-e2e-image-index-aws
hco-e2e-image-index-gcp lane succeeded.
/override ci/prow/hco-e2e-image-index-azure
hco-e2e-image-index-sno-aws lane succeeded.
/override ci/prow/hco-e2e-image-index-sno-azure

kubevirt-bot · 2022-05-18T10:50:04Z

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

In response to this:

hco-e2e-image-index-gcp lane succeeded.
/override ci/prow/hco-e2e-image-index-aws
hco-e2e-image-index-gcp lane succeeded.
/override ci/prow/hco-e2e-image-index-azure
hco-e2e-image-index-sno-aws lane succeeded.
/override ci/prow/hco-e2e-image-index-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/test-infra repository.

openshift-ci · 2022-05-18T12:07:16Z

@orenc1: 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-image-index-azure	`d472bc0`	link	true	`/test hco-e2e-image-index-azure`
ci/prow/hco-e2e-image-index-sno-azure	`d472bc0`	link	false	`/test hco-e2e-image-index-sno-azure`
ci/prow/hco-e2e-image-index-aws	`d472bc0`	link	true	`/test hco-e2e-image-index-aws`
ci/prow/hco-e2e-upgrade-index-sno-aws	`d472bc0`	link	false	`/test hco-e2e-upgrade-index-sno-aws`

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/test-infra repository. I understand the commands that are listed here.

hco-bot · 2022-05-18T12:27:15Z

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

kubevirt-bot · 2022-05-18T12:27:17Z

@hco-bot: Overrode contexts on behalf of hco-bot: ci/prow/hco-e2e-upgrade-index-sno-aws

In response to this:

hco-e2e-upgrade-index-sno-azure lane succeeded.
/override ci/prow/hco-e2e-upgrade-index-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/test-infra repository.

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 May 15, 2022

kubevirt-bot requested review from machadovilaca and sradco May 15, 2022 17:29

kubevirt-bot added the size/L label May 15, 2022

orenc1 force-pushed the block_upgrade_if_nmo_is_used branch from a0cb3d1 to defefad Compare May 15, 2022 17:31

orenc1 changed the title ~~Disallow upgrade if NMO is in use~~ Disallow upgrade if NMO is in use, with Upgradeable Condition May 15, 2022

orenc1 force-pushed the block_upgrade_if_nmo_is_used branch from defefad to f508ad1 Compare May 15, 2022 18:23

nunnatsa reviewed May 16, 2022

View reviewed changes

orenc1 added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 16, 2022

orenc1 force-pushed the block_upgrade_if_nmo_is_used branch from f508ad1 to c143290 Compare May 16, 2022 08:11

orenc1 changed the title ~~Disallow upgrade if NMO is in use, with Upgradeable Condition~~ Revert NMO handling in main May 16, 2022

orenc1 removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 16, 2022

orenc1 force-pushed the block_upgrade_if_nmo_is_used branch from c143290 to 3b571d9 Compare May 16, 2022 09:02

kubevirt-bot added size/XXL and removed size/L labels May 16, 2022

orenc1 force-pushed the block_upgrade_if_nmo_is_used branch from 3b571d9 to 453b164 Compare May 16, 2022 09:04

kubevirt-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 17, 2022

tiraboschi approved these changes May 18, 2022

View reviewed changes

kubevirt-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 18, 2022

kubevirt-bot assigned tiraboschi May 18, 2022

kubevirt-bot added the lgtm Indicates that a PR is ready to be merged. label May 18, 2022

Revert NMO handling in main

d472bc0

Upgrade is being blocked from previous version if NMO CRs exist on the cluster. In main, we just remove the NMO CRD as a leftover using update patch mechanism. Signed-off-by: orenc1 <ocohen@redhat.com>

orenc1 force-pushed the block_upgrade_if_nmo_is_used branch from 453b164 to d472bc0 Compare May 18, 2022 09:11

kubevirt-bot removed lgtm Indicates that a PR is ready to be merged. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels May 18, 2022

tiraboschi approved these changes May 18, 2022

View reviewed changes

kubevirt-bot added the lgtm Indicates that a PR is ready to be merged. label May 18, 2022

kubevirt-bot merged commit 8c298b5 into kubevirt:main May 18, 2022

orenc1 deleted the block_upgrade_if_nmo_is_used branch May 18, 2022 16:57

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Revert NMO handling in main #1942

Revert NMO handling in main #1942

orenc1 commented May 15, 2022 •

edited

coveralls commented May 15, 2022 •

edited

hco-bot commented May 15, 2022

kubevirt-bot commented May 15, 2022

nunnatsa May 16, 2022

orenc1 commented May 16, 2022

orenc1 commented May 16, 2022

hco-bot commented May 16, 2022

kubevirt-bot commented May 16, 2022

orenc1 commented May 16, 2022

kubevirt-bot commented May 16, 2022

tiraboschi commented May 18, 2022

kubevirt-bot commented May 18, 2022

sonarcloud bot commented May 18, 2022

hco-bot commented May 18, 2022

kubevirt-bot commented May 18, 2022

openshift-ci bot commented May 18, 2022

hco-bot commented May 18, 2022

kubevirt-bot commented May 18, 2022

Revert NMO handling in main #1942

Revert NMO handling in main #1942

Conversation

orenc1 commented May 15, 2022 • edited

coveralls commented May 15, 2022 • edited

Pull Request Test Coverage Report for Build 2344465795

💛 - Coveralls

hco-bot commented May 15, 2022

kubevirt-bot commented May 15, 2022

nunnatsa May 16, 2022

Choose a reason for hiding this comment

orenc1 commented May 16, 2022

orenc1 commented May 16, 2022

hco-bot commented May 16, 2022

kubevirt-bot commented May 16, 2022

orenc1 commented May 16, 2022

kubevirt-bot commented May 16, 2022

tiraboschi commented May 18, 2022

kubevirt-bot commented May 18, 2022

sonarcloud bot commented May 18, 2022

hco-bot commented May 18, 2022

kubevirt-bot commented May 18, 2022

openshift-ci bot commented May 18, 2022

hco-bot commented May 18, 2022

kubevirt-bot commented May 18, 2022

orenc1 commented May 15, 2022 •

edited

coveralls commented May 15, 2022 •

edited