MGMT-19080: Change the cluster validations to enable installation of …

…3-5 control plane clusters in day1
openshift · Oct 15, 2024 · 2a91b66 · 2a91b66
1 parent 3b752de
commit 2a91b66
Show file tree

Hide file tree

Showing 21 changed files with 296 additions and 202 deletions.
diff --git a/api/vendor/github.com/openshift/assisted-service/models/cluster_validation_id.go b/api/vendor/github.com/openshift/assisted-service/models/cluster_validation_id.go
diff --git a/client/vendor/github.com/openshift/assisted-service/models/cluster_validation_id.go b/client/vendor/github.com/openshift/assisted-service/models/cluster_validation_id.go
diff --git a/internal/bminventory/inventory.go b/internal/bminventory/inventory.go
@@ -1322,7 +1322,7 @@ func (b *bareMetalInventory) InstallClusterInternal(ctx context.Context, params
 		//usage for auto role selection is measured only for day1 clusters with more than
 		//3 hosts (which would automatically be assigned as masters if the hw is sufficient)
 		if usages, u_err := usage.Unmarshal(cluster.Cluster.FeatureUsage); u_err == nil {
-			report := cluster.Cluster.TotalHostCount > common.MinMasterHostsNeededForInstallation && autoAssigned
+			report := cluster.Cluster.TotalHostCount > common.MinMasterHostsNeededForInstallationInHaMode && autoAssigned
 			if hasIgnoredValidations {
 				b.setUsage(true, usage.ValidationsIgnored, nil, usages)
 			}

diff --git a/internal/cluster/cluster_test.go b/internal/cluster/cluster_test.go
@@ -3542,7 +3542,7 @@ var _ = Describe("Validation metrics and events", func() {
 		validationRes := ValidationsStatus{
 			"hw": {
 				{
-					ID:     SufficientMastersCount,
+					ID:     SufficientMastersAndWorkersCount,
 					Status: status,
 				},
 			},
@@ -3591,7 +3591,7 @@ var _ = Describe("Validation metrics and events", func() {
 
 	It("Test DeregisterCluster", func() {
 		mockHost.EXPECT().ReportValidationFailedMetrics(ctx, gomock.Any(), openshiftVersion, emailDomain)
-		mockMetric.EXPECT().ClusterValidationFailed(models.ClusterValidationIDSufficientMastersCount)
+		mockMetric.EXPECT().ClusterValidationFailed(models.ClusterValidationIDSufficientMastersAndWorkersCount)
 		mockEvents.EXPECT().SendClusterEvent(ctx, eventstest.NewEventMatcher(
 			eventstest.WithNameMatcher(eventgen.ClusterDeregisteredEventName),
 			eventstest.WithClusterIdMatcher(c.ID.String())))
@@ -3622,7 +3622,7 @@ var _ = Describe("Validation metrics and events", func() {
 		Expect(err).ToNot(HaveOccurred())
 		m.reportValidationStatusChanged(ctx, c, newValidationRes, currentValidationRes)
 
-		mockMetric.EXPECT().ClusterValidationChanged(models.ClusterValidationIDSufficientMastersCount)
+		mockMetric.EXPECT().ClusterValidationChanged(models.ClusterValidationIDSufficientMastersAndWorkersCount)
 		mockEvents.EXPECT().SendClusterEvent(ctx, eventstest.NewEventMatcher(
 			eventstest.WithClusterIdMatcher(c.ID.String())))
 

diff --git a/internal/cluster/refresh_status_preprocessor.go b/internal/cluster/refresh_status_preprocessor.go
@@ -166,8 +166,8 @@ func newValidations(v *clusterValidator) []validation {
 			condition: v.allHostsAreReadyToInstall,
 		},
 		{
-			id:        SufficientMastersCount,
-			condition: v.sufficientMastersCount,
+			id:        SufficientMastersAndWorkersCount,
+			condition: v.sufficientMastersAndWorkersCount,
 		},
 		{
 			id:        IsDNSDomainDefined,

diff --git a/internal/cluster/statemachine.go b/internal/cluster/statemachine.go
@@ -115,7 +115,7 @@ func NewClusterStateMachine(th TransitionHandler) stateswitch.StateMachine {
 		If(AreApiVipsValid),
 		If(AreIngressVipsValid),
 		If(AllHostsAreReadyToInstall),
-		If(SufficientMastersCount),
+		If(SufficientMastersAndWorkersCount),
 		If(networkPrefixValid),
 		If(noCidrOverlapping),
 		If(IsNtpServerConfigured),