Skip to content

OCPBUGS-1482: Don't override schedulableMasters unnecessarily #4414

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-robot merged 1 commit into from
Sep 20, 2022
Merged

OCPBUGS-1482: Don't override schedulableMasters unnecessarily #4414

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
9 changes: 8 additions & 1 deletion internal/common/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,14 @@ func IsImportedCluster(cluster *Cluster) bool {
}

func AreMastersSchedulable(cluster *Cluster) bool {
return swag.BoolValue(cluster.SchedulableMastersForcedTrue) || swag.BoolValue(cluster.SchedulableMasters)
// If the topology forces schedulable masters (i.e. there are no workers),
// SchedulableMastersForcedTrue will be true, but also it will be enabled
// by default in the installer. Since overriding it currently causes a
// failure due to a conflict starting with 4.12, we prefer to avoid it. We
// only need to override the installer when the user has set
// SchedulableMasters explicitly and that is not already the default in the
// installer.
return !swag.BoolValue(cluster.SchedulableMastersForcedTrue) && swag.BoolValue(cluster.SchedulableMasters)
}

func GetEffectiveRole(host *models.Host) models.HostRole {
Expand Down
4 changes: 2 additions & 2 deletions internal/common/common_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,8 +253,8 @@ var _ = Describe("Test AreMastersSchedulable", func() {
}{
{schedulableMastersForcedTrue: false, schedulableMasters: false, expectedSchedulableMasters: false},
{schedulableMastersForcedTrue: false, schedulableMasters: true, expectedSchedulableMasters: true},
{schedulableMastersForcedTrue: true, schedulableMasters: false, expectedSchedulableMasters: true},
{schedulableMastersForcedTrue: true, schedulableMasters: true, expectedSchedulableMasters: true},
{schedulableMastersForcedTrue: true, schedulableMasters: false, expectedSchedulableMasters: false}, // Handled by installer
{schedulableMastersForcedTrue: true, schedulableMasters: true, expectedSchedulableMasters: false}, // Handled by installer
} {
test := test
It(fmt.Sprintf("schedulableMastersForcedTrue=%v schedulableMasters=%v AreMastersSchedulable? %v", test.schedulableMastersForcedTrue, test.schedulableMasters, test.expectedSchedulableMasters), func() {
Expand Down