Skip to content

Commit af5cc1b

Browse files
author
lamai93
committed
Simplify logic.
1 parent 589999d commit af5cc1b

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

pkg/deployment/deployment.go

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -287,12 +287,6 @@ func (d *Deployment) handleArangoDeploymentUpdatedEvent() error {
287287
specBefore = *status.AcceptedSpec.DeepCopy()
288288
}
289289
newAPIObject := current.DeepCopy()
290-
wasForceReload := false
291-
if newAPIObject.Status.IsForceReload() {
292-
newAPIObject.Status.ForceStatusReload = nil
293-
wasForceReload = true
294-
log.Warn().Msg("Forced status reload!")
295-
}
296290
newAPIObject.Spec.SetDefaultsFrom(specBefore)
297291
newAPIObject.Spec.SetDefaults(d.apiObject.GetName())
298292

@@ -324,8 +318,10 @@ func (d *Deployment) handleArangoDeploymentUpdatedEvent() error {
324318
// Save updated accepted spec
325319
{
326320
status, lastVersion := d.GetStatus()
327-
if wasForceReload {
321+
if newAPIObject.Status.IsForceReload() {
322+
log.Warn().Msg("Forced status reload!")
328323
status = newAPIObject.Status
324+
status.ForceStatusReload = nil
329325
}
330326
status.AcceptedSpec = newAPIObject.Spec.DeepCopy()
331327
if err := d.UpdateStatus(status, lastVersion); err != nil {

0 commit comments

Comments
 (0)