Ignore legacy MACHINETYPE when empty

tiraboschi commented 4 months ago

What this PR does / why we need it: Ignore legacy MACHINETYPE env variable when the variable is defined but empty. Correctly set defaults during manifests generation.

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.

[X] PR Message
[X] Commit Messages
[ ] How to test
[X] Unit Tests
[ ] Functional Tests
[ ] User Documentation
[ ] Developer Documentation
[ ] Upgrade Scenario
[ ] Uninstallation Scenario
[X] Backward Compatibility
[ ] Troubleshooting Friendly

Jira Ticket:

https://issues.redhat.com/browse/CNV-37722

Release note:

NONE

coveralls commented 4 months ago

Pull Request Test Coverage Report for Build 8982832928

Details

1 of 1 (100.0%) changed or added relevant line in 1 file are covered.
No unchanged relevant lines lost coverage.
Overall coverage remained the same at 85.837%

Totals
Change from base Build 8970160805:	0.0%
Covered Lines:	5200
Relevant Lines:	6058

💛 - Coveralls

sonarcloud[bot] commented 4 months ago

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
0.0% Duplication on New Code

See analysis details on SonarCloud

kubevirt-bot commented 4 months ago

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: nunnatsa

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](https://github.com/kubevirt/hyperconverged-cluster-operator/blob/main/OWNERS)~~ [nunnatsa] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment

hco-bot commented 4 months ago

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

kubevirt-bot commented 4 months ago

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

In response to [this](https://github.com/kubevirt/hyperconverged-cluster-operator/pull/2946#issuecomment-2097972820): >hco-e2e-operator-sdk-sno-aws lane succeeded. >/override ci/prow/hco-e2e-operator-sdk-sno-azure > Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.

hco-bot commented 4 months ago

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

kubevirt-bot commented 4 months ago

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

In response to [this](https://github.com/kubevirt/hyperconverged-cluster-operator/pull/2946#issuecomment-2098029499): >hco-e2e-upgrade-operator-sdk-sno-aws lane succeeded. >/override ci/prow/hco-e2e-upgrade-operator-sdk-sno-azure >hco-e2e-upgrade-prev-operator-sdk-aws lane succeeded. >/override ci/prow/hco-e2e-upgrade-prev-operator-sdk-azure > Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.

hco-bot commented 4 months ago

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

kubevirt-bot commented 4 months ago

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

In response to [this](https://github.com/kubevirt/hyperconverged-cluster-operator/pull/2946#issuecomment-2098136984): >hco-e2e-upgrade-prev-operator-sdk-sno-azure lane succeeded. >/override ci/prow/hco-e2e-upgrade-prev-operator-sdk-sno-aws > Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.

openshift-ci[bot] commented 4 months ago

@tiraboschi: 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-sno-aws	27ba7558505e15e4f8d1ab71aa0cf228691ee817	link	false	`/test hco-e2e-upgrade-prev-operator-sdk-sno-aws`
ci/prow/hco-e2e-upgrade-operator-sdk-sno-azure	27ba7558505e15e4f8d1ab71aa0cf228691ee817	link	false	`/test hco-e2e-upgrade-operator-sdk-sno-azure`
ci/prow/hco-e2e-kv-smoke-azure	27ba7558505e15e4f8d1ab71aa0cf228691ee817	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](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).

hco-bot commented 4 months ago

hco-e2e-kv-smoke-gcp lane succeeded. /override ci/prow/hco-e2e-kv-smoke-azure

kubevirt-bot commented 4 months ago

@hco-bot: Overrode contexts on behalf of hco-bot: ci/prow/hco-e2e-kv-smoke-azure

In response to [this](https://github.com/kubevirt/hyperconverged-cluster-operator/pull/2946#issuecomment-2098388652): >hco-e2e-kv-smoke-gcp lane succeeded. >/override ci/prow/hco-e2e-kv-smoke-azure > Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.

tiraboschi commented 4 months ago

/cherry-pick release-1.12

kubevirt-bot commented 4 months ago

@tiraboschi: #2946 failed to apply on top of branch "release-1.12":

Applying: Ignore legacy MACHINETYPE when empty
Using index info to reconstruct a base tree...
M   controllers/operands/kubevirt.go
M   controllers/operands/kubevirt_test.go
A   deploy/index-image/community-kubevirt-hyperconverged/1.13.0/manifests/kubevirt-hyperconverged-operator.v1.13.0.clusterserviceversion.yaml
A   deploy/olm-catalog/community-kubevirt-hyperconverged/1.13.0/manifests/kubevirt-hyperconverged-operator.v1.13.0.clusterserviceversion.yaml
M   deploy/operator.yaml
Falling back to patching base and 3-way merge...
Auto-merging deploy/operator.yaml
Auto-merging deploy/olm-catalog/community-kubevirt-hyperconverged/1.12.0/manifests/kubevirt-hyperconverged-operator.v1.12.0.clusterserviceversion.yaml
CONFLICT (content): Merge conflict in deploy/olm-catalog/community-kubevirt-hyperconverged/1.12.0/manifests/kubevirt-hyperconverged-operator.v1.12.0.clusterserviceversion.yaml
Auto-merging deploy/index-image/community-kubevirt-hyperconverged/1.12.0/manifests/kubevirt-hyperconverged-operator.v1.12.0.clusterserviceversion.yaml
Auto-merging controllers/operands/kubevirt_test.go
Auto-merging controllers/operands/kubevirt.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Ignore legacy MACHINETYPE when empty
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to [this](https://github.com/kubevirt/hyperconverged-cluster-operator/pull/2946#issuecomment-2098399300): >/cherry-pick release-1.12 Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.

kubevirt / hyperconverged-cluster-operator