arangodb · ajanikow · Feb 24, 2025 · Feb 24, 2025
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # Change Log
 
 ## [master](https://github.com/arangodb/kube-arangodb/tree/master) (N/A)
+- (Bugfix) Clean Phase change properly during upgrade
 
 ## [1.2.45](https://github.com/arangodb/kube-arangodb/tree/1.2.45) (2025-02-21)
 - (Feature) (Platform) Inventory as Proto

diff --git a/pkg/deployment/member/phase_updates.go b/pkg/deployment/member/phase_updates.go
@@ -1,7 +1,7 @@
 //
 // DISCLAIMER
 //
-// Copyright 2016-2024 ArangoDB GmbH, Cologne, Germany
+// Copyright 2016-2025 ArangoDB GmbH, Cologne, Germany
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -66,6 +66,8 @@ var phase = phaseMap{
 				d := spec.Architecture.GetDefault()
 				m.Architecture = &d
 			}
+
+			removeBaseMemberConditionsMapFunc(m)
 		},
 	},
 	api.MemberPhasePending: {
@@ -79,6 +81,17 @@ var phase = phaseMap{
 	},
 }
 
+func removeBaseMemberConditionsMapFunc(m *api.MemberStatus) {
+	// Clean conditions
+	m.Conditions.Remove(api.ConditionTypeReady)
+	m.Conditions.Remove(api.ConditionTypeActive)
+	m.Conditions.Remove(api.ConditionTypeStarted)
+	m.Conditions.Remove(api.ConditionTypeScheduled)
+	m.Conditions.Remove(api.ConditionTypeReachable)
+	m.Conditions.Remove(api.ConditionTypeServing)
+	m.Conditions.Remove(api.ConditionTypeTerminating)
+}
+
 func removeMemberConditionsMapFunc(m *api.MemberStatus) {
 	// Clean conditions
 	m.Conditions.Remove(api.ConditionTypeReady)

diff --git a/pkg/deployment/reconcile/action_wait_for_member_in_sync.go b/pkg/deployment/reconcile/action_wait_for_member_in_sync.go
@@ -1,7 +1,7 @@
 //
 // DISCLAIMER
 //
-// Copyright 2016-2023 ArangoDB GmbH, Cologne, Germany
+// Copyright 2016-2025 ArangoDB GmbH, Cologne, Germany
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -61,6 +61,10 @@ func (a *actionWaitForMemberInSync) CheckProgress(_ context.Context) (bool, bool
 		return true, false, nil
 	}
 
+	if member.Phase.IsPending() {
+		return false, false, nil
+	}
+
 	ready, err := a.check()
 	if err != nil {
 		return false, false, err

diff --git a/pkg/deployment/reconcile/action_wait_for_member_ready.go b/pkg/deployment/reconcile/action_wait_for_member_ready.go
@@ -64,6 +64,10 @@ func (a *actionWaitForMemberReady) CheckProgress(ctx context.Context) (bool, boo
 		return true, false, nil
 	}
 
+	if member.Phase.IsPending() {
+		return false, false, nil
+	}
+
 	if a.actionCtx.GetMode() == api.DeploymentModeActiveFailover {
 		return true, false, nil
 	}

diff --git a/pkg/deployment/reconcile/action_wait_for_member_up.go b/pkg/deployment/reconcile/action_wait_for_member_up.go
@@ -70,6 +70,10 @@ func (a *actionWaitForMemberUp) CheckProgress(ctx context.Context) (bool, bool,
 		return true, false, nil
 	}
 
+	if member.Phase.IsPending() {
+		return false, false, nil
+	}
+
 	ctxChild, cancel := globals.GetGlobalTimeouts().ArangoD().WithTimeout(ctx)
 	defer cancel()
 
@@ -106,8 +110,12 @@ func (a *actionWaitForMemberUp) checkProgressSingle() bool {
 		return false
 	}
 
-	if !m.Conditions.IsTrue(api.ConditionTypeActive) {
-		a.log.Debug("Member not yet active")
+	if m.Phase.IsPending() {
+		return false
+	}
+
+	if !m.Conditions.IsTrue(api.ConditionTypeServing) {
+		a.log.Debug("Member not yet serving")
 		return false
 	}
 
@@ -189,8 +197,12 @@ func (a *actionWaitForMemberUp) checkProgressCluster(ctx context.Context) bool {
 		}
 	}
 
-	if !m.Conditions.IsTrue(api.ConditionTypeActive) {
-		a.log.Debug("Member not yet active")
+	if m.Phase.IsPending() {
+		return false
+	}
+
+	if !m.Conditions.IsTrue(api.ConditionTypeServing) {
+		a.log.Debug("Member not yet serving")
 		return false
 	}