Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

reconcile: remove stale TestSuccess condition #829

Merged
merged 1 commit into from
Dec 7, 2023
Merged

reconcile: remove stale TestSuccess condition #829

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion internal/reconcile/install.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,8 @@ func (r *Install) Reconcile(ctx context.Context, req *Request) error {
// before the install.
req.Object.Status.ClearHistory()

// If we are installing, we are no longer remediated.
// If we are installing, none of the previous conditions apply.
conditions.Delete(req.Object, v2.TestSuccessCondition)
conditions.Delete(req.Object, v2.RemediatedCondition)

// Run the Helm install action.
Expand Down
23 changes: 23 additions & 0 deletions internal/reconcile/install_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,29 @@ func TestInstall_Reconcile(t *testing.T) {
}
},
},
{
name: "install with stale conditions",
status: func(releases []*helmrelease.Release) v2.HelmReleaseStatus {
return v2.HelmReleaseStatus{
Conditions: []metav1.Condition{
*conditions.FalseCondition(v2.TestSuccessCondition, v2.TestFailedReason, ""),
*conditions.TrueCondition(v2.RemediatedCondition, v2.UninstallSucceededReason, ""),
},
}
},
chart: testutil.BuildChart(),
expectConditions: []metav1.Condition{
*conditions.TrueCondition(meta.ReadyCondition, v2.InstallSucceededReason,
"Helm install succeeded"),
*conditions.TrueCondition(v2.ReleasedCondition, v2.InstallSucceededReason,
"Helm install succeeded"),
},
expectHistory: func(releases []*helmrelease.Release) v2.Snapshots {
return v2.Snapshots{
release.ObservedToSnapshot(release.ObserveRelease(releases[0])),
}
},
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
Expand Down
3 changes: 2 additions & 1 deletion internal/reconcile/upgrade.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@ func (r *Upgrade) Reconcile(ctx context.Context, req *Request) error {
// Mark upgrade attempt on object.
req.Object.Status.LastAttemptedReleaseAction = v2.ReleaseActionUpgrade

// If we are upgrading, we are no longer remediated.
// If we are upgrading, none of the previous conditions apply.
conditions.Delete(req.Object, v2.TestSuccessCondition)
conditions.Delete(req.Object, v2.RemediatedCondition)

// Run the Helm upgrade action.
Expand Down
34 changes: 34 additions & 0 deletions internal/reconcile/upgrade_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,40 @@ func TestUpgrade_Reconcile(t *testing.T) {
}
},
},
{
name: "upgrade with stale conditions",
releases: func(namespace string) []*helmrelease.Release {
return []*helmrelease.Release{
testutil.BuildRelease(&helmrelease.MockReleaseOptions{
Name: mockReleaseName,
Namespace: namespace,
Chart: testutil.BuildChart(),
Version: 2,
Status: helmrelease.StatusDeployed,
}),
}
},
chart: testutil.BuildChart(),
status: func(releases []*helmrelease.Release) v2.HelmReleaseStatus {
return v2.HelmReleaseStatus{
Conditions: []metav1.Condition{
*conditions.FalseCondition(v2.TestSuccessCondition, v2.TestFailedReason, ""),
*conditions.TrueCondition(v2.RemediatedCondition, v2.RollbackSucceededReason, ""),
},
}
},
expectConditions: []metav1.Condition{
*conditions.TrueCondition(meta.ReadyCondition, v2.UpgradeSucceededReason,
"Helm upgrade succeeded"),
*conditions.TrueCondition(v2.ReleasedCondition, v2.UpgradeSucceededReason,
"Helm upgrade succeeded"),
},
expectHistory: func(releases []*helmrelease.Release) v2.Snapshots {
return v2.Snapshots{
release.ObservedToSnapshot(release.ObserveRelease(releases[1])),
}
},
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
Expand Down