Skip to content

HIVE-2476: OpenStack.MachineSets(): Allow nil Replicas #8227

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

HIVE-2476: OpenStack.MachineSets(): Allow nil Replicas #8227

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
12 changes: 9 additions & 3 deletions pkg/asset/machines/openstack/machinesets.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/utils/ptr"

clusterapi "github.com/openshift/api/machine/v1beta1"
"github.com/openshift/installer/pkg/types"
Expand All @@ -32,16 +33,21 @@ func MachineSets(clusterID string, config *types.InstallConfig, pool *types.Mach
}
mpool := pool.Platform.OpenStack

// In installer CLI code paths, the replica number is set to 3 by default
// when install-config does not have any Compute machine-pool, or when the
// Compute machine-pool does not have the `replicas` property.
// However, external consumers of this func may not be so kind...
if pool.Replicas == nil {
pool.Replicas = ptr.To[int64](0)
}

failureDomains := failureDomainsFromSpec(*mpool)
numberOfFailureDomains := int64(len(failureDomains))

machinesets := make([]*clusterapi.MachineSet, len(failureDomains))
for idx := range machinesets {
var replicaNumber int32
{
// The replica number is set to 3 by default when install-config does not have
// any Compute machine-pool, or when the Compute machine-pool does not have the
// `replicas` property. As a consequence, pool.Replicas is never nil
replicas := *pool.Replicas / numberOfFailureDomains
if int64(idx) < *pool.Replicas%numberOfFailureDomains {
replicas++
Expand Down