Skip to content

Commit ab5ef6f

Browse files
authored
Merge pull request #752 from barney-s/issue-751
Add defensive check for lastApplied being nil. may happen in case of apply error.
2 parents 5c38829 + e2ec274 commit ab5ef6f

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

pkg/applyset/applyset.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -577,7 +577,11 @@ func (a *applySet) apply(ctx context.Context, dryRun bool) (*ApplyResult, error)
577577
mu.Lock()
578578
defer mu.Unlock()
579579
results.recordApplied(obj, lastApplied, err)
580-
a.log.V(2).Info("applied object", "object", obj.String(), "applied-revision", lastApplied.GetResourceVersion(),
580+
var appliedRevision string
581+
if lastApplied != nil {
582+
appliedRevision = lastApplied.GetResourceVersion()
583+
}
584+
a.log.V(2).Info("applied object", "object", obj.String(), "applied-revision", appliedRevision,
581585
"error", err)
582586
return nil
583587
})

0 commit comments

Comments
 (0)