mirrors/kube-arangodb
1
0
Fork 0
mirror of https://github.com/arangodb/kube-arangodb.git synced 2024-12-14 11:57:37 +00:00
Code Activity

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

Browse source
This commit is contained in:
Adam Janikowski 2023-09-21 08:19:19 +02:00 committed by GitHub
parent 50201bf893
commit 1b24414211
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkg/deployment/reconcile/action_resign_leadership.go
View file

@ -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
}

2
pkg/deployment/reconcile/plan_builder_rotate_upgrade.go
View file

@ -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{