Skip to content

Fix the usage of the management API in the e2e test framework #2401

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
johscheuer merged 1 commit into from
Dec 3, 2025
Merged

Fix the usage of the management API in the e2e test framework #2401

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
1 change: 1 addition & 0 deletions api/v1beta2/foundationdbcluster_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2769,6 +2769,7 @@ func (cluster *FoundationDBCluster) GetMaxConcurrentReplacements() int {
}

// UseManagementAPI returns the value of UseManagementAPI or false if unset.
// Deprecated: Use DatabaseInteractionMode instead.
func (cluster *FoundationDBCluster) UseManagementAPI() bool {
return ptr.Deref(cluster.Spec.AutomationOptions.UseManagementAPI, false)
}
Expand Down
4 changes: 4 additions & 0 deletions controllers/maintenance_mode_checker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,5 +150,9 @@ func (c maintenanceModeChecker) reconcile(
return &requeue{curError: err, delayedRequeue: true}
}

// Reset the maintenance zone in the cached status for this run. In this code path the maintenance off command
// returned without an error, so we can assume that the maintenance zone was reset.
status.Cluster.MaintenanceZone = ""

return nil
}
7 changes: 6 additions & 1 deletion e2e/fixtures/fdb_cluster_specs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,11 @@ func (factory *Factory) createFDBClusterSpec(
faultDomain.ValueFrom = ""
}

var databaseInteractionMode *fdbv1beta2.DatabaseInteractionMode
if ptr.Deref(config.ManagementAPI, false) {
databaseInteractionMode = ptr.To(fdbv1beta2.DatabaseInteractionModeMgmtAPI)
}

return &fdbv1beta2.FoundationDBCluster{
ObjectMeta: metav1.ObjectMeta{
Name: config.Name,
Expand Down Expand Up @@ -106,7 +111,7 @@ func (factory *Factory) createFDBClusterSpec(
},
UseLocalitiesForExclusion: config.UseLocalityBasedExclusions,
SynchronizationMode: ptr.To(string(config.SynchronizationMode)),
UseManagementAPI: config.ManagementAPI,
DatabaseInteractionMode: databaseInteractionMode,
},
Routing: fdbv1beta2.RoutingConfig{
UseDNSInClusterFile: config.UseDNS,
Expand Down