MGMT-16332: fix issue validating pre-release versions #5837

eifrach · 2023-12-21T16:58:15Z

Fixing compering pre release version were failing
Adding test cases for pre release versions

List all the issues related to this PR

What environments does this code impact?

Automation (CI, tools, etc)
Cloud
Operator Managed Deployments
None

How was this code tested?

assisted-test-infra environment
dev-scripts environment
Reviewer's test appreciated
Waiting for CI to do a full test run
Manual (Elaborate on how it was tested)
No tests needed

Checklist

Title and description added to both, commit and PR.
Relevant issues have been associated (see CONTRIBUTING guide)
This change does not require a documentation update (docstring, docs, README, etc)
Does this change include unit-tests (note that code changes require unit-tests)

Reviewers Checklist

Are the title and description (in both PR and commit) meaningful and clear?
Is there a bug required (and linked) for this change?
Should this PR be backported?

openshift-ci-robot · 2023-12-21T16:58:18Z

rccrdpccl · 2023-12-21T17:05:42Z

internal/operators/lvm/lvm_operator_test.go

+				&common.Cluster{Cluster: models.Cluster{HighAvailabilityMode: &fullHaMode, Hosts: []*models.Host{hostWithSufficientResources, hostWithSufficientResources}, OpenshiftVersion: "4.15.0-rc0"}},
+				api.ValidationResult{Status: api.Success, ValidationId: operator.GetHostValidationID()},
+			),
+			table.Entry("High Availability Mode Full with higher than LvmMinMultiNodeSupportVersion",


Can we add SNO with openshift version > LvmMinMultiNodeSupportVersion?

already there - the naming is a big confusing

noneHaMode := models.ClusterHighAvailabilityModeNone

assisted-service/internal/operators/lvm/lvm_operator_test.go

Lines 123 to 130 in a209574

table.Entry("High Availability Mode None and Openshift version less than minimal",

&common.Cluster{Cluster: models.Cluster{HighAvailabilityMode: &noneHaMode, Hosts: []*models.Host{hostWithSufficientResources}, OpenshiftVersion: "4.10.0"}},

api.ValidationResult{Status: api.Failure, ValidationId: operator.GetHostValidationID(), Reasons: []string{"Logical Volume Manager is only supported for openshift versions 4.11.0 and above"}},

),

table.Entry("High Availability Mode None and Openshift version more than minimal",

&common.Cluster{Cluster: models.Cluster{HighAvailabilityMode: &noneHaMode, Hosts: []*models.Host{hostWithSufficientResources}, OpenshiftVersion: operator.config.LvmMinOpenshiftVersion}},

api.ValidationResult{Status: api.Success, ValidationId: operator.GetHostValidationID()},

),

yep sorry I've missed it 😓

rccrdpccl · 2023-12-21T17:05:56Z

internal/operators/lvm/lvm_operator.go

@@ -94,7 +94,7 @@ func (o *operator) ValidateCluster(_ context.Context, cluster *common.Cluster) (
 		if err != nil {
 			return api.ValidationResult{Status: api.Failure, ValidationId: o.GetHostValidationID(), Reasons: []string{err.Error()}}, nil
 		}
-		if ocpVersion.LessThan(minOpenshiftVersionForMultiNodeSupport) && !common.IsSingleNodeCluster(cluster) {
+		if ok, _ := common.BaseVersionLessThan(minOpenshiftVersionForMultiNodeSupport.String(), ocpVersion.String()); ok {


Check about being SNO disappeared, is that intended?

IIUC in this case SNO with version greater than minimum for multi node would pass

there is no need for it - was redandent
there is an if statement before

assisted-service/internal/operators/lvm/lvm_operator.go

Lines 82 to 87 in a209574

if common.IsSingleNodeCluster(cluster) {

minOpenshiftVersionForLvm, err := version.NewVersion(o.config.LvmMinOpenshiftVersion)

if err != nil {

return api.ValidationResult{Status: api.Failure, ValidationId: o.GetHostValidationID(), Reasons: []string{err.Error()}}, nil

}

if ok, _ := common.BaseVersionLessThan(minOpenshiftVersionForLvm.String(), ocpVersion.String()); ok {

rccrdpccl · 2023-12-21T17:22:12Z

/lgtm
/approve

openshift-ci · 2023-12-21T17:23:38Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: eifrach, rccrdpccl

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~~ [eifrach,rccrdpccl]

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

codecov · 2023-12-21T17:37:48Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (e561973) 67.97% compared to head (a209574) 67.98%.
Report is 5 commits behind head on master.

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #5837      +/-   ##
==========================================
+ Coverage   67.97%   67.98%   +0.01%     
==========================================
  Files         235      236       +1     
  Lines       34482    34499      +17     
==========================================
+ Hits        23439    23455      +16     
- Misses       8977     8979       +2     
+ Partials     2066     2065       -1

Files	Coverage Δ
internal/operators/lvm/lvm_operator.go	`71.56% <100.00%> (ø)`

... and 7 files with indirect coverage changes

openshift-ci · 2023-12-21T19:34:30Z

@eifrach: all tests passed!

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.

openshift-bot · 2023-12-21T22:50:58Z

[ART PR BUILD NOTIFIER]

This PR has been included in build ose-agent-installer-api-server-container-v4.16.0-202312212208.p0.gb7cd5d1.assembly.stream for distgit ose-agent-installer-api-server.
All builds following this will include this PR.

$eifrach$

$@eifrach$

MGMT-16332: fix issue validating pre-release versions were failing

a209574

openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Dec 21, 2023

openshift-ci bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Dec 21, 2023

openshift-ci bot requested review from eranco74 and paul-maidment December 21, 2023 16:58

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 21, 2023

$@eifrach$ eifrach changed the title ~~MGMT-16332: fix issue validating pre-release versions were failing~~ MGMT-16332: fix issue validating pre-release versions Dec 21, 2023

rccrdpccl reviewed Dec 21, 2023

View reviewed changes

openshift-ci bot assigned rccrdpccl Dec 21, 2023

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Dec 21, 2023

openshift-merge-bot bot merged commit b7cd5d1 into openshift:master Dec 21, 2023
17 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

MGMT-16332: fix issue validating pre-release versions #5837

MGMT-16332: fix issue validating pre-release versions #5837

$@eifrach$ eifrach commented Dec 21, 2023

openshift-ci-robot commented Dec 21, 2023 •

edited by openshift-ci bot

List all the issues related to this PR

What environments does this code impact?

How was this code tested?

Checklist

Reviewers Checklist

rccrdpccl Dec 21, 2023

$@eifrach$ eifrach Dec 21, 2023

rccrdpccl Dec 21, 2023

rccrdpccl Dec 21, 2023

$@eifrach$ eifrach Dec 21, 2023

rccrdpccl commented Dec 21, 2023

openshift-ci bot commented Dec 21, 2023

codecov bot commented Dec 21, 2023 •

edited

openshift-ci bot commented Dec 21, 2023

openshift-bot commented Dec 21, 2023

	table.Entry("High Availability Mode None and Openshift version less than minimal",
	&common.Cluster{Cluster: models.Cluster{HighAvailabilityMode: &noneHaMode, Hosts: []*models.Host{hostWithSufficientResources}, OpenshiftVersion: "4.10.0"}},
	api.ValidationResult{Status: api.Failure, ValidationId: operator.GetHostValidationID(), Reasons: []string{"Logical Volume Manager is only supported for openshift versions 4.11.0 and above"}},
	),
	table.Entry("High Availability Mode None and Openshift version more than minimal",
	&common.Cluster{Cluster: models.Cluster{HighAvailabilityMode: &noneHaMode, Hosts: []*models.Host{hostWithSufficientResources}, OpenshiftVersion: operator.config.LvmMinOpenshiftVersion}},
	api.ValidationResult{Status: api.Success, ValidationId: operator.GetHostValidationID()},
	),

	if common.IsSingleNodeCluster(cluster) {
	minOpenshiftVersionForLvm, err := version.NewVersion(o.config.LvmMinOpenshiftVersion)
	if err != nil {
	return api.ValidationResult{Status: api.Failure, ValidationId: o.GetHostValidationID(), Reasons: []string{err.Error()}}, nil
	}
	if ok, _ := common.BaseVersionLessThan(minOpenshiftVersionForLvm.String(), ocpVersion.String()); ok {

MGMT-16332: fix issue validating pre-release versions #5837

MGMT-16332: fix issue validating pre-release versions #5837

Conversation

eifrach commented Dec 21, 2023

List all the issues related to this PR

What environments does this code impact?

How was this code tested?

Checklist

Reviewers Checklist

openshift-ci-robot commented Dec 21, 2023 • edited by openshift-ci bot

List all the issues related to this PR

What environments does this code impact?

How was this code tested?

Checklist

Reviewers Checklist

rccrdpccl Dec 21, 2023

Choose a reason for hiding this comment

eifrach Dec 21, 2023

Choose a reason for hiding this comment

rccrdpccl Dec 21, 2023

Choose a reason for hiding this comment

rccrdpccl Dec 21, 2023

Choose a reason for hiding this comment

eifrach Dec 21, 2023

Choose a reason for hiding this comment

rccrdpccl commented Dec 21, 2023

openshift-ci bot commented Dec 21, 2023

codecov bot commented Dec 21, 2023 • edited

Codecov Report

openshift-ci bot commented Dec 21, 2023

openshift-bot commented Dec 21, 2023

$@eifrach$ eifrach commented Dec 21, 2023

openshift-ci-robot commented Dec 21, 2023 •

edited by openshift-ci bot

$@eifrach$ eifrach Dec 21, 2023

$@eifrach$ eifrach Dec 21, 2023

codecov bot commented Dec 21, 2023 •

edited