Skip to content

MGMT-19338, MGMT-19080, MGMT-18590, NO-ISSUE: Patches for non-standard HA OCP Control Plane PR #7023

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 6 commits into from
Nov 26, 2024
Merged

MGMT-19338, MGMT-19080, MGMT-18590, NO-ISSUE: Patches for non-standard HA OCP Control Plane PR #7023

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fe114a9
MGMT-19338: Add DB migration to set control_plane_count value in clus…
danmanor Nov 22, 2024
f1484ab
MGMT-19080, MGMT-18590: Fix typos
danmanor Nov 23, 2024
2161f6f
NO-ISSUE: start from clean query while counting host roles
danmanor Nov 23, 2024
f377676
NO-ISSUE: Add feature support mechanism for stretched clusters
danmanor Nov 24, 2024
1115854
NO-ISSUE: Change the feature name from 'stretched clusters' to 'non-s…
danmanor Nov 25, 2024
1db54cb
NO-ISSUE: PR fixes
danmanor Nov 26, 2024
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
5 changes: 4 additions & 1 deletion api/vendor/github.com/openshift/assisted-service/models/feature_support_level_id.go
View file
Open in desktop

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

5 changes: 4 additions & 1 deletion client/vendor/github.com/openshift/assisted-service/models/feature_support_level_id.go
View file
Open in desktop

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

39 changes: 34 additions & 5 deletions internal/bminventory/inventory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ func (b *bareMetalInventory) setDefaultRegisterClusterParams(ctx context.Context
params.NewClusterParams.SchedulableMasters = swag.Bool(false)
}

params.NewClusterParams.HighAvailabilityMode, params.NewClusterParams.ControlPlaneCount = common.GetDefaultHighAvailabilityAndMasterCountParams(
params.NewClusterParams.HighAvailabilityMode, params.NewClusterParams.ControlPlaneCount = getDefaultHighAvailabilityAndMasterCountParams(
params.NewClusterParams.HighAvailabilityMode, params.NewClusterParams.ControlPlaneCount,
)

Expand Down Expand Up @@ -1947,21 +1947,21 @@ func validateHighAvailabilityWithControlPlaneCount(highAvailabilityMode string,
)
}

stretchedClustersNotSuported, err := common.BaseVersionLessThan(common.MinimumVersionForStretchedControlPlanesCluster, openshiftVersion)
nonStandardHAOCPControlPlaneNotSuported, err := common.BaseVersionLessThan(common.MinimumVersionForNonStandardHAOCPControlPlane, openshiftVersion)
if err != nil {
return err
}

if highAvailabilityMode == models.ClusterCreateParamsHighAvailabilityModeFull &&
controlPlaneCount != common.AllowedNumberOfMasterHostsForInstallationInHaModeOfOCP417OrOlder &&
stretchedClustersNotSuported {
nonStandardHAOCPControlPlaneNotSuported {
return common.NewApiError(
http.StatusBadRequest,
fmt.Errorf(
"there should be exactly %d dedicated control plane nodes for high availability mode %s in openshift version older than %s",
common.AllowedNumberOfMasterHostsForInstallationInHaModeOfOCP417OrOlder,
highAvailabilityMode,
common.MinimumVersionForStretchedControlPlanesCluster,
common.MinimumVersionForNonStandardHAOCPControlPlane,
),
)
}
Expand All @@ -1976,7 +1976,7 @@ func validateHighAvailabilityWithControlPlaneCount(highAvailabilityMode string,
common.MinMasterHostsNeededForInstallationInHaMode,
common.MaxMasterHostsNeededForInstallationInHaModeOfOCP418OrNewer,
highAvailabilityMode,
common.MinimumVersionForStretchedControlPlanesCluster,
common.MinimumVersionForNonStandardHAOCPControlPlane,
),
)
}
Expand Down Expand Up @@ -6663,3 +6663,32 @@ func (b *bareMetalInventory) HandleVerifyVipsResponse(ctx context.Context, host
}
return b.clusterApi.HandleVerifyVipsResponse(ctx, *host.ClusterID, stepReply)
}

func getDefaultHighAvailabilityAndMasterCountParams(highAvailabilityMode *string, controlPlaneCount *int64) (*string, *int64) {
// Both not set, multi node by default
if highAvailabilityMode == nil && controlPlaneCount == nil {
return swag.String(models.ClusterCreateParamsHighAvailabilityModeFull),
swag.Int64(common.MinMasterHostsNeededForInstallationInHaMode)
}

// only highAvailabilityMode set
if controlPlaneCount == nil {
if *highAvailabilityMode == models.ClusterHighAvailabilityModeNone {
return highAvailabilityMode, swag.Int64(common.AllowedNumberOfMasterHostsInNoneHaMode)
}

return highAvailabilityMode, swag.Int64(common.MinMasterHostsNeededForInstallationInHaMode)
}

// only controlPlaneCount set
if highAvailabilityMode == nil {
if *controlPlaneCount == common.AllowedNumberOfMasterHostsInNoneHaMode {
return swag.String(models.ClusterHighAvailabilityModeNone), controlPlaneCount
}

return swag.String(models.ClusterHighAvailabilityModeFull), controlPlaneCount
}

// both are set
return highAvailabilityMode, controlPlaneCount
}
56 changes: 28 additions & 28 deletions internal/bminventory/inventory_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7929,7 +7929,7 @@ var _ = Describe("V2UpdateCluster", func() {
Expect(newCluster.ControlPlaneCount).To(BeEquivalentTo(4))
})

It(fmt.Sprintf("descreasing to 3 control planes with OCP >= %s the value and multi-node", common.MinimumVersionForStretchedControlPlanesCluster), func() {
It(fmt.Sprintf("descreasing to 3 control planes with OCP >= %s the value and multi-node", common.MinimumVersionForNonStandardHAOCPControlPlane), func() {
cluster := &common.Cluster{
Cluster: models.Cluster{
ID: &clusterID,
Expand Down Expand Up @@ -7962,7 +7962,7 @@ var _ = Describe("V2UpdateCluster", func() {
})

Context("should fail", func() {
It("update to invalid value, stretched clusters not supported", func() {
It("update to invalid value, non-standad HA OCP Control Plane not supported", func() {
cluster := &common.Cluster{
Cluster: models.Cluster{
ID: &clusterID,
Expand All @@ -7985,7 +7985,7 @@ var _ = Describe("V2UpdateCluster", func() {
verifyApiErrorString(reply, http.StatusBadRequest, "there should be exactly 3 dedicated control plane nodes for high availability mode Full in openshift version older than 4.18")
})

It("update to invalid value, stretched clusters supported", func() {
It("update to invalid value, non-standad HA OCP Control Plane supported", func() {
cluster := &common.Cluster{
Cluster: models.Cluster{
ID: &clusterID,
Expand Down Expand Up @@ -8031,7 +8031,7 @@ var _ = Describe("V2UpdateCluster", func() {
verifyApiErrorString(reply, http.StatusBadRequest, "single-node clusters must have a single control plane node")
})

It(fmt.Sprintf("update amount to != 3 when multi-node, OCP version < %s", common.MinimumVersionForStretchedControlPlanesCluster), func() {
It(fmt.Sprintf("update amount to != 3 when multi-node, OCP version < %s", common.MinimumVersionForNonStandardHAOCPControlPlane), func() {
cluster := &common.Cluster{
Cluster: models.Cluster{
ID: &clusterID,
Expand All @@ -8058,7 +8058,7 @@ var _ = Describe("V2UpdateCluster", func() {
)
})

It(fmt.Sprintf("update amount to != 3 when multi-node, OCP version >= %s", common.MinimumVersionForStretchedControlPlanesCluster), func() {
It(fmt.Sprintf("update amount to != 3 when multi-node, OCP version >= %s", common.MinimumVersionForNonStandardHAOCPControlPlane), func() {
cluster := &common.Cluster{
Cluster: models.Cluster{
ID: &clusterID,
Expand Down Expand Up @@ -15650,11 +15650,11 @@ location = "%s"

Context("using defaults", func() {
It("high_availability mode is set to Full", func() {
mockClusterRegisterSuccessWithVersion(common.X86CPUArchitecture, testutils.ValidOCPVersionForNonStretchedClusters)
mockClusterRegisterSuccessWithVersion(common.X86CPUArchitecture, testutils.ValidOCPVersionForNonStandardHAOCPControlPlane)

reply := bm.V2RegisterCluster(ctx, installer.V2RegisterClusterParams{
NewClusterParams: &models.ClusterCreateParams{
OpenshiftVersion: swag.String(testutils.ValidOCPVersionForNonStretchedClusters),
OpenshiftVersion: swag.String(testutils.ValidOCPVersionForNonStandardHAOCPControlPlane),
HighAvailabilityMode: swag.String(models.ClusterCreateParamsHighAvailabilityModeFull),
},
})
Expand All @@ -15670,11 +15670,11 @@ location = "%s"
})

It("high_availability mode is set to None", func() {
mockClusterRegisterSuccessWithVersion(common.X86CPUArchitecture, testutils.ValidOCPVersionForNonStretchedClusters)
mockClusterRegisterSuccessWithVersion(common.X86CPUArchitecture, testutils.ValidOCPVersionForNonStandardHAOCPControlPlane)

reply := bm.V2RegisterCluster(ctx, installer.V2RegisterClusterParams{
NewClusterParams: &models.ClusterCreateParams{
OpenshiftVersion: swag.String(testutils.ValidOCPVersionForNonStretchedClusters),
OpenshiftVersion: swag.String(testutils.ValidOCPVersionForNonStandardHAOCPControlPlane),
HighAvailabilityMode: swag.String(models.ClusterCreateParamsHighAvailabilityModeNone),
},
})
Expand All @@ -15690,11 +15690,11 @@ location = "%s"
})

It("control_plane_count is set to 3", func() {
mockClusterRegisterSuccessWithVersion(common.X86CPUArchitecture, testutils.ValidOCPVersionForNonStretchedClusters)
mockClusterRegisterSuccessWithVersion(common.X86CPUArchitecture, testutils.ValidOCPVersionForNonStandardHAOCPControlPlane)

reply := bm.V2RegisterCluster(ctx, installer.V2RegisterClusterParams{
NewClusterParams: &models.ClusterCreateParams{
OpenshiftVersion: swag.String(testutils.ValidOCPVersionForNonStretchedClusters),
OpenshiftVersion: swag.String(testutils.ValidOCPVersionForNonStandardHAOCPControlPlane),
ControlPlaneCount: swag.Int64(3),
},
})
Expand All @@ -15710,11 +15710,11 @@ location = "%s"
})

It("control_plane_count is set to 1", func() {
mockClusterRegisterSuccessWithVersion(common.X86CPUArchitecture, testutils.ValidOCPVersionForNonStretchedClusters)
mockClusterRegisterSuccessWithVersion(common.X86CPUArchitecture, testutils.ValidOCPVersionForNonStandardHAOCPControlPlane)

reply := bm.V2RegisterCluster(ctx, installer.V2RegisterClusterParams{
NewClusterParams: &models.ClusterCreateParams{
OpenshiftVersion: swag.String(testutils.ValidOCPVersionForNonStretchedClusters),
OpenshiftVersion: swag.String(testutils.ValidOCPVersionForNonStandardHAOCPControlPlane),
ControlPlaneCount: swag.Int64(1),
},
})
Expand All @@ -15730,11 +15730,11 @@ location = "%s"
})

It("not set", func() {
mockClusterRegisterSuccessWithVersion(common.X86CPUArchitecture, testutils.ValidOCPVersionForNonStretchedClusters)
mockClusterRegisterSuccessWithVersion(common.X86CPUArchitecture, testutils.ValidOCPVersionForNonStandardHAOCPControlPlane)

reply := bm.V2RegisterCluster(ctx, installer.V2RegisterClusterParams{
NewClusterParams: &models.ClusterCreateParams{
OpenshiftVersion: swag.String(testutils.ValidOCPVersionForNonStretchedClusters),
OpenshiftVersion: swag.String(testutils.ValidOCPVersionForNonStandardHAOCPControlPlane),
},
})

Expand All @@ -15750,12 +15750,12 @@ location = "%s"
})
})

It(fmt.Sprintf("setting 5 control planes, multi-node with OCP version >= %s", common.MinimumVersionForStretchedControlPlanesCluster), func() {
mockClusterRegisterSuccessWithVersion(common.X86CPUArchitecture, common.MinimumVersionForStretchedControlPlanesCluster)
It(fmt.Sprintf("setting 5 control planes, multi-node with OCP version >= %s", common.MinimumVersionForNonStandardHAOCPControlPlane), func() {
mockClusterRegisterSuccessWithVersion(common.X86CPUArchitecture, common.MinimumVersionForNonStandardHAOCPControlPlane)

reply := bm.V2RegisterCluster(ctx, installer.V2RegisterClusterParams{
NewClusterParams: &models.ClusterCreateParams{
OpenshiftVersion: swag.String(common.MinimumVersionForStretchedControlPlanesCluster),
OpenshiftVersion: swag.String(common.MinimumVersionForNonStandardHAOCPControlPlane),
ControlPlaneCount: swag.Int64(5),
HighAvailabilityMode: swag.String(models.ClusterCreateParamsHighAvailabilityModeFull),
},
Expand All @@ -15773,11 +15773,11 @@ location = "%s"
})

It("setting 1 control plane, single-node", func() {
mockClusterRegisterSuccessWithVersion(common.X86CPUArchitecture, testutils.ValidOCPVersionForNonStretchedClusters)
mockClusterRegisterSuccessWithVersion(common.X86CPUArchitecture, testutils.ValidOCPVersionForNonStandardHAOCPControlPlane)

reply := bm.V2RegisterCluster(ctx, installer.V2RegisterClusterParams{
NewClusterParams: &models.ClusterCreateParams{
OpenshiftVersion: swag.String(testutils.ValidOCPVersionForNonStretchedClusters),
OpenshiftVersion: swag.String(testutils.ValidOCPVersionForNonStandardHAOCPControlPlane),
ControlPlaneCount: swag.Int64(1),
HighAvailabilityMode: swag.String(models.ClusterCreateParamsHighAvailabilityModeNone),
},
Expand All @@ -15796,10 +15796,10 @@ location = "%s"
})

Context("should fail", func() {
It("setting 6 control planes, multi-node, stretched clusters not supported", func() {
It("setting 6 control planes, multi-node, non-standad HA OCP Control Plane not supported", func() {
reply := bm.V2RegisterCluster(ctx, installer.V2RegisterClusterParams{
NewClusterParams: &models.ClusterCreateParams{
OpenshiftVersion: swag.String(testutils.ValidOCPVersionForNonStretchedClusters),
OpenshiftVersion: swag.String(testutils.ValidOCPVersionForNonStandardHAOCPControlPlane),
ControlPlaneCount: swag.Int64(6),
HighAvailabilityMode: swag.String(models.ClusterCreateParamsHighAvailabilityModeFull),
},
Expand All @@ -15812,10 +15812,10 @@ location = "%s"
)
})

It("setting 6 control planes, multi-node, stretched clusters supported", func() {
It("setting 6 control planes, multi-node, non-standad HA OCP Control Plane supported", func() {
reply := bm.V2RegisterCluster(ctx, installer.V2RegisterClusterParams{
NewClusterParams: &models.ClusterCreateParams{
OpenshiftVersion: swag.String(common.MinimumVersionForStretchedControlPlanesCluster),
OpenshiftVersion: swag.String(common.MinimumVersionForNonStandardHAOCPControlPlane),
ControlPlaneCount: swag.Int64(6),
HighAvailabilityMode: swag.String(models.ClusterCreateParamsHighAvailabilityModeFull),
},
Expand All @@ -15831,7 +15831,7 @@ location = "%s"
It("setting 3 control planes, single-node", func() {
reply := bm.V2RegisterCluster(ctx, installer.V2RegisterClusterParams{
NewClusterParams: &models.ClusterCreateParams{
OpenshiftVersion: swag.String(testutils.ValidOCPVersionForNonStretchedClusters),
OpenshiftVersion: swag.String(testutils.ValidOCPVersionForNonStandardHAOCPControlPlane),
ControlPlaneCount: swag.Int64(3),
HighAvailabilityMode: swag.String(models.ClusterCreateParamsHighAvailabilityModeNone),
},
Expand All @@ -15847,7 +15847,7 @@ location = "%s"
It("setting 1 control plane, mutli-node", func() {
reply := bm.V2RegisterCluster(ctx, installer.V2RegisterClusterParams{
NewClusterParams: &models.ClusterCreateParams{
OpenshiftVersion: swag.String(testutils.ValidOCPVersionForNonStretchedClusters),
OpenshiftVersion: swag.String(testutils.ValidOCPVersionForNonStandardHAOCPControlPlane),
ControlPlaneCount: swag.Int64(1),
HighAvailabilityMode: swag.String(models.ClusterCreateParamsHighAvailabilityModeFull),
},
Expand All @@ -15860,10 +15860,10 @@ location = "%s"
)
})

It("setting 4 control planes, multi-node, stretched clusters not supported", func() {
It("setting 4 control planes, multi-node, non-standad HA OCP Control Plane not supported", func() {
reply := bm.V2RegisterCluster(ctx, installer.V2RegisterClusterParams{
NewClusterParams: &models.ClusterCreateParams{
OpenshiftVersion: swag.String(testutils.ValidOCPVersionForNonStretchedClusters),
OpenshiftVersion: swag.String(testutils.ValidOCPVersionForNonStandardHAOCPControlPlane),
ControlPlaneCount: swag.Int64(4),
HighAvailabilityMode: swag.String(models.ClusterCreateParamsHighAvailabilityModeFull),
},
Expand Down
Loading