Skip to content

Add missing defer summarize(req) in UninstallRemediation #1491

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

Open
SebTardif wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add missing defer summarize(req) in UninstallRemediation #1491

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
2 changes: 2 additions & 0 deletions internal/reconcile/uninstall_remediation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ func (r *UninstallRemediation) Reconcile(ctx context.Context, req *Request) erro
cfg = r.configFactory.Build(logBuf, observeUninstall(req.Object, v2.ReleaseActionUninstallRemediation))
)

defer summarize(req)

// Require current to run uninstall.
if cur == nil {
return fmt.Errorf("%w: required to uninstall", ErrNoLatest)
Expand Down
16 changes: 15 additions & 1 deletion internal/reconcile/uninstall_remediation_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import (
"k8s.io/client-go/tools/record"

eventv1 "github.com/fluxcd/pkg/apis/event/v1beta1"
"github.com/fluxcd/pkg/apis/meta"
"github.com/fluxcd/pkg/runtime/conditions"

"github.com/fluxcd/pkg/chartutil"
Expand Down Expand Up @@ -111,6 +112,8 @@ func TestUninstallRemediation_Reconcile(t *testing.T) {
expectConditions: []metav1.Condition{
*conditions.TrueCondition(v2.RemediatedCondition, v2.UninstallSucceededReason,
"succeeded"),
*conditions.FalseCondition(meta.ReadyCondition, v2.UninstallSucceededReason,
"succeeded"),
},
expectHistory: func(releases []*helmrelease.Release) v2.Snapshots {
return v2.Snapshots{
Expand Down Expand Up @@ -144,6 +147,8 @@ func TestUninstallRemediation_Reconcile(t *testing.T) {
}
},
expectConditions: []metav1.Condition{
*conditions.FalseCondition(meta.ReadyCondition, v2.UninstallFailedReason,
"context deadline exceeded"),
*conditions.FalseCondition(v2.RemediatedCondition, v2.UninstallFailedReason,
"context deadline exceeded"),
},
Expand Down Expand Up @@ -191,6 +196,8 @@ func TestUninstallRemediation_Reconcile(t *testing.T) {
}
},
expectConditions: []metav1.Condition{
*conditions.FalseCondition(meta.ReadyCondition, v2.UninstallFailedReason,
"%s", ErrNoStorageUpdate.Error()),
*conditions.FalseCondition(v2.RemediatedCondition, v2.UninstallFailedReason,
"%s", ErrNoStorageUpdate.Error()),
},
Expand Down Expand Up @@ -234,7 +241,10 @@ func TestUninstallRemediation_Reconcile(t *testing.T) {
}
},
expectConditions: []metav1.Condition{
*conditions.FalseCondition(v2.RemediatedCondition, v2.UninstallFailedReason, "%s", mockDeleteErr.Error()),
*conditions.FalseCondition(meta.ReadyCondition, v2.UninstallFailedReason,
"%s", mockDeleteErr.Error()),
*conditions.FalseCondition(v2.RemediatedCondition, v2.UninstallFailedReason,
"%s", mockDeleteErr.Error()),
},
expectHistory: func(releases []*helmrelease.Release) v2.Snapshots {
return v2.Snapshots{
Expand Down Expand Up @@ -292,6 +302,8 @@ func TestUninstallRemediation_Reconcile(t *testing.T) {
}
},
expectConditions: []metav1.Condition{
*conditions.FalseCondition(meta.ReadyCondition, v2.UninstallFailedReason,
"%s", ErrReleaseMismatch.Error()),
*conditions.FalseCondition(v2.RemediatedCondition, v2.UninstallFailedReason,
"%s", ErrReleaseMismatch.Error()),
},
Expand Down Expand Up @@ -332,6 +344,8 @@ func TestUninstallRemediation_Reconcile(t *testing.T) {
expectConditions: []metav1.Condition{
*conditions.TrueCondition(v2.RemediatedCondition, v2.UninstallSucceededReason,
"succeeded"),
*conditions.FalseCondition(meta.ReadyCondition, v2.UninstallSucceededReason,
"succeeded"),
},
expectHistory: func(releases []*helmrelease.Release) v2.Snapshots {
return v2.Snapshots{
Expand Down