Single primary cluster file per cluster

controllers/bounce_processes.go

@@ -52,9 +52,6 @@ func (c bounceProcesses) reconcile(_ context.Context, r *FoundationDBClusterReco
 	if err != nil {
 		return &requeue{curError: err}
 	}
-	defer func() {
-		_ = adminClient.Close()
-	}()
 
 	// If the status is not cached, we have to fetch it.
 	if status == nil {

controllers/change_coordinators.go

@@ -45,9 +45,6 @@ func (c changeCoordinators) reconcile(ctx context.Context, r *FoundationDBCluste
 	if err != nil {
 		return &requeue{curError: err, delayedRequeue: true}
 	}
-	defer func() {
-		_ = adminClient.Close()
-	}()
 
 	// If the status is not cached, we have to fetch it.
 	if status == nil {

controllers/check_client_compatibility.go

@@ -69,9 +69,6 @@ func (c checkClientCompatibility) reconcile(_ context.Context, r *FoundationDBCl
 	if err != nil {
 		return &requeue{curError: err}
 	}
-	defer func() {
-		_ = adminClient.Close()
-	}()
 
 	// If the status is not cached, we have to fetch it.
 	if status == nil {

controllers/choose_removals.go

@@ -60,9 +60,6 @@ func (c chooseRemovals) reconcile(ctx context.Context, r *FoundationDBClusterRec
 		if err != nil {
 			return &requeue{curError: err, delayedRequeue: true}
 		}
-		defer func() {
-			_ = adminClient.Close()
-		}()
 
 		status, err = adminClient.GetStatus()
 		if err != nil {

controllers/cluster_controller.go

@@ -147,9 +147,6 @@ func (r *FoundationDBClusterReconciler) Reconcile(ctx context.Context, request c
 	if err != nil {
 		return ctrl.Result{}, err
 	}
-	defer func() {
-		_ = adminClient.Close()
-	}()
 
 	err = cluster.Validate()
 	if err != nil {
@@ -556,17 +553,17 @@ func (r *FoundationDBClusterReconciler) updateOrApply(ctx context.Context, clust
 // getStatusFromClusterOrDummyStatus will fetch the machine-readable status from the FoundationDBCluster if the cluster is configured. If not a default status is returned indicating, that
 // some configuration is missing.
 func (r *FoundationDBClusterReconciler) getStatusFromClusterOrDummyStatus(logger logr.Logger, cluster *fdbv1beta2.FoundationDBCluster) (*fdbv1beta2.FoundationDBStatus, error) {
-	if cluster.Status.ConnectionString == "" {
-		return &fdbv1beta2.FoundationDBStatus{
-			Cluster: fdbv1beta2.FoundationDBStatusClusterInfo{
-				Layers: fdbv1beta2.FoundationDBStatusLayerInfo{
-					Error: "configurationMissing",
-				},
-			},
-		}, nil
+	adminClient, err := r.getAdminClient(logger, cluster)
+	if err != nil {
+		return nil, err
+	}
+	// If the cluster is not yet configured, we can reduce the timeout to make sure the initial reconcile steps
+	// are faster.
+	if !cluster.Status.Configured {
+		adminClient.SetTimeout(10 * time.Second)
 	}
 
-	connectionString, err := tryConnectionOptions(logger, cluster, r)
+	connectionString, err := adminClient.GetConnectionString()
 	if err != nil {
 		return nil, err
 	}
@@ -579,20 +576,6 @@ func (r *FoundationDBClusterReconciler) getStatusFromClusterOrDummyStatus(logger
 		cluster.Status.ConnectionString = connectionString
 	}
 
-	adminClient, err := r.getAdminClient(logger, cluster)
-	if err != nil {
-		return nil, err
-	}
-	defer func() {
-		_ = adminClient.Close()
-	}()
-
-	// If the cluster is not yet configured, we can reduce the timeout to make sure the initial reconcile steps
-	// are faster.
-	if !cluster.Status.Configured {
-		adminClient.SetTimeout(10 * time.Second)
-	}
-
 	status, err := adminClient.GetStatus()
 	if err == nil {
 		return status, nil

controllers/exclude_processes.go

@@ -48,9 +48,6 @@ func (e excludeProcesses) reconcile(ctx context.Context, r *FoundationDBClusterR
 	if err != nil {
 		return &requeue{curError: err}
 	}
-	defer func() {
-		_ = adminClient.Close()
-	}()
 
 	adminClient.WithValues()
 	// If the status is not cached, we have to fetch it.

controllers/modify_backup.go

@@ -43,9 +43,6 @@ func (s modifyBackup) reconcile(ctx context.Context, r *FoundationDBBackupReconc
 		if err != nil {
 			return &requeue{curError: err}
 		}
-		defer func() {
-			_ = adminClient.Close()
-		}()
 
 		err = adminClient.ModifyBackup(snapshotPeriod)
 		if err != nil {

controllers/remove_incompatible_processes.go

@@ -68,9 +68,6 @@ func processIncompatibleProcesses(ctx context.Context, r *FoundationDBClusterRec
 		if err != nil {
 			return err
 		}
-		defer func() {
-			_ = adminClient.Close()
-		}()
 
 		status, err = adminClient.GetStatus()
 		if err != nil {

controllers/remove_process_groups.go

@@ -50,9 +50,6 @@ func (u removeProcessGroups) reconcile(ctx context.Context, r *FoundationDBClust
 	if err != nil {
 		return &requeue{curError: err}
 	}
-	defer func() {
-		_ = adminClient.Close()
-	}()
 
 	// If the status is not cached, we have to fetch it.
 	if status == nil {

controllers/replace_failed_process_groups.go

@@ -50,9 +50,6 @@ func (c replaceFailedProcessGroups) reconcile(ctx context.Context, r *Foundation
 		if err != nil {
 			return &requeue{curError: err, delayedRequeue: true}
 		}
-		defer func() {
-			_ = adminClient.Close()
-		}()
 
 		status, err = adminClient.GetStatus()
 		if err != nil {

controllers/start_backup.go

@@ -40,9 +40,6 @@ func (s startBackup) reconcile(ctx context.Context, r *FoundationDBBackupReconci
 	if err != nil {
 		return &requeue{curError: err}
 	}
-	defer func() {
-		_ = adminClient.Close()
-	}()
 
 	err = adminClient.StartBackup(backup.BackupURL(), backup.SnapshotPeriodSeconds())
 	if err != nil {

controllers/start_restore.go

@@ -37,9 +37,6 @@ func (s startRestore) reconcile(ctx context.Context, r *FoundationDBRestoreRecon
 	if err != nil {
 		return &requeue{curError: err}
 	}
-	defer func() {
-		_ = adminClient.Close()
-	}()
 
 	status, err := adminClient.GetRestoreStatus()
 	if err != nil {

controllers/stop_backup.go

@@ -40,9 +40,6 @@ func (s stopBackup) reconcile(ctx context.Context, r *FoundationDBBackupReconcil
 	if err != nil {
 		return &requeue{curError: err}
 	}
-	defer func() {
-		_ = adminClient.Close()
-	}()
 
 	err = adminClient.StopBackup(backup.BackupURL())
 	if err != nil {

controllers/toggle_backup_paused.go

@@ -44,9 +44,6 @@ func (s toggleBackupPaused) reconcile(ctx context.Context, r *FoundationDBBackup
 		if err != nil {
 			return &requeue{curError: err}
 		}
-		defer func() {
-			_ = adminClient.Close()
-		}()
 
 		err = adminClient.PauseBackups()
 		if err != nil {
@@ -58,9 +55,6 @@ func (s toggleBackupPaused) reconcile(ctx context.Context, r *FoundationDBBackup
 		if err != nil {
 			return &requeue{curError: err}
 		}
-		defer func() {
-			_ = adminClient.Close()
-		}()
 
 		err = adminClient.ResumeBackups()
 		if err != nil {

controllers/update_backup_status.go

@@ -83,9 +83,6 @@ func (s updateBackupStatus) reconcile(ctx context.Context, r *FoundationDBBackup
 	if err != nil {
 		return &requeue{curError: err}
 	}
-	defer func() {
-		_ = adminClient.Close()
-	}()
 
 	liveStatus, err := adminClient.GetBackupStatus()
 	if err != nil {

controllers/update_database_configuration.go

@@ -50,9 +50,6 @@ func (u updateDatabaseConfiguration) reconcile(_ context.Context, r *FoundationD
 	if err != nil {
 		return &requeue{curError: err, delayedRequeue: true}
 	}
-	defer func() {
-		_ = adminClient.Close()
-	}()
 
 	// If the status is not cached, we have to fetch it.
 	if status == nil {

controllers/update_pods.go

@@ -69,9 +69,6 @@ func (u updatePods) reconcile(ctx context.Context, r *FoundationDBClusterReconci
 	if err != nil {
 		return &requeue{curError: err, delayedRequeue: true}
 	}
-	defer func() {
-		_ = adminClient.Close()
-	}()
 
 	// If the status is not cached, we have to fetch it.
 	if status == nil {

controllers/update_restore_status.go

@@ -37,9 +37,6 @@ func (updateRestoreStatus) reconcile(ctx context.Context, r *FoundationDBRestore
 	if err != nil {
 		return &requeue{curError: err}
 	}
-	defer func() {
-		_ = adminClient.Close()
-	}()
 
 	status, err := adminClient.GetRestoreStatus()
 	if err != nil {

controllers/update_status.go

@@ -277,61 +277,6 @@ func containsAll(current map[string]string, desired map[string]string) bool {
 	return true
 }
 
-// optionList creates an order-preserved unique list
-func optionList(options ...string) []string {
-	valueMap := make(map[string]bool, len(options))
-	values := make([]string, 0, len(options))
-	for _, option := range options {
-		if option != "" && !valueMap[option] {
-			values = append(values, option)
-			valueMap[option] = true
-		}
-	}
-	return values
-}
-
-// tryConnectionOptions attempts to connect with all the connection strings for this cluster and
-// returns the connection string that allows connecting to the cluster.
-func tryConnectionOptions(logger logr.Logger, cluster *fdbv1beta2.FoundationDBCluster, r *FoundationDBClusterReconciler) (string, error) {
-	connectionStrings := optionList(cluster.Status.ConnectionString, cluster.Spec.SeedConnectionString)
-	logger.Info("Trying connection options", "connectionString", connectionStrings)
-
-	originalConnectionString := cluster.Status.ConnectionString
-	defer func() { cluster.Status.ConnectionString = originalConnectionString }()
-
-	var err error
-	for _, connectionString := range connectionStrings {
-		logger.Info("Attempting to get connection string from cluster", "connectionString", connectionString)
-		cluster.Status.ConnectionString = connectionString
-		adminClient, clientErr := r.getAdminClient(logger, cluster)
-		if clientErr != nil {
-			return originalConnectionString, clientErr
-		}
-
-		// If the cluster is not yet configured, we can reduce the timeout to make sure the initial reconcile steps
-		// are faster.
-		if !cluster.Status.Configured {
-			adminClient.SetTimeout(10 * time.Second)
-		}
-
-		var activeConnectionString string
-		activeConnectionString, err = adminClient.GetConnectionString()
-
-		closeErr := adminClient.Close()
-		if closeErr != nil {
-			logger.V(1).Info("Could not close admin client", "error", closeErr)
-		}
-
-		if err == nil {
-			logger.Info("Chose connection option", "connectionString", activeConnectionString)
-			return activeConnectionString, nil
-		}
-		logger.Error(err, "Error getting connection string from cluster", "connectionString", connectionString)
-	}
-
-	return originalConnectionString, nil
-}
-
 // checkAndSetProcessStatus checks the status of the Process and if missing or incorrect add it to the related status field
 func checkAndSetProcessStatus(logger logr.Logger, r *FoundationDBClusterReconciler, cluster *fdbv1beta2.FoundationDBCluster, pod *corev1.Pod, processMap map[fdbv1beta2.ProcessGroupID][]fdbv1beta2.FoundationDBStatusProcessInfo, processCount int, processGroupStatus *fdbv1beta2.ProcessGroupStatus) error {
 	// Only perform any process specific validation if the machine-readable status has at least one process. We can improve this check

docs/design/better_coordination_multi_operator.md

@@ -194,7 +194,6 @@ func (reconciler operatorCoordination) reconcile(ctx context.Context, r *Foundat
 	if err != nil {
 		return &requeue{curError: err}
 	}
-	defer adminClient.Close()
 
 	// Read all data from the lists to get the current state. If a prefix is provided to the get methods, only
 	// process groups with the additional sub path will be returned.