From c3225e283cd2f9c2107ad0cc2ec8f2abc526d403 Mon Sep 17 00:00:00 2001
From: ajanikow <12255597+ajanikow@users.noreply.github.com>
Date: Wed, 19 Aug 2020 14:37:00 +0000
Subject: [PATCH] Fix ActiveFailover upgrade proceure

---
 CHANGELOG.md                                            | 1 +
 pkg/apis/deployment/v1/server_group.go                  | 2 +-
 pkg/deployment/reconcile/action_wait_for_member_up.go   | 6 +-----
 pkg/deployment/reconcile/plan_builder_rotate_upgrade.go | 2 +-
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d2acd6fe2..9af275d0f 100644
--- a/CHANGELOG.md
+++ b/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
diff --git a/pkg/apis/deployment/v1/server_group.go b/pkg/apis/deployment/v1/server_group.go
index ad6b03a78..727fb470a 100644
--- a/pkg/apis/deployment/v1/server_group.go
+++ b/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,
diff --git a/pkg/deployment/reconcile/action_wait_for_member_up.go b/pkg/deployment/reconcile/action_wait_for_member_up.go
index b9d2caec1..a08a0a8a8 100644
--- a/pkg/deployment/reconcile/action_wait_for_member_up.go
+++ b/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
 }
 
diff --git a/pkg/deployment/reconcile/plan_builder_rotate_upgrade.go b/pkg/deployment/reconcile/plan_builder_rotate_upgrade.go
index eba20009e..00469e894 100644
--- a/pkg/deployment/reconcile/plan_builder_rotate_upgrade.go
+++ b/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,