Skip to content

fix: skip templating if check fails #863

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: skip templating if check fails #863

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
15 changes: 11 additions & 4 deletions checks/runchecks.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,21 @@ func RunChecks(ctx *context.Context) []*pkg.CheckResult {

func transformResults(ctx *context.Context, in []*pkg.CheckResult) (out []*pkg.CheckResult) {
for _, r := range in {
// If check fails, do not apply transform
if !r.Pass {
Copy link
Member

@moshloop moshloop Mar 15, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

!pass doesn't necessarily means it failed to connect - it could have failed a threshold, response code/body check etc.

Copy link
Member Author

@yashmehrotra yashmehrotra Mar 15, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I went through the checks code and all the errors are raised via .Failf or .ErrorMessage (which calls .Failf inside) all of which sets pass = false.

If not for r.Pass, what should we check against ?

Copy link
Member

@moshloop moshloop Mar 16, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can add another field called Error = true that ErrorMessage sets - however we might need to update some of the checks to use ErrorMessage instead of Failf for connection errors

out = append(out, r)
continue
}

transformed, err := transform(ctx, r)
if err != nil {
r.Failf("transformation failure: %v", err)
out = append(out, r)
} else {
for _, t := range transformed {
out = append(out, processTemplates(ctx, t))
}
continue
}

for _, t := range transformed {
out = append(out, processTemplates(ctx, t))
}
}
return out
Expand Down
8 changes: 4 additions & 4 deletions pkg/controllers/canary_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,13 +184,13 @@ func (r *CanaryReconciler) Report() {
canary.Status.Status = &v1.Failed
}

for _, eventMsg := range payload.FailEvents {
r.Events.Event(&canary, corev1.EventTypeWarning, "Failed", eventMsg)
}

if err := r.Status().Update(gocontext.Background(), &canary); err != nil {
r.Log.Error(err, "failed to update status", "canary", canary.Name)
}

for _, eventMsg := range payload.FailEvents {
r.Events.Event(&canary, corev1.EventTypeWarning, "Failed", eventMsg)
}
}
}

Expand Down