Skip to content

MGMT-17438: bugfix, make sure ODF and LVM requirements do not change if MCE not selected #6150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
Apr 5, 2024
Merged

MGMT-17438: bugfix, make sure ODF and LVM requirements do not change if MCE not selected #6150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions internal/operators/api/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ type Operator interface {
// ValidateCluster verifies whether this operator is valid for given cluster
ValidateCluster(ctx context.Context, cluster *common.Cluster) (ValidationResult, error)
// ValidateHost verifies whether this operator is valid for given host
ValidateHost(ctx context.Context, cluster *common.Cluster, hosts *models.Host) (ValidationResult, error)
ValidateHost(ctx context.Context, cluster *common.Cluster, hosts *models.Host, additionalOperatorRequirements *models.ClusterHostRequirementsDetails) (ValidationResult, error)
// GenerateManifests generates manifests for the operator
GenerateManifests(*common.Cluster) (map[string][]byte, []byte, error)
// GetHostRequirements provides operator's requirements towards the host
Expand All @@ -61,5 +61,4 @@ type Operator interface {
type StorageOperator interface {
Operator
StorageClassName() string
SetAdditionalDiskRequirements(additionalSizeGB int64)
}
8 changes: 4 additions & 4 deletions internal/operators/api/mock_operator_api.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion internal/operators/cnv/cnv_operator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ func (o *operator) validateRequirements(cluster *models.Cluster) (api.Validation
}

// ValidateHost returns validationResult based on node type requirements such as memory and cpu
func (o *operator) ValidateHost(ctx context.Context, cluster *common.Cluster, host *models.Host) (api.ValidationResult, error) {
func (o *operator) ValidateHost(ctx context.Context, cluster *common.Cluster, host *models.Host, _ *models.ClusterHostRequirementsDetails) (api.ValidationResult, error) {
if host.Inventory == "" {
o.log.Info("Empty Inventory of host with hostID ", host.ID)
return api.ValidationResult{Status: api.Pending, ValidationId: o.GetHostValidationID(), Reasons: []string{"Missing Inventory in some of the hosts"}}, nil
Expand Down
2 changes: 1 addition & 1 deletion internal/operators/cnv/cnv_operator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ var _ = Describe("CNV operator", func() {
{SizeBytes: 20 * conversions.GiB, DriveType: models.DriveTypeSSD, ID: "disk3"},
})}
table.DescribeTable("validateHost when ", func(cluster *common.Cluster, host *models.Host, expectedResult api.ValidationResult) {
res, _ := cnvOperator.ValidateHost(context.TODO(), cluster, host)
res, _ := cnvOperator.ValidateHost(context.TODO(), cluster, host, nil)
Expect(res).Should(Equal(expectedResult))
},
table.Entry("No virt capabilities",
Expand Down
2 changes: 1 addition & 1 deletion internal/operators/lso/ls_operator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ func (l *lsOperator) ValidateCluster(_ context.Context, _ *common.Cluster) (api.
}

// ValidateHost always return "valid" result
func (l *lsOperator) ValidateHost(_ context.Context, _ *common.Cluster, _ *models.Host) (api.ValidationResult, error) {
func (l *lsOperator) ValidateHost(_ context.Context, _ *common.Cluster, _ *models.Host, _ *models.ClusterHostRequirementsDetails) (api.ValidationResult, error) {
return api.ValidationResult{Status: api.Success, ValidationId: l.GetHostValidationID(), Reasons: []string{}}, nil
}

Expand Down
23 changes: 11 additions & 12 deletions internal/operators/lvm/lvm_operator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,9 @@ import (

// operator is an ODF LVM OLM operator plugin; it implements api.Operator
type operator struct {
log logrus.FieldLogger
Config *Config
extracter oc.Extracter
additionalDiskRequirementGB int64
log logrus.FieldLogger
Config *Config
extracter oc.Extracter
}

const defaultStorageClassName = "lvms-" + defaultDeviceName
Expand Down Expand Up @@ -65,10 +64,6 @@ func (o *operator) StorageClassName() string {
return defaultStorageClassName
}

func (o *operator) SetAdditionalDiskRequirements(additionalSizeGB int64) {
o.additionalDiskRequirementGB = additionalSizeGB
}

// GetDependencies provides a list of dependencies of the Operator
func (o *operator) GetDependencies(cluster *common.Cluster) ([]string, error) {
return make([]string, 0), nil
Expand Down Expand Up @@ -101,7 +96,7 @@ func (o *operator) ValidateCluster(_ context.Context, cluster *common.Cluster) (
}

// ValidateHost always return "valid" result
func (o *operator) ValidateHost(ctx context.Context, cluster *common.Cluster, host *models.Host) (api.ValidationResult, error) {
func (o *operator) ValidateHost(ctx context.Context, cluster *common.Cluster, host *models.Host, additionalOperatorRequirements *models.ClusterHostRequirementsDetails) (api.ValidationResult, error) {
if host.Inventory == "" {
message := "Missing Inventory in the host"
return api.ValidationResult{Status: api.Pending, ValidationId: o.GetHostValidationID(), Reasons: []string{message}}, nil
Expand All @@ -113,13 +108,17 @@ func (o *operator) ValidateHost(ctx context.Context, cluster *common.Cluster, ho
return api.ValidationResult{Status: api.Failure, ValidationId: o.GetHostValidationID(), Reasons: []string{message}}, err
}

diskCount, _ := operatorscommon.NonInstallationDiskCount(inventory.Disks, host.InstallationDiskID, o.additionalDiskRequirementGB)
minDiskSizeGb := int64(0)
if additionalOperatorRequirements != nil {
minDiskSizeGb = additionalOperatorRequirements.DiskSizeGb
}
diskCount, _ := operatorscommon.NonInstallationDiskCount(inventory.Disks, host.InstallationDiskID, minDiskSizeGb)

role := common.GetEffectiveRole(host)
areSchedulable := common.AreMastersSchedulable(cluster)
minSizeMessage := ""
if o.additionalDiskRequirementGB > 0 {
minSizeMessage = fmt.Sprintf(" of %dGB minimum", o.additionalDiskRequirementGB)
if minDiskSizeGb > 0 {
minSizeMessage = fmt.Sprintf(" of %dGB minimum", minDiskSizeGb)
}
message := fmt.Sprintf("Logical Volume Manager requires at least one non-installation HDD/SSD disk%s on the host", minSizeMessage)

Expand Down
Loading