[Bugfix] [1.2.33] Rotation fixes (#1415)

Author: ajanikow

pkg/deployment/reconcile/action_resign_leadership.go

@@ -165,9 +165,9 @@ func (a *actionResignLeadership) isServerRebooted(agencyState state.State, serve
 		return false
 	}
 
-	v, ok := a.actionCtx.Get(a.action, actionResignLeadershipRebootID)
+	v, ok := a.action.Params[actionResignLeadershipRebootID.String()]
 	if !ok {
-		a.log.Warn("missing reboot ID in action's locals", v)
+		a.log.Warn("missing reboot ID in action's locals")
 		return false
 	}
 

pkg/deployment/reconcile/plan_builder_rotate_upgrade.go

@@ -222,7 +222,7 @@ func (r *Reconciler) createUpdatePlanInternal(apiObject k8sutil.APIObject, spec
 			p = withWaitForMember(p, m.Group, m.Member)
 
 			p = append(p, actions.NewAction(api.ActionTypeArangoMemberUpdatePodStatus, m.Group, m.Member, "Propagating status of pod").AddParam(ActionTypeArangoMemberUpdatePodStatusChecksum, checksum))
-			p.WrapWithPlan(api.Plan{
+			p = p.WrapWithPlan(api.Plan{
 				shared.RemoveMemberConditionActionV2(reason, api.ConditionTypePendingUpdate, m.Group, m.Member.ID),
 				shared.UpdateMemberConditionActionV2(reason, api.ConditionTypeUpdating, m.Group, m.Member.ID, true, reason, "", ""),
 			}, api.Plan{