[Bugfix] Fix ActiveFailover upgrade proceure (#620)

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## [master](https://github.com/arangodb/kube-arangodb/tree/master) (N/A)
 - Add Operator Namespaced mode (Alpha)
+- Fix ActiveFailover Upgrade procedure
 
 ## [1.0.5](https://github.com/arangodb/kube-arangodb/tree/1.0.5) (2020-08-05)
 - Add Labels and Annotations to ServiceMonitor

pkg/apis/deployment/v1/server_group.go

@@ -53,8 +53,8 @@ const (
 var (
 	// AllServerGroups contains a constant list of all known server groups
 	AllServerGroups = []ServerGroup{
-		ServerGroupSingle,
 		ServerGroupAgents,
+		ServerGroupSingle,
 		ServerGroupDBServers,
 		ServerGroupCoordinators,
 		ServerGroupSyncMasters,

pkg/deployment/reconcile/action_wait_for_member_up.go

@@ -111,7 +111,7 @@ func (a *actionWaitForMemberUp) checkProgressSingle(ctx context.Context) (bool,
 // of a single server as part of an active failover deployment.
 func (a *actionWaitForMemberUp) checkProgressSingleInActiveFailover(ctx context.Context) (bool, bool, error) {
 	log := a.log
-	c, err := a.actionCtx.GetDatabaseClient(ctx)
+	c, err := a.actionCtx.GetServerClient(ctx, a.action.Group, a.action.MemberID)
 	if err != nil {
 		log.Debug().Err(err).Msg("Failed to create database client")
 		return false, false, maskAny(err)
@@ -120,10 +120,6 @@ func (a *actionWaitForMemberUp) checkProgressSingleInActiveFailover(ctx context.
 		log.Debug().Err(err).Msg("Failed to get version")
 		return false, false, maskAny(err)
 	}
-	if _, err := c.Databases(ctx); err != nil {
-		log.Debug().Err(err).Msg("Failed to get databases")
-		return false, false, maskAny(err)
-	}
 	return true, false, nil
 }
 

pkg/deployment/reconcile/plan_builder_rotate_upgrade.go

@@ -40,8 +40,8 @@ import (
 var (
 	// rotationByAnnotationOrder - Change order of execution - Coordinators and Agents should be executed before DBServer to save time
 	rotationByAnnotationOrder = []api.ServerGroup{
-		api.ServerGroupSingle,
 		api.ServerGroupAgents,
+		api.ServerGroupSingle,
 		api.ServerGroupCoordinators,
 		api.ServerGroupDBServers,
 		api.ServerGroupSyncMasters,