Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions internal/reconcile/atomic_release.go
Original file line number Diff line number Diff line change
Expand Up @@ -372,6 +372,22 @@ func (r *AtomicRelease) actionForState(ctx context.Context, req *Request, state
reason, msgFmt = v2.InstallSucceededReason, fmtInstallSuccess
case v2.UpgradeFailedReason:
reason, msgFmt = v2.UpgradeSucceededReason, fmtUpgradeSuccess
default:
// Released may be missing after a failed post-action
// condition patch while history was persisted. Derive
// the success reason from the last attempted action.
action := req.Object.Status.LastAttemptedReleaseAction
if action == "" {
if cur := req.Object.Status.History.Latest(); cur != nil {
action = cur.Action
}
}
switch action {
case v2.ReleaseActionInstall:
reason, msgFmt = v2.InstallSucceededReason, fmtInstallSuccess
case v2.ReleaseActionUpgrade:
reason, msgFmt = v2.UpgradeSucceededReason, fmtUpgradeSuccess
}
}
if reason != "" {
cur := req.Object.Status.History.Latest()
Expand Down
59 changes: 59 additions & 0 deletions internal/reconcile/atomic_release_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1574,6 +1574,65 @@ func TestAtomicRelease_actionForState(t *testing.T) {
*conditions.TrueCondition(meta.ReadyCondition, v2.InstallSucceededReason, "install succeeded"),
},
},
{
name: "in-sync release with missing released condition after install",
status: func(releases []*helmrelease.Release) v2.HelmReleaseStatus {
return v2.HelmReleaseStatus{
History: v2.Snapshots{
{Version: 1},
},
LastAttemptedReleaseAction: v2.ReleaseActionInstall,
Conditions: []metav1.Condition{
*conditions.UnknownCondition(meta.ReadyCondition, meta.ProgressingReason, "Running 'install' action"),
},
}
},
state: ReleaseState{Status: ReleaseStatusInSync},
want: nil,
assertConditions: []metav1.Condition{
*conditions.TrueCondition(v2.ReleasedCondition, v2.InstallSucceededReason, "install succeeded"),
*conditions.TrueCondition(meta.ReadyCondition, v2.InstallSucceededReason, "install succeeded"),
},
},
{
name: "in-sync release with missing released condition after upgrade",
status: func(releases []*helmrelease.Release) v2.HelmReleaseStatus {
return v2.HelmReleaseStatus{
History: v2.Snapshots{
{Version: 2},
},
LastAttemptedReleaseAction: v2.ReleaseActionUpgrade,
Conditions: []metav1.Condition{
*conditions.UnknownCondition(meta.ReadyCondition, meta.ProgressingReason, "Running 'upgrade' action"),
},
}
},
state: ReleaseState{Status: ReleaseStatusInSync},
want: nil,
assertConditions: []metav1.Condition{
*conditions.TrueCondition(v2.ReleasedCondition, v2.UpgradeSucceededReason, "upgrade succeeded"),
*conditions.TrueCondition(meta.ReadyCondition, v2.UpgradeSucceededReason, "upgrade succeeded"),
},
},
{
name: "in-sync release with missing released condition recovers from history action",
status: func(releases []*helmrelease.Release) v2.HelmReleaseStatus {
return v2.HelmReleaseStatus{
History: v2.Snapshots{
{Version: 1, Action: v2.ReleaseActionInstall},
},
Conditions: []metav1.Condition{
*conditions.UnknownCondition(meta.ReadyCondition, meta.ProgressingReason, "Running 'install' action"),
},
}
},
state: ReleaseState{Status: ReleaseStatusInSync},
want: nil,
assertConditions: []metav1.Condition{
*conditions.TrueCondition(v2.ReleasedCondition, v2.InstallSucceededReason, "install succeeded"),
*conditions.TrueCondition(meta.ReadyCondition, v2.InstallSucceededReason, "install succeeded"),
},
},
{
name: "locked release triggers unlock action",
state: ReleaseState{Status: ReleaseStatusLocked},
Expand Down